diff --git a/src/scss/cdb-components/_buttons.scss b/src/scss/cdb-components/_buttons.scss
index e48b21b..c93cd66 100644
--- a/src/scss/cdb-components/_buttons.scss
+++ b/src/scss/cdb-components/_buttons.scss
@@ -160,12 +160,12 @@ Layout Component:
 */
 
 .CDB-Button {
-  transition: background, 300ms;
   position: relative;
-  box-sizing: border-box;
   padding: $baseSize $baseSize + 12;
+  transition: background, 300ms;
   border-radius: $baseSize / 2;
   cursor: pointer;
+  box-sizing: border-box;
 
 
   .CDB-Button-Text {
@@ -181,12 +181,12 @@ Layout Component:
 .CDB-Button--loading {
   .CDB-Button-loader {
     position: absolute;
-    z-index: 10;
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%) scale(0);
     transform-origin: 50%;
     opacity: 0;
+    z-index: 10;
   }
 
   .CDB-Button-Text {
@@ -399,8 +399,8 @@ Layout Component:
 
 
 .CDB-Button--secondary {
-  box-shadow: inset 0 0 0 1px $cBlue;
   color: $cBlue;
+  box-shadow: inset 0 0 0 1px $cBlue;
 
   &:hover {
     background: rgba($cBlue, 0.08);
@@ -439,8 +439,8 @@ Layout Component:
 }
 
 .CDB-Button--white {
-  box-shadow: inset 0 0 0 1px $cWhite;
   color: $cWhite;
+  box-shadow: inset 0 0 0 1px $cWhite;
 
   &:hover {
     background: rgba($cWhite, 0.08);
diff --git a/src/scss/cdb-components/_menu.scss b/src/scss/cdb-components/_menu.scss
index bbfcd66..0b01798 100644
--- a/src/scss/cdb-components/_menu.scss
+++ b/src/scss/cdb-components/_menu.scss
@@ -143,7 +143,10 @@
   }
 
   &--is-dropdown {
-    padding: $baseSize 0 0 $baseSize * 2;
+    padding-top: $baseSize;
+    padding-right: 0;
+    padding-bottom: 0;
+    padding-left: $baseSize * 2;
   }
 }
 
diff --git a/src/scss/cdb-components/forms/_dropdowns.scss b/src/scss/cdb-components/forms/_dropdowns.scss
index c322d67..ff77ab7 100644
--- a/src/scss/cdb-components/forms/_dropdowns.scss
+++ b/src/scss/cdb-components/forms/_dropdowns.scss
@@ -116,9 +116,9 @@
 
 .CDB-Dropdown {
   display: flex;
-  flex-direction: row;
   position: absolute;
   top: 40px;
+  flex-direction: row;
   max-height: 200px;
 }
 
diff --git a/src/scss/cdb-components/forms/_option-input.scss b/src/scss/cdb-components/forms/_option-input.scss
index aaf3b82..29da195 100644
--- a/src/scss/cdb-components/forms/_option-input.scss
+++ b/src/scss/cdb-components/forms/_option-input.scss
@@ -154,7 +154,8 @@
 
   &:first-child {
     margin-right: 0;
-    border-radius: 4px 0 0 4px;
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
   }
 
   &:last-child {
@@ -163,15 +164,16 @@
 
   + .CDB-OptionInput-item {
     border-left: none;
-    border-radius: 0 4px 4px 0;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
 
     &:hover::after {
-      content: '';
       position: absolute;
       left: 0;
       width: 1px;
       height: 100%;
       background-color: $cBlue;
+      content: '';
     }
   }
 }
diff --git a/src/scss/cdb-components/forms/_toggle.scss b/src/scss/cdb-components/forms/_toggle.scss
index ce2c8d1..46972f8 100644
--- a/src/scss/cdb-components/forms/_toggle.scss
+++ b/src/scss/cdb-components/forms/_toggle.scss
@@ -30,10 +30,10 @@
 
 .CDB-Toggle {
   position: absolute;
-  z-index: 1;
   width: $baseSize * 4;
   height: $baseSize * 2;
   opacity: 0;
+  z-index: 1;
 
   &:hover {
     + .CDB-ToggleFace {
@@ -55,7 +55,6 @@
     background: $cHintText;
 
     &::before {
-      content: '';
       position: absolute;
       top: 2px;
       left: 2px;
@@ -64,6 +63,7 @@
       border-radius: 50%;
       background: $cWhite;
       box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.48);
+      content: '';
     }
   }