diff --git a/NzbDrone.Web/Content/Images/AirsToday.png b/NzbDrone.Web/Content/Images/AirsToday.png
deleted file mode 100644
index 9a1158e25..000000000
Binary files a/NzbDrone.Web/Content/Images/AirsToday.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/Downloading.png b/NzbDrone.Web/Content/Images/Downloading.png
deleted file mode 100644
index f49538894..000000000
Binary files a/NzbDrone.Web/Content/Images/Downloading.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/Failed.png b/NzbDrone.Web/Content/Images/Failed.png
deleted file mode 100644
index 0da860271..000000000
Binary files a/NzbDrone.Web/Content/Images/Failed.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/False.png b/NzbDrone.Web/Content/Images/False.png
deleted file mode 100644
index 445702cc8..000000000
Binary files a/NzbDrone.Web/Content/Images/False.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/Gear.png b/NzbDrone.Web/Content/Images/Gear.png
deleted file mode 100644
index 2e4fedcaa..000000000
Binary files a/NzbDrone.Web/Content/Images/Gear.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/Missing.png b/NzbDrone.Web/Content/Images/Missing.png
deleted file mode 100644
index 01d4ef3a8..000000000
Binary files a/NzbDrone.Web/Content/Images/Missing.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/NotAired.png b/NzbDrone.Web/Content/Images/NotAired.png
deleted file mode 100644
index 887989a35..000000000
Binary files a/NzbDrone.Web/Content/Images/NotAired.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/Plus.png b/NzbDrone.Web/Content/Images/Plus.png
deleted file mode 100644
index dbb1e9449..000000000
Binary files a/NzbDrone.Web/Content/Images/Plus.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/Ready.png b/NzbDrone.Web/Content/Images/Ready.png
deleted file mode 100644
index 8501a8b58..000000000
Binary files a/NzbDrone.Web/Content/Images/Ready.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/Rename.png b/NzbDrone.Web/Content/Images/Rename.png
deleted file mode 100644
index bfeb37431..000000000
Binary files a/NzbDrone.Web/Content/Images/Rename.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/Search.png b/NzbDrone.Web/Content/Images/Search.png
deleted file mode 100644
index c445e5c6d..000000000
Binary files a/NzbDrone.Web/Content/Images/Search.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/True.png b/NzbDrone.Web/Content/Images/True.png
deleted file mode 100644
index e71398fa7..000000000
Binary files a/NzbDrone.Web/Content/Images/True.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/Unpacking.png b/NzbDrone.Web/Content/Images/Unpacking.png
deleted file mode 100644
index 7ed2b5905..000000000
Binary files a/NzbDrone.Web/Content/Images/Unpacking.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/VideoFolder.png b/NzbDrone.Web/Content/Images/VideoFolder.png
deleted file mode 100644
index 566c41eb7..000000000
Binary files a/NzbDrone.Web/Content/Images/VideoFolder.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/XbmcNotification.png b/NzbDrone.Web/Content/Images/XbmcNotification.png
deleted file mode 100644
index abbbe37bc..000000000
Binary files a/NzbDrone.Web/Content/Images/XbmcNotification.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/changequality.png b/NzbDrone.Web/Content/Images/changequality.png
deleted file mode 100644
index 97cdc14cf..000000000
Binary files a/NzbDrone.Web/Content/Images/changequality.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/close.png b/NzbDrone.Web/Content/Images/close.png
deleted file mode 100644
index 4e05dcd87..000000000
Binary files a/NzbDrone.Web/Content/Images/close.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/error.png b/NzbDrone.Web/Content/Images/error.png
deleted file mode 100644
index 8b4de1fc8..000000000
Binary files a/NzbDrone.Web/Content/Images/error.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/ignored.png b/NzbDrone.Web/Content/Images/ignored.png
deleted file mode 100644
index 41423bad2..000000000
Binary files a/NzbDrone.Web/Content/Images/ignored.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/ignoredNeutral.png b/NzbDrone.Web/Content/Images/ignoredNeutral.png
deleted file mode 100644
index a7181b004..000000000
Binary files a/NzbDrone.Web/Content/Images/ignoredNeutral.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/notIgnored.png b/NzbDrone.Web/Content/Images/notIgnored.png
deleted file mode 100644
index 4ead4b480..000000000
Binary files a/NzbDrone.Web/Content/Images/notIgnored.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/pause.png b/NzbDrone.Web/Content/Images/pause.png
deleted file mode 100644
index 289b66e4b..000000000
Binary files a/NzbDrone.Web/Content/Images/pause.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/play.png b/NzbDrone.Web/Content/Images/play.png
deleted file mode 100644
index 8501a8b58..000000000
Binary files a/NzbDrone.Web/Content/Images/play.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/redownload.png b/NzbDrone.Web/Content/Images/redownload.png
deleted file mode 100644
index 77e12d1c6..000000000
Binary files a/NzbDrone.Web/Content/Images/redownload.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/settings.png b/NzbDrone.Web/Content/Images/settings.png
deleted file mode 100644
index 6587d5bc3..000000000
Binary files a/NzbDrone.Web/Content/Images/settings.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/stop.png b/NzbDrone.Web/Content/Images/stop.png
deleted file mode 100644
index c61d557d4..000000000
Binary files a/NzbDrone.Web/Content/Images/stop.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/success.png b/NzbDrone.Web/Content/Images/success.png
deleted file mode 100644
index 4dcf07651..000000000
Binary files a/NzbDrone.Web/Content/Images/success.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/Images/x_16.png b/NzbDrone.Web/Content/Images/x_16.png
deleted file mode 100644
index cf640c105..000000000
Binary files a/NzbDrone.Web/Content/Images/x_16.png and /dev/null differ
diff --git a/NzbDrone.Web/Content/NzbDrone.css b/NzbDrone.Web/Content/NzbDrone.css
index 91782ee1d..d0d3bdeda 100644
--- a/NzbDrone.Web/Content/NzbDrone.css
+++ b/NzbDrone.Web/Content/NzbDrone.css
@@ -193,6 +193,19 @@ button span, input[type="button"] span, input[type="submit"] span, input[type="r
     width: auto;
 }
 
+.delete-root {
+    color: red;
+}
+
+.delete-root:before {
+    vertical-align: middle !important;
+}
+
+.delete-root:hover {
+    cursor: pointer !important;
+}
+
+/* Local Series Search */
 #localSeriesLookup
 {
     width: 220px;
diff --git a/NzbDrone.Web/Content/jquery.gritter.css b/NzbDrone.Web/Content/jquery.gritter.css
index 2e9bfa6df..59c591781 100644
--- a/NzbDrone.Web/Content/jquery.gritter.css
+++ b/NzbDrone.Web/Content/jquery.gritter.css
@@ -72,6 +72,16 @@
     border-color: rgb(212, 44, 44);
 }
 
+.gritter-success .gritter-icon
+{
+    color: rgb(100, 135, 46);
+}
+
+.gritter-fail .gritter-icon
+{
+    color: rgb(212, 44, 44);
+}
+
 .hover .gritter-item
 {
     background-position: right -40px;
@@ -116,3 +126,9 @@
     width: 220px;
     float: right;
 }
+
+.gritter-icon {
+    font-size: 50px;
+    float: left;
+    line-height: 35px;
+}
\ No newline at end of file
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index 501a4d096..f7576a8a1 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -165,12 +165,8 @@
     <Content Include="Content\DataTables-1.9.0\media\images\sort_both.png" />
     <Content Include="Content\DataTables-1.9.0\media\images\sort_desc.png" />
     <Content Include="Content\DataTables-1.9.0\media\images\sort_desc_disabled.png" />
-    <Content Include="Content\Images\AirsToday.png" />
     <Content Include="Content\Images\background.jpg" />
     <Content Include="Content\Images\blue.png" />
-    <Content Include="Content\Images\changequality.png" />
-    <Content Include="Content\Images\False.png" />
-    <Content Include="Content\Images\Gear.png" />
     <Content Include="Content\Images\green.png" />
     <Content Include="Content\Images\Indexers\FileSharingTalk.png" />
     <Content Include="Content\Images\Indexers\Newznab.png" />
@@ -182,14 +178,8 @@
     <Content Include="Content\Images\Indexers\WomblesIndex.png" />
     <Content Include="Content\Images\logo.png" />
     <Content Include="Content\Images\logo_small.png" />
-    <Content Include="Content\Images\pause.png" />
-    <Content Include="Content\Images\play.png" />
     <Content Include="Content\Images\red.png" />
-    <Content Include="Content\Images\redownload.png" />
-    <Content Include="Content\Images\settings.png" />
-    <Content Include="Content\Images\stop.png" />
     <Content Include="Content\Images\thetvdb.png" />
-    <Content Include="Content\Images\True.png" />
     <Content Include="Content\Images\yellow.png" />
     <Content Include="Content\IndexerSettings.css" />
     <Content Include="Content\jQueryUI\images\ui-bg_diagonals-thick_30_a32d00_40x40.png" />
@@ -208,18 +198,9 @@
     <Content Include="Content\jQueryUI\jquery-ui-1.8.16.custom.css" />
     <Content Include="Content\Messages.css" />
     <Content Include="Content\Grid.css" />
-    <Content Include="Content\Images\close.png" />
-    <Content Include="Content\Images\Downloading.png" />
     <Content Include="Content\Images\error.png" />
-    <Content Include="Content\Images\Failed.png" />
     <Content Include="Content\Images\gritter.png" />
-    <Content Include="Content\Images\Missing.png" />
-    <Content Include="Content\Images\NotAired.png" />
-    <Content Include="Content\Images\Ready.png" />
-    <Content Include="Content\Images\Rename.png" />
-    <Content Include="Content\Images\Search.png" />
     <Content Include="Content\Images\success.png" />
-    <Content Include="Content\Images\Unpacking.png" />
     <Content Include="Content\jquery.gritter.css" />
     <Content Include="Content\Menu.css" />
     <Compile Include="..\NzbDrone.Common\Properties\SharedAssemblyInfo.cs">
@@ -288,10 +269,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\ActionButton.css" />
-    <Content Include="Content\Images\ignored.png" />
-    <Content Include="Content\Images\ignoredNeutral.png" />
-    <Content Include="Content\Images\notIgnored.png" />
-    <Content Include="Content\Images\x_16.png" />
     <Content Include="Content\QualitySettings.css" />
     <Content Include="Content\Overrides.css" />
     <Content Include="Content\Images\ajax-loader.gif" />
@@ -300,11 +277,8 @@
     <Content Include="Content\Images\Indexers\NzbMatrix.png" />
     <Content Include="Content\Images\Indexers\NzbsRus.png" />
     <Content Include="Content\Images\Indexers\Unknown.png" />
-    <Content Include="Content\Images\Plus.png" />
-    <Content Include="Content\Images\VideoFolder.png" />
     <Content Include="Content\Settings.css" />
     <Content Include="Content\NzbDrone.css" />
-    <Content Include="Content\Images\XbmcNotification.png" />
     <Content Include="Content\themes\base\images\ui-bg_flat_0_aaaaaa_40x100.png" />
     <Content Include="Content\themes\base\images\ui-bg_flat_75_ffffff_40x100.png" />
     <Content Include="Content\themes\base\images\ui-bg_glass_55_fbf9ee_1x400.png" />
diff --git a/NzbDrone.Web/Scripts/NzbDrone/Notification.js b/NzbDrone.Web/Scripts/NzbDrone/Notification.js
index 64519f6fe..05d0b5a12 100644
--- a/NzbDrone.Web/Scripts/NzbDrone/Notification.js
+++ b/NzbDrone.Web/Scripts/NzbDrone/Notification.js
@@ -16,7 +16,7 @@
                 $.gritter.add({
                     title: data.Title,
                     text: data.Text,
-                    image: '../../content/images/success.png',
+                    icon: 'icon-info-sign',
                     class_name: 'gritter-success'
                 });
             }
@@ -24,7 +24,7 @@
                 $.gritter.add({
                     title: data.Title,
                     text: data.Text,
-                    image: '../../content/images/error.png',
+                    icon: 'icon-minus-sign',
                     class_name: 'gritter-fail',
                     time: 10000
                 });
@@ -40,7 +40,7 @@
             $.gritter.add({
                 title: 'Request failed',
                 text: 'Url: ' + this.url + '<br/>Error: ' + thrownError,
-                image: '../../content/images/error.png',
+                icon: 'icon-minus-sign',
                 class_name: 'gritter-fail',
                 time: 10000
             });
diff --git a/NzbDrone.Web/Scripts/NzbDrone/addSeries.js b/NzbDrone.Web/Scripts/NzbDrone/addSeries.js
index b5601620d..d7576e0bc 100644
--- a/NzbDrone.Web/Scripts/NzbDrone/addSeries.js
+++ b/NzbDrone.Web/Scripts/NzbDrone/addSeries.js
@@ -33,7 +33,7 @@ $(".addExistingButton").live('click', function () {
         $.gritter.add({
             title: 'Failed',
             text: 'Invalid Series Information for \'' + path + '\'',
-            image: '../../content/images/error.png',
+            icon: 'icon-minus-sign',
             class_name: 'gritter-fail'
         });
 
@@ -76,8 +76,8 @@ $(".start-date-master").live('change', function () {
 
 //RootDir
 //Delete RootDir
-$('#rootDirs .actionButton img').live('click', function (image) {
-    var path = $(image.target).attr('id');
+$(document).on('click', '.delete-root', function () {
+    var path = $(this).attr('data-path');
 
     $.ajax({
         type: "POST",
diff --git a/NzbDrone.Web/Scripts/jquery.gritter.js b/NzbDrone.Web/Scripts/jquery.gritter.js
index 2a6f6e460..f2b806b47 100644
--- a/NzbDrone.Web/Scripts/jquery.gritter.js
+++ b/NzbDrone.Web/Scripts/jquery.gritter.js
@@ -103,6 +103,7 @@
             var user = params.title,
 				text = params.text,
 				image = params.image || '',
+                icon = params.icon || '',
 				sticky = params.sticky || false,
 				item_class = params.class_name || '',
                 position = $.gritter.options.position,
@@ -127,13 +128,22 @@
                 this._custom_timer = time_alive;
             }
 
-            var image_str = (image != '') ? '<img src="' + image + '" class="gritter-image" />' : '',
-				class_name = (image != '') ? 'gritter-with-image' : 'gritter-without-image';
+            var image_str = (image != '') ? '<img src="' + image + '" class="gritter-image" />' : '';
+            var icon_str = (icon != '') ? '<i class="' + icon + ' gritter-icon"></i>' : '';
+            var class_name = (image != ''|| icon != '') ? 'gritter-with-image' : 'gritter-without-image';
+
+            var iconImage = '';
+            
+            if (image_str != '')
+                iconImage = image_str;
+            
+            if (icon_str != '')
+                iconImage = icon_str;
 
             // String replacements on the template
             tmp = this._str_replace(
 				['[[username]]', '[[text]]', '[[close]]', '[[image]]', '[[number]]', '[[class_name]]', '[[item_class]]'],
-				[user, text, this._tpl_close, image_str, this._item_count, class_name, item_class], tmp
+				[user, text, this._tpl_close, iconImage, this._item_count, class_name, item_class], tmp
 			);
 
             this['_before_open_' + number]();
diff --git a/NzbDrone.Web/Views/AddSeries/RootList.cshtml b/NzbDrone.Web/Views/AddSeries/RootList.cshtml
index 81dabb80c..2cc2c2db3 100644
--- a/NzbDrone.Web/Views/AddSeries/RootList.cshtml
+++ b/NzbDrone.Web/Views/AddSeries/RootList.cshtml
@@ -8,7 +8,7 @@
 @foreach (var root in Model)
 {
     <div class="actionButton delete">
-        <img src="../../Content/Images/x_16.png" alt="delete" id='@root'/>
+        <i class="icon-remove icon-large delete-root" data-path="@root"></i>
         <span>@root</span>
     </div>
 }
diff --git a/NzbDrone.Web/Views/History/Index.cshtml b/NzbDrone.Web/Views/History/Index.cshtml
index 541c467e1..3773dff5a 100644
--- a/NzbDrone.Web/Views/History/Index.cshtml
+++ b/NzbDrone.Web/Views/History/Index.cshtml
@@ -95,7 +95,7 @@
                                 }, //Date
                                 { sName: 'Actions', sWidth: '40px', "mDataProp": "HistoryId", "bSortable": false, "bSearchable": false, "fnRender": function (row) {
                                     var deleteImage = '<i class="icon-remove gridAction" title="Delete from History" onclick="deleteHistory(this.parentNode.parentNode, ' + row.aData["HistoryId"] + ')"></i>';
-                                    var redownloadImage = '<i class="icon-share-alt gridAction" title="Redownload Episode" onclick="redownloadHistory(this.parentNode.parentNode, ' + row.aData["HistoryId"] + ', ' + row.aData["EpisodeId"] + ')"></i>';
+                                    var redownloadImage = '<i class="icon-repeat gridAction" title="Redownload Episode" onclick="redownloadHistory(this.parentNode.parentNode, ' + row.aData["HistoryId"] + ', ' + row.aData["EpisodeId"] + ')"></i>';
 
                                     return deleteImage + redownloadImage;
                                 }