diff --git a/UI/Index.html b/UI/Index.html
index 0e2a5ab8e..492116257 100644
--- a/UI/Index.html
+++ b/UI/Index.html
@@ -20,6 +20,7 @@
     <link href="/series/details.css" rel='stylesheet' type='text/css'/>
     <link href="/content/base.css" rel='stylesheet' type='text/css'/>
     <link href="/settings/notifications/notifications.css" rel='stylesheet' type='text/css'/>
+    <link href="/settings/indexers/indexers.css" rel='stylesheet' type='text/css'/>
 </head>
 <body>
 <div id="in-sub-nav">
diff --git a/UI/Settings/Indexers/CollectionTemplate.html b/UI/Settings/Indexers/CollectionTemplate.html
index 68ad64985..c65a8121f 100644
--- a/UI/Settings/Indexers/CollectionTemplate.html
+++ b/UI/Settings/Indexers/CollectionTemplate.html
@@ -6,6 +6,6 @@
 
 <div class="row">
     <div class="span12">
-        <div id="x-indexers" class="form-horizontal"></div>
+        <ul id="x-indexers" class="indexer-list"></ul>
     </div>
 </div>
\ No newline at end of file
diff --git a/UI/Settings/Indexers/ItemTemplate.html b/UI/Settings/Indexers/ItemTemplate.html
index 41d7af988..1dd58a51c 100644
--- a/UI/Settings/Indexers/ItemTemplate.html
+++ b/UI/Settings/Indexers/ItemTemplate.html
@@ -1,5 +1,5 @@
-﻿<fieldset>
-    <legend>{{name}}</legend>
+﻿<div class="indexer-settings-item">
+    <h2>{{name}}</h2>
 
     <div class="control-group">
         <label class="control-label">Enable</label>
@@ -14,12 +14,8 @@
 
                 <div class="btn btn-primary slide-button"></div>
             </label>
-
-            <span class="help-inline-checkbox">
-                <i class="icon-question-sign" title="Do you want to use {{name}} to download NZBs?"></i>
-            </span>
         </div>
     </div>
 
     {{formBuilder}}
-</fieldset>
+</div>
\ No newline at end of file
diff --git a/UI/Settings/Indexers/ItemView.js b/UI/Settings/Indexers/ItemView.js
index 0dc112854..49e334135 100644
--- a/UI/Settings/Indexers/ItemView.js
+++ b/UI/Settings/Indexers/ItemView.js
@@ -7,6 +7,7 @@ define([
 ], function () {
 
     NzbDrone.Settings.Indexers.ItemView = Backbone.Marionette.ItemView.extend({
-        template  : 'Settings/Indexers/ItemTemplate'
+        template  : 'Settings/Indexers/ItemTemplate',
+        tagName   : 'li'
     });
 });
diff --git a/UI/Settings/Indexers/indexers.less b/UI/Settings/Indexers/indexers.less
new file mode 100644
index 000000000..04644b7a0
--- /dev/null
+++ b/UI/Settings/Indexers/indexers.less
@@ -0,0 +1,19 @@
+@import "../../Shared/Styles/card";
+
+.indexer-list {
+  li {
+    display: inline-block;
+    vertical-align: top;
+  }
+}
+
+.indexer-settings-item {
+
+  .card;
+
+  min-width: 220px;
+
+  h2 {
+    margin-top: 0px;
+  }
+}
\ No newline at end of file
