diff --git a/client/src/components/helpers/toggle-button.css b/client/src/components/helpers/toggle-button.css
index b5a1cc1409..cfb9d02cd5 100644
--- a/client/src/components/helpers/toggle-button.css
+++ b/client/src/components/helpers/toggle-button.css
@@ -65,11 +65,6 @@ label.toggle-label {
 }
 
 @media (max-width: 440px) {
-  .btn-group .btn + .btn {
-    margin-left: 0px;
-    margin-top: -2px;
-  }
-
   .btn:first-child > .tick {
     left: auto;
     right: 5px;
diff --git a/client/src/components/settings/toggle-setting.css b/client/src/components/settings/toggle-setting.css
index 8bf25b6b67..c2c0677ffe 100644
--- a/client/src/components/settings/toggle-setting.css
+++ b/client/src/components/settings/toggle-setting.css
@@ -25,6 +25,10 @@
 }
 
 @media (max-width: 440px) {
+  .toggle-setting-container .form-group {
+    flex-direction: column;
+  }
+
   .toggle-setting-container > .form-group > * {
     flex: 0 1 auto;
   }
@@ -33,9 +37,13 @@
     justify-content: flex-start;
   }
 
+  .toggle-setting-container .help-block {
+    margin-bottom: 0px;
+  }
+
   .toggle-setting-container .btn-group {
-    flex-direction: column;
-    align-items: stretch;
     justify-content: flex-start;
+    margin-top: 5px;
+    margin-bottom: 5px;
   }
 }