diff --git a/UI/Content/form.less b/UI/Content/form.less
index 00a64b748..3d9e5267c 100644
--- a/UI/Content/form.less
+++ b/UI/Content/form.less
@@ -3,8 +3,9 @@
 .control-group {
   .controls {
     i {
-      font-size : 16px;
-      color     : #595959;
+      font-size    : 16px;
+      color        : #595959;
+      margin-right : 5px;
     }
     .checkbox {
       width         : 100px;
@@ -15,7 +16,6 @@
     }
 
     .help-inline-checkbox {
-      padding-left   : 5px;
       display        : inline-block;
       margin-top     : -20px;
       margin-bottom  : 0;
@@ -35,9 +35,9 @@ textarea.release-restrictions {
 }
 
 .help-link {
-  text-decoration: none !important;
+  text-decoration : none !important;
 
   i {
     .clickable;
   }
-}
\ No newline at end of file
+}
diff --git a/UI/Content/icons.less b/UI/Content/icons.less
index e48924f8b..0a253e951 100644
--- a/UI/Content/icons.less
+++ b/UI/Content/icons.less
@@ -46,6 +46,11 @@
   transform         : scale(1, -1);
 }
 
+.icon-nd-warning:before {
+  .icon(@warning-sign);
+  color : #f89406;
+}
+
 .icon-nd-edit:before {
   .icon(@wrench);
 }
diff --git a/UI/Settings/General/GeneralTemplate.html b/UI/Settings/General/GeneralTemplate.html
index 35ddf1dd1..bb9de7626 100644
--- a/UI/Settings/General/GeneralTemplate.html
+++ b/UI/Settings/General/GeneralTemplate.html
@@ -92,16 +92,19 @@
     </fieldset>
 
     {{#unless_eq branch compare="master"}}
-        <fieldset>
-            <legend>Updating</legend>
-
-            <div class="control-group">
-                <label class="control-label">Branch</label>
+    <fieldset>
+        <legend>Development</legend>
+        <div class="alert">
+            <i class="icon-nd-warning"></i>
+            Don't change anything here unless you know what you are doing.
+        </div>
+        <div class="control-group">
+            <label class="control-label">Branch</label>
 
-                <div class="controls">
-                    <input type="text" placeholder="master" name="branch"/>
-                </div>
+            <div class="controls">
+                <input type="text" placeholder="master" name="branch"/>
             </div>
-        </fieldset>
+        </div>
+    </fieldset>
     {{/unless_eq}}
 </div>
diff --git a/UI/Settings/Indexers/ItemTemplate.html b/UI/Settings/Indexers/ItemTemplate.html
index 617fb94aa..87acb9e0b 100644
--- a/UI/Settings/Indexers/ItemTemplate.html
+++ b/UI/Settings/Indexers/ItemTemplate.html
@@ -3,7 +3,9 @@
         <h3>{{name}}</h3>
         {{#if_eq implementation compare="Newznab"}}
             <span class="btn-group pull-right">
-                <button class="btn btn-mini btn-icon-only x-delete"><i class="icon-nd-delete"/></button>
+                <button class="btn btn-mini btn-icon-only x-delete">
+                    <i class="icon-nd-delete"/>
+                </button>
             </span>
         {{/if_eq}}
     </div>
@@ -27,8 +29,9 @@
     {{formBuilder}}
 
     {{#if_eq name compare="WomblesIndex"}}
-        <div class="alert">
-            <strong>Warning!</strong> Does not support searching
-        </div>
+    <div class="alert">
+        <i class="icon-nd-warning"></i>
+        Does not support searching
+    </div>
     {{/if_eq}}
 </div>