diff --git a/NzbDrone.Web/Content/Grid.css b/NzbDrone.Web/Content/Grid.css
index b6c21c01d..6d5f4c76a 100644
--- a/NzbDrone.Web/Content/Grid.css
+++ b/NzbDrone.Web/Content/Grid.css
@@ -1,4 +1,4 @@
-.gridImage
+.gridImage , .gridAction
 {
     width: 18px;
     height: 18px;
@@ -7,9 +7,9 @@
     vertical-align: middle;
 }
     
-.gridImage:hover
+.gridAction:hover
 {
-    background-color: #065EFE;
+    cursor: pointer;
 }
 
 /* Custom Grid */
@@ -68,12 +68,12 @@
 /* Episode Grid Row Colouring */
 .episodeIgnored
 {
-    background-color: #F2F5A9;
+      background: lightgray;
 }
     
 .episodeMissing
 {
-    background-color: #F5A9A9;
+    background-color: #f5c5c5;
 }
 
 /*Hidden Grid to prevent FOUSC*/
diff --git a/NzbDrone.Web/Content/Images/Missing.png b/NzbDrone.Web/Content/Images/Missing.png
index 727fe419e..15c3101d0 100644
Binary files a/NzbDrone.Web/Content/Images/Missing.png and b/NzbDrone.Web/Content/Images/Missing.png differ
diff --git a/NzbDrone.Web/Content/Images/NotAired.png b/NzbDrone.Web/Content/Images/NotAired.png
index 525de18af..9a1158e25 100644
Binary files a/NzbDrone.Web/Content/Images/NotAired.png and b/NzbDrone.Web/Content/Images/NotAired.png differ
diff --git a/NzbDrone.Web/Content/Overrides.css b/NzbDrone.Web/Content/Overrides.css
index 0d090dda3..5404daae2 100644
--- a/NzbDrone.Web/Content/Overrides.css
+++ b/NzbDrone.Web/Content/Overrides.css
@@ -47,9 +47,13 @@
     margin-top: 10px;
 }
 
+.ui-button .ui-state-default{
+    background: none;
+}
+
 /*MiniProfiler*/
 
 .profiler-button
 {
-    opacity: 0.4;
+    opacity: 0.6;
 }
diff --git a/NzbDrone.Web/Views/History/Index.cshtml b/NzbDrone.Web/Views/History/Index.cshtml
index d72436a41..38b03d05b 100644
--- a/NzbDrone.Web/Views/History/Index.cshtml
+++ b/NzbDrone.Web/Views/History/Index.cshtml
@@ -80,8 +80,8 @@
                                     }
                                 }, //Date
                                 { sWidth: '40px', "mDataProp": "HistoryId", "bSortable": false, "fnRender": function (row) {
-                                    var deleteImage = "<img src=\"../../Content/Images/X.png\" alt=\"Delete\" title=\"Delete from History\" class=\"gridImage\" onclick=\"deleteHistory(this.parentNode.parentNode, " + row.aData["HistoryId"] + ")\">";
-                                    var redownloadImage = "<img src=\"../../Content/Images/redownload.png\" alt=\"Redownload\" title=\Redownload Episode\" class=\"gridImage\" onclick=\"redownloadHistory(this.parentNode.parentNode, " + row.aData["HistoryId"] + ", " + row.aData["EpisodeId"] + ")\">";
+                                    var deleteImage = "<img src=\"../../Content/Images/X.png\" alt=\"Delete\" title=\"Delete from History\" class=\"gridAction\" onclick=\"deleteHistory(this.parentNode.parentNode, " + row.aData["HistoryId"] + ")\">";
+                                    var redownloadImage = "<img src=\"../../Content/Images/redownload.png\" alt=\"Redownload\" title=\Redownload Episode\" class=\"gridAction\" onclick=\"redownloadHistory(this.parentNode.parentNode, " + row.aData["HistoryId"] + ", " + row.aData["EpisodeId"] + ")\">";
 
                                     return deleteImage + redownloadImage;
                                 }
diff --git a/NzbDrone.Web/Views/Missing/Index.cshtml b/NzbDrone.Web/Views/Missing/Index.cshtml
index 82335d3a3..f003520f5 100644
--- a/NzbDrone.Web/Views/Missing/Index.cshtml
+++ b/NzbDrone.Web/Views/Missing/Index.cshtml
@@ -81,7 +81,7 @@
                                                                 } 
                             }, //Grabbed On
                             { sWidth: '40px', "mDataProp": "EpisodeId", "bSortable": false, "fnRender": function (row) {
-                                    return createImageAjaxLink('/Episode/Search?episodeId=' + row.aData["EpisodeId"], '../../Content/Images/Search.png', 'Search', 'Search for Episode', 'gridImage');
+                                    return createImageAjaxLink('/Episode/Search?episodeId=' + row.aData["EpisodeId"], '../../Content/Images/Search.png', 'Search', 'Search for Episode', 'gridAction');
                                 }
                             }, //Actions
                             { sWidth: 'auto', "mDataProp": "Details", "bSortable": false, "bVisible": false, "fnRender": function (row) {
diff --git a/NzbDrone.Web/Views/Series/Details.cshtml b/NzbDrone.Web/Views/Series/Details.cshtml
index 6a00c9371..39eaf8e1d 100644
--- a/NzbDrone.Web/Views/Series/Details.cshtml
+++ b/NzbDrone.Web/Views/Series/Details.cshtml
@@ -88,7 +88,7 @@
         var ignoreSeason = "ignoreSeason_" + season.SeasonNumber;
         <div class="seasonToggleTop">
             <img src='../../Content/Images/@(season.Ignored ? "ignored" : "notIgnored").png'
-                 class='ignoredEpisodesMaster ignoreEpisode @ignoreSeason@(season.Ignored ? " ignored" : " ") gridImage'
+                 class='ignoredEpisodesMaster ignoreEpisode @ignoreSeason@(season.Ignored ? " ignored" : " ") gridAction'
                  title='Click to toggle season ignore status' />
             <a href="@string.Format("#SeasonSection_{0}", season.SeasonNumber)" class="seasonToggleLabel">@(season.SeasonNumber == 0 ? "Specials" : "Season " + season.SeasonNumber)</a>
         </div>
diff --git a/NzbDrone.Web/Views/Series/Episode.cshtml b/NzbDrone.Web/Views/Series/Episode.cshtml
index 1916f8a93..e9b5c9e32 100644
--- a/NzbDrone.Web/Views/Series/Episode.cshtml
+++ b/NzbDrone.Web/Views/Series/Episode.cshtml
@@ -24,8 +24,8 @@
 
     @*Commands Column*@
     <td class="@cellColourClass">
-        <img src='../../Content/Images/@(Model.Ignored ? "ignored" : "notIgnored").png' class='ignoreEpisode ignoreEpisode_@(Model.SeasonNumber)@(Model.Ignored ? " ignored" : " ") gridImage' id='@Model.EpisodeId' title='Click to toggle episode ignore status' />
-        @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for episode", @class = "gridImage" }, "Search", "Episode", new { episodeId = Model.EpisodeId }, null, null)
+        <img src='../../Content/Images/@(Model.Ignored ? "ignored" : "notIgnored").png' class='ignoreEpisode ignoreEpisode_@(Model.SeasonNumber)@(Model.Ignored ? " ignored" : " ") gridAction' id='@Model.EpisodeId' title='Click to toggle episode ignore status' />
+        @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for episode", @class = "gridAction" }, "Search", "Episode", new { episodeId = Model.EpisodeId }, null, null)
         <img src='../../Content/Images/@(Model.Status).png' alt='@Model.Status' title='@Model.Status' class='gridImage status-@Model.Status statusImage' />
     </td>
 </tr>
diff --git a/NzbDrone.Web/Views/Series/Season.cshtml b/NzbDrone.Web/Views/Series/Season.cshtml
index fba2a9522..5764cffd8 100644
--- a/NzbDrone.Web/Views/Series/Season.cshtml
+++ b/NzbDrone.Web/Views/Series/Season.cshtml
@@ -22,9 +22,9 @@
         
             @*Commands Column*@
             <th>
-                <img src='../../Content/Images/@(Model.Ignored ? "ignored" : "notIgnored").png' class='ignoredEpisodesMaster ignoreEpisode ignoreSeason_@(Model.SeasonNumber)@(Model.Ignored ? " ignored" : " ") gridImage' title='Click to toggle season ignore status' />
-                @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for all episodes in this season", @class = "gridImage" }, "SearchSeason", "Episode", new { SeriesId = Model.SeriesId, SeasonNumber = Model.SeasonNumber }, null, null)
-                @Ajax.ImageActionLink("../../Content/Images/Rename.png", new { Alt = "Rename", Title = "Rename all episodes in this season", @class = "gridImage" }, "RenameSeason", "Episode", new { SeriesId = Model.SeriesId, SeasonNumber = Model.SeasonNumber }, null, null)
+                <img src='../../Content/Images/@(Model.Ignored ? "ignored" : "notIgnored").png' class='ignoredEpisodesMaster ignoreEpisode ignoreSeason_@(Model.SeasonNumber)@(Model.Ignored ? " ignored" : " ") gridAction' title='Click to toggle season ignore status' />
+                @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for all episodes in this season", @class = "gridAction" }, "SearchSeason", "Episode", new { SeriesId = Model.SeriesId, SeasonNumber = Model.SeasonNumber }, null, null)
+                @Ajax.ImageActionLink("../../Content/Images/Rename.png", new { Alt = "Rename", Title = "Rename all episodes in this season", @class = "gridAction" }, "RenameSeason", "Episode", new { SeriesId = Model.SeriesId, SeasonNumber = Model.SeasonNumber }, null, null)
             </th>
         </tr>
     </thead>
diff --git a/NzbDrone.Web/Views/System/Jobs.cshtml b/NzbDrone.Web/Views/System/Jobs.cshtml
index e00bd62d1..463b7030d 100644
--- a/NzbDrone.Web/Views/System/Jobs.cshtml
+++ b/NzbDrone.Web/Views/System/Jobs.cshtml
@@ -73,7 +73,7 @@
                                 if (!row.aData["Enable"])
                                     return "";
 
-                                return createImageAjaxLink('/System/RunJob?typeName=' + row.aData["TypeName"], '../../Content/Images/Gear.png', 'Run', 'Run Job', 'gridImage');
+                                return createImageAjaxLink('/System/RunJob?typeName=' + row.aData["TypeName"], '../../Content/Images/Gear.png', 'Run', 'Run Job', 'gridAction');
                                 //return createImageAjaxLink('/History/Delete?historyId=' + row.aData["HistoryId"], '../../Content/Images/X.png', 'Delete', 'Delete from History', 'searchImage');
                             }
                             } //Actions
diff --git a/NzbDrone.Web/Views/Upcoming/Index.cshtml b/NzbDrone.Web/Views/Upcoming/Index.cshtml
index 7d47cb317..22e6134bd 100644
--- a/NzbDrone.Web/Views/Upcoming/Index.cshtml
+++ b/NzbDrone.Web/Views/Upcoming/Index.cshtml
@@ -1,17 +1,21 @@
 @using NzbDrone.Web.Helpers
 @model NzbDrone.Web.Models.UpcomingEpisodesModel
-
 @{ViewBag.Title = "Upcoming";}
 @section HeaderContent
 {
     @Html.IncludeCss("Grid.css")
-    
     <style>
-        .gridControls {
+        .gridControls
+        {
             float: right;
-            padding: 0px 5px 20px 0px;
+            padding-top: 10px;
             visibility: hidden;
         }
+        
+        .sub-menu
+        {
+            float: left;
+        }
     </style>
 }
 @section ActionMenu{
@@ -19,27 +23,33 @@
         <li>@Ajax.ActionLink("Start RSS Sync", "RssSync", "Command", null, null)</li>
     </ul>
 }
-
 <div class="gridControls">
     @Html.CheckBox("showDownloaded", true)
-    <label for="showDownloaded">Show Downloaded</label>
+    <label for="showDownloaded">
+        Show Downloaded</label>
 </div>
-
 <table class="seriesTable">
     <colgroup>
-        <col/>
-        <col style="width:90px" />
-        <col style="width:300px" />
-        <col style="width:160px" />
-        <col style="width:100px" />
+        <col />
+        <col style="width: 90px" />
+        <col style="width: 300px" />
+        <col style="width: 160px" />
+        <col style="width: 100px" />
     </colgroup>
     <thead>
         <tr>
-            <th>Series Title</th>
-            <th>Episode</th>
-            <th>Episode Title</th>
-            <th>Air Time</th>
-        
+            <th>
+                Series Title
+            </th>
+            <th>
+                Episode
+            </th>
+            <th>
+                Episode Title
+            </th>
+            <th>
+                Air Time
+            </th>
             @*Commands/Status Column*@
             <th>
                 Status
@@ -52,11 +62,10 @@
                 Yesterday
             </td>
         </tr>
-    
         @for (int i = 0; i < Model.Yesterday.Count; i++)
         {
             var episode = Model.Yesterday[i];
-        
+
             if (i % 2 == 0)
             {
                 Html.RenderPartial("UpcomingEpisode", episode);
@@ -72,11 +81,10 @@
                 Today
             </td>
         </tr>
-    
         @for (int i = 0; i < Model.Today.Count; i++)
         {
             var episode = Model.Today[i];
-        
+
             if (i % 2 == 0)
             {
                 Html.RenderPartial("UpcomingEpisode", episode);
@@ -91,31 +99,29 @@
             <td colspan="6">
                 Tomorrow
             </td>
-    
-        @for (int i = 0; i < Model.Tomorrow.Count; i++)
-        {
-            var episode = Model.Tomorrow[i];
-        
-            if (i % 2 == 0)
+            @for (int i = 0; i < Model.Tomorrow.Count; i++)
             {
-                Html.RenderPartial("UpcomingEpisode", episode);
-            }
+                var episode = Model.Tomorrow[i];
 
-            else
-            {
-                Html.RenderPartial("UpcomingEpisode", episode, new ViewDataDictionary { new KeyValuePair<string, object>("AltRow", true) });
+                if (i % 2 == 0)
+                {
+                    Html.RenderPartial("UpcomingEpisode", episode);
+                }
+
+                else
+                {
+                    Html.RenderPartial("UpcomingEpisode", episode, new ViewDataDictionary { new KeyValuePair<string, object>("AltRow", true) });
+                }
             }
-        }
-        <tr class="title-row">
-            <td colspan="6">
-                Future Forecast
-            </td>
-        </tr>
-    
+            <tr class="title-row">
+                <td colspan="6">
+                    Future Forecast
+                </td>
+            </tr>
         @for (int i = 0; i < Model.Week.Count; i++)
         {
             var episode = Model.Week[i];
-        
+
             if (i % 2 == 0)
             {
                 Html.RenderPartial("UpcomingEpisode", episode);
@@ -128,7 +134,6 @@
         }
     </tbody>
 </table>
-
 @section Scripts{
     <script type="text/javascript">
         $(document).ready(function () {
@@ -171,9 +176,9 @@
         function toggleHideDownloadedCookie(show) {
             if (show)
                 $.cookie("showDownloaded", true, { expires: 365 });
-            
+
             else
                 $.cookie("showDownloaded", false, { expires: 365 });
         }
     </script>
-}
\ No newline at end of file
+}
diff --git a/NzbDrone.Web/Views/Upcoming/UpcomingEpisode.cshtml b/NzbDrone.Web/Views/Upcoming/UpcomingEpisode.cshtml
index 806dc18d3..8ab45ff19 100644
--- a/NzbDrone.Web/Views/Upcoming/UpcomingEpisode.cshtml
+++ b/NzbDrone.Web/Views/Upcoming/UpcomingEpisode.cshtml
@@ -36,7 +36,7 @@
     @*Commands Column*@
     <td class="@cellColourClass">
         <img src='../../Content/Images/@(Model.Status).png' alt='@Model.Status' title='@Model.Status' class='gridImage statusImage' />
-        @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for episode", @class = "gridImage" }, "Search", "Episode", new { episodeId = Model.EpisodeId }, null, null)
+        @Ajax.ImageActionLink("../../Content/Images/Search.png", new { Alt = "Search", Title = "Search for episode", @class = "gridAction" }, "Search", "Episode", new { episodeId = Model.EpisodeId }, null, null)
     </td>
 </tr>