diff --git a/UI/Settings/Indexers/ItemTemplate.html b/UI/Settings/Indexers/ItemTemplate.html
index bfd26351b..b88224700 100644
--- a/UI/Settings/Indexers/ItemTemplate.html
+++ b/UI/Settings/Indexers/ItemTemplate.html
@@ -1,5 +1,12 @@
 <div class="indexer-settings-item">
-    <h2>{{name}}</h2>
+    <div>
+        <h3>{{name}}</h3>
+        {{#if isNewznab}}
+            <span class="btn-group pull-right">
+                <button class="btn btn-mini x-delete"><i class="icon-nd-delete"/></button>
+            </span>
+        {{/if}}
+    </div>
 
     <div class="control-group">
         <label class="control-label">Enable</label>
diff --git a/UI/Settings/Indexers/indexers.less b/UI/Settings/Indexers/indexers.less
index 5ff59a40e..7f51b7c39 100644
--- a/UI/Settings/Indexers/indexers.less
+++ b/UI/Settings/Indexers/indexers.less
@@ -15,7 +15,16 @@
   height: 260px;
   padding: 10px 15px;
 
-  h2 {
+  h3 {
     margin-top: 0px;
+    display: inline-block;
+    width: 190px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .btn-group {
+    margin-top: 8px;
   }
 }
\ No newline at end of file
diff --git a/UI/Settings/Quality/Profile/QualityProfileTemplate.html b/UI/Settings/Quality/Profile/QualityProfileTemplate.html
index 08a1647b6..da6043665 100644
--- a/UI/Settings/Quality/Profile/QualityProfileTemplate.html
+++ b/UI/Settings/Quality/Profile/QualityProfileTemplate.html
@@ -1,9 +1,9 @@
 <div class="quality-profile-item">
     <div>
-        <h2 name="name"></h2>
+        <h3 name="name"></h3>
         <span class="btn-group pull-right">
-            <button class="btn btn-mini x-edit">Edit</button>
-            <button class="btn btn-mini btn-danger x-delete">Delete</button>
+            <button class="btn btn-mini x-edit"><i class="icon-nd-edit"/></button>
+            <button class="btn btn-mini x-delete"><i class="icon-nd-delete"/></button>
         </span>
     </div>
 
diff --git a/UI/Settings/Quality/quality.less b/UI/Settings/Quality/quality.less
index 1c414d82c..c80a17c88 100644
--- a/UI/Settings/Quality/quality.less
+++ b/UI/Settings/Quality/quality.less
@@ -15,13 +15,17 @@
   height: 120px;
   padding: 10px 15px;
 
-  h2 {
+  h3 {
     margin-top: 0px;
     display: inline-block;
+    width: 200px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 
   .btn-group {
-    margin-top: 10px;
+    margin-top: 8px;
   }
 }
 
@@ -33,7 +37,7 @@
   height: 200px;
   padding: 10px 15px;
 
-  h2 {
+  h3 {
     margin-top: 0px;
     text-align: center;
   }