diff --git a/src/UI/Settings/SettingsLayoutTemplate.html b/src/UI/Settings/SettingsLayoutTemplate.html
index 1d780ddd3..84a826ecb 100644
--- a/src/UI/Settings/SettingsLayoutTemplate.html
+++ b/src/UI/Settings/SettingsLayoutTemplate.html
@@ -8,26 +8,28 @@
     <li><a href="#general" class="x-general-tab no-router">General</a></li>
 </ul>
 
-<div class="row">
-    <div class="col-sm-12">
-        <div class="pull-right">
-            <div class="advanced-settings-toggle">
-                <span class="help-inline-checkbox">
-                    Advanced Settings
-                </span>
-                <label class="checkbox toggle well">
-                    <input type="checkbox" class="x-advanced-settings"/>
-                    <p>
-                        <span>Shown</span>
-                        <span>Hidden</span>
-                    </p>
-                    <div class="btn btn-warning slide-button"/>
-                </label>
-
-            </div>
-            <button class="btn btn-primary x-save-settings">Save</button>
+<div class="row settings-controls">
+    <div class="col-sm-4 col-sm-offset-7 col-md-3 col-md-offset-8">
+        <div class="advanced-settings-toggle">
+            <span class="help-inline-checkbox hidden-xs">
+                Advanced Settings
+            </span>
+            <label class="checkbox toggle well">
+                <input type="checkbox" class="x-advanced-settings"/>
+                <p>
+                    <span>Shown</span>
+                    <span>Hidden</span>
+                </p>
+                <div class="btn btn-warning slide-button"/>
+            </label>
+            <span class="help-inline-checkbox hidden-sm hidden-md hidden-lg">
+                Advanced Settings
+            </span>
         </div>
     </div>
+    <div class="col-sm-1 col-md-1">
+        <button class="btn btn-primary x-save-settings">Save</button>
+    </div>
 </div>
 
 <div class="tab-content">
diff --git a/src/UI/Settings/settings.less b/src/UI/Settings/settings.less
index f8215970a..831d3d763 100644
--- a/src/UI/Settings/settings.less
+++ b/src/UI/Settings/settings.less
@@ -52,10 +52,13 @@ li.save-and-add:hover {
   width: 500px;
 }
 
-.advanced-settings-toggle {
+.settings-controls {
   margin-top: 10px;
-  margin-right: 40px;
+}
+
+.advanced-settings-toggle {
   display: inline-block;
+  margin-bottom: 10px;
 
   .checkbox {
     width         : 100px;