diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index ba0e013c8bf..020db3d5fd3 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -144,10 +144,13 @@
       }
     }
     .composer-controls {
+      display: flex;
       margin-left: auto;
-      margin-right: -5px;
       button {
-        padding: 0 2px;
+        padding: 5px 7px;
+        &.toggler {
+          order: 2;
+        }
       }
     }
   }
diff --git a/app/assets/stylesheets/common/select-kit/composer-actions.scss b/app/assets/stylesheets/common/select-kit/composer-actions.scss
index 7d89bbc71fc..93f420fe5c9 100644
--- a/app/assets/stylesheets/common/select-kit/composer-actions.scss
+++ b/app/assets/stylesheets/common/select-kit/composer-actions.scss
@@ -7,15 +7,17 @@
         outline: none;
         padding: 0;
         margin-right: 5px;
-
+        border: 1px solid $primary-low;
+        min-height: unset;
+        .d-icon {
+          padding: 5px 6px;
+        }
         &:hover,
         &:focus {
           background: $primary-low;
         }
       }
       .d-icon {
-        border: 1px solid $primary-low;
-        padding: 4px 5px;
         margin: 0 !important;
       }
     }
diff --git a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
index b240227b989..07e30b04895 100644
--- a/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
+++ b/app/assets/stylesheets/common/select-kit/dropdown-select-box.scss
@@ -37,7 +37,7 @@
         justify-content: center;
         -ms-flex-item-align: start;
         align-self: flex-start;
-        margin-right: 10px;
+        margin-right: 0.357em;
         margin-top: 2px;
         width: 30px;