diff --git a/services/web/frontend/stylesheets/app/editor/toolbar.less b/services/web/frontend/stylesheets/app/editor/toolbar.less
index fabc50a34f..2196b47059 100644
--- a/services/web/frontend/stylesheets/app/editor/toolbar.less
+++ b/services/web/frontend/stylesheets/app/editor/toolbar.less
@@ -261,8 +261,6 @@
   align-items: center;
   height: 24px;
   margin-right: 5px;
-  background-color: @toggle-switch-bg;
-  border: 2px solid @toggle-switch-bg;
   border-radius: @btn-border-radius-base;
   overflow: hidden;
 }
@@ -281,7 +279,8 @@
   overflow: hidden;
 
   span {
-    display: block;
+    display: flex;
+    align-items: center;
     height: 100%;
     line-height: 20px; // parent height minus border
     width: 100%;
@@ -323,14 +322,13 @@
 
   .toggle-switch {
     margin-left: 5px;
-    border: 1px solid #cdd0d6;
   }
 
   .toggle-switch-label span {
     padding: 1px 6px;
     background: none;
     transition: background 0.12s ease-out;
-    border-right: 1px solid #cdd0d6;
+    border-right: 1px solid @ol-blue-gray-2;
   }
 
   .toggle-switch-label:first-of-type span {
@@ -342,6 +340,10 @@
     border-right: none;
   }
 
+  .toggle-switch-input + .toggle-switch-label {
+    background: @toggle-switch-bg;
+  }
+
   .toggle-switch-input:checked + .toggle-switch-label {
     background: @toggle-switch-highlight-color;
   }