diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 1c8e0ca17dc..6c7ab1802cf 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -186,7 +186,7 @@ input {
   &[type="color"] {
     @include appearance-none;
     display: inline-block;
-    padding: 4px 10px;
+    padding: $input-padding;
     margin-bottom: 9px;
     font-size:  $font-0;
     line-height: $line-height-large;
diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss
index 6c28ae24168..9075501227c 100644
--- a/app/assets/stylesheets/common/foundation/variables.scss
+++ b/app/assets/stylesheets/common/foundation/variables.scss
@@ -9,6 +9,8 @@ $small-width: 800px !default;
 $medium-width: 995px !default;
 $large-width: 1110px !default;
 
+$input-padding: 4px 10px;
+
 // Brand color variables
 // --------------------------------------------------
 
diff --git a/app/assets/stylesheets/common/select-kit/category-chooser.scss b/app/assets/stylesheets/common/select-kit/category-chooser.scss
index 09a20fc434d..10ad31953e9 100644
--- a/app/assets/stylesheets/common/select-kit/category-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/category-chooser.scss
@@ -3,10 +3,6 @@
     &.category-chooser {
       width: 300px;
 
-      .combo-box-header {
-        padding: 4px;
-      }
-
       .select-kit-row {
         display: -webkit-box;
         display: -ms-flexbox;
diff --git a/app/assets/stylesheets/common/select-kit/category-drop.scss b/app/assets/stylesheets/common/select-kit/category-drop.scss
index 70f21e78145..9facf687ce3 100644
--- a/app/assets/stylesheets/common/select-kit/category-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/category-drop.scss
@@ -70,6 +70,7 @@
         min-width: 100px;
         max-height: 300px;
         max-width: 30em;
+        padding: 4px 0;
 
         .collection-header {
           .category-filter {
@@ -79,7 +80,7 @@
             line-height: $line-height-medium;
             font-weight: bold;
             display: block;
-            padding: 10px 5px;
+            padding: 6px 10px;
 
             &:hover {
               text-decoration: underline;
@@ -101,7 +102,7 @@
         font-weight: bold;
         flex-direction: column;
         align-items: flex-start;
-        padding: 5px;
+        padding: 5px 10px;
 
         .category-desc {
           font-weight: normal;
@@ -117,7 +118,7 @@
         }
 
         &:not(.no-content) {
-          padding: 5px;
+          padding: 6px 10px;
         }
 
         .topic-count {
diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
index dd6a2e9859b..132e1e3e289 100644
--- a/app/assets/stylesheets/common/select-kit/combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -5,14 +5,14 @@
     }
 
     .select-kit-row {
-      margin: 4px;
+      margin: 0;
       min-height: 1px;
-      padding: 4px;
+      padding: 6px 10px;
     }
 
     .select-kit-filter {
       line-height: $line-height-medium;
-      padding: 5px 6px;
+      padding: $input-padding;
       border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
       border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
 
@@ -24,7 +24,7 @@
     .select-kit-header {
       background: $secondary;
       border: 1px solid $primary-medium;
-      padding: 4px;
+      padding: $input-padding;
       font-weight: 500;
       font-size: $font-0;
       line-height: $line-height-large;
diff --git a/app/assets/stylesheets/common/select-kit/group-dropdown.scss b/app/assets/stylesheets/common/select-kit/group-dropdown.scss
index e38c0a42833..a5bdfa756c1 100644
--- a/app/assets/stylesheets/common/select-kit/group-dropdown.scss
+++ b/app/assets/stylesheets/common/select-kit/group-dropdown.scss
@@ -28,6 +28,7 @@
         flex-direction: column;
         padding: 0;
         max-height: 300px;
+        padding: 4px 0;
 
         .collection-header {
           .group-dropdown-filter {
diff --git a/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
index 1d6b6dce6bf..2908ef9db11 100644
--- a/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
+++ b/app/assets/stylesheets/common/select-kit/mini-tag-chooser.scss
@@ -63,7 +63,7 @@
 
           .selected-tags {
             display: flex;
-            padding: 3px;
+            padding: 4px 8px;
             flex-wrap: wrap;
             border-bottom: 1px solid $primary-low;
           }
diff --git a/app/assets/stylesheets/common/select-kit/tag-drop.scss b/app/assets/stylesheets/common/select-kit/tag-drop.scss
index 566cf296fdd..2766a8e93d7 100644
--- a/app/assets/stylesheets/common/select-kit/tag-drop.scss
+++ b/app/assets/stylesheets/common/select-kit/tag-drop.scss
@@ -30,8 +30,9 @@
       .select-kit-collection {
         display: flex;
         flex-direction: column;
-        padding: 0;
         max-height: 300px;
+        padding: 4px 0;
+        
 
         .collection-header {
           .tag-filter {
@@ -41,7 +42,7 @@
             line-height: $line-height-medium;
             font-weight: bold;
             display: block;
-            padding: 5px;
+            padding: 6px 10px;
 
             &:hover {
               text-decoration: underline;