diff --git a/less/about/preferences.less b/less/about/preferences.less
index 0d2ba454d4d..c56ceba9deb 100644
--- a/less/about/preferences.less
+++ b/less/about/preferences.less
@@ -1012,9 +1012,9 @@ div.nextPaymentSubmission {
 }
 
 #searchSelectIcon {
-	width: 16px;
-	height: 16px;
-	color: @braveOrange;
+  width: 16px;
+  height: 16px;
+  color: @braveOrange;
 }
 
 .prefTabContainer .switchControl {
@@ -1038,7 +1038,6 @@ div.nextPaymentSubmission {
     .switchBackground.switchedOn {
       background-color: @switchBG_on;
       .switchIndicator {
-        left: auto;
         right: 2px;
       }
     }
@@ -1096,7 +1095,6 @@ div.nextPaymentSubmission {
       background-color: white;
       border-radius: 100%;
       height: @switchNubDiameter;
-      left: @switchNubLeftMargin;
       position: absolute;
       top: @switchNubTopMargin;
       width: @switchNubDiameter;
diff --git a/less/switchControls.less b/less/switchControls.less
index 51daabbe3e0..329d7f973aa 100644
--- a/less/switchControls.less
+++ b/less/switchControls.less
@@ -19,8 +19,7 @@
     .switchBackground.switchedOn {
       background-color: @braveOrange;
       .switchIndicator {
-        left: auto;
-        right: @switchNubRightMargin;
+        right: 2px;
       }
     }
   }
@@ -29,10 +28,11 @@
     .switchBackground {
       height: 26px;
       width: 60px;
-        background-color: @switchBG_off_lrg;
+      background-color: @switchBG_off_lrg;
       .switchIndicator {
         height: 22px;
         width: 22px;
+        right: calc(60px - 22px - @switchNubRightMargin);
       }
     }
   }
@@ -70,16 +70,18 @@
     position: relative;
     width: @switchWidth;
     box-shadow: @switchShadow;
+    transition: @switchBGTransition;
 
     .switchIndicator {
       background-color: white;
       border-radius: 100%;
       height: @switchNubDiameter;
-      left: @switchNubLeftMargin;
+      right: calc(@switchWidth - @switchNubDiameter - @switchNubRightMargin);
       position: absolute;
       top: @switchNubTopMargin;
       width: @switchNubDiameter;
       box-shadow: @switchNubShadow;
+      transition: @switchNubTransition;
     }
   }
 }
diff --git a/less/variables.less b/less/variables.less
index fce89a7897e..42607aa818b 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -51,6 +51,7 @@
 @switchBG_off: #d3d3d3;
 @switchBG_off_lrg: #adadad;
 @switchBG_dis: #e8e8e8;
+@switchBGTransition: background-color 100ms;
 @switchHeight: 16px;
 @switchWidth: 45px;
 @switchRadius: 10px;
@@ -61,6 +62,7 @@
 @switchNubRightMargin: 2px;
 @switchNubColor: white;
 @switchNubShadow: 1px 1px 5px -2px black;
+@switchNubTransition: right 100ms;
 
 @navbarHeight: 36px;
 @downloadsBarHeight: 50px;