diff --git a/UI/History/EventTypeCell.js b/UI/History/EventTypeCell.js
index c91af5db1..3979edacd 100644
--- a/UI/History/EventTypeCell.js
+++ b/UI/History/EventTypeCell.js
@@ -16,10 +16,10 @@ define(
                     var icon;
                     var toolTip;
 
-                    switch (this.cellValue) {
+                    switch (this.cellValue.get('eventType')) {
                         case 'grabbed':
                             icon = 'icon-cloud-download';
-                            toolTip = 'Episode grabbed from indexer and sent to download client';
+                            toolTip = 'Episode grabbed from {0} and sent to download client'.format(this.cellValue.get('data').indexer);
                             break;
                         case 'seriesFolderImported':
                             icon = 'icon-hdd';
diff --git a/UI/History/HistoryLayout.js b/UI/History/HistoryLayout.js
index 137ac8b52..ca4580c98 100644
--- a/UI/History/HistoryLayout.js
+++ b/UI/History/HistoryLayout.js
@@ -25,9 +25,10 @@ define(
             columns:
                 [
                     {
-                        name : 'eventType',
-                        label: '',
-                        cell : EventTypeCell
+                        name     : 'eventType',
+                        label    : '',
+                        cell     : EventTypeCell,
+                        cellValue: 'this'
                     },
                     {
                         name : 'series',
diff --git a/UI/Series/Index/SeriesIndexLayout.js b/UI/Series/Index/SeriesIndexLayout.js
index 707f82204..e9300b1c2 100644
--- a/UI/Series/Index/SeriesIndexLayout.js
+++ b/UI/Series/Index/SeriesIndexLayout.js
@@ -189,18 +189,21 @@ define(
                             {
                                 key     : 'posterView',
                                 title   : '',
+                                tooltip : 'Posters',
                                 icon    : 'icon-th-large',
                                 callback: this._showPosters
                             },
                             {
                                 key     : 'listView',
                                 title   : '',
+                                tooltip : 'Overview List',
                                 icon    : 'icon-th-list',
                                 callback: this._showList
                             },
                             {
                                 key     : 'tableView',
                                 title   : '',
+                                tooltip : 'Table',
                                 icon    : 'icon-table',
                                 callback: this._showTable
                             }
diff --git a/UI/Shared/Toolbar/Radio/RadioButtonView.js b/UI/Shared/Toolbar/Radio/RadioButtonView.js
index 42b39d369..25511a964 100644
--- a/UI/Shared/Toolbar/Radio/RadioButtonView.js
+++ b/UI/Shared/Toolbar/Radio/RadioButtonView.js
@@ -28,6 +28,10 @@ define(
                 if(!this.model.get('title')){
                     this.$el.addClass('btn-icon-only');
                 }
+
+                if (this.model.get('tooltip')) {
+                    this.$el.attr('title', this.model.get('tooltip'))
+                }
             },
 
             onClick: function () {