diff --git a/app/assets/javascripts/select-kit/components/combo-box.js.es6 b/app/assets/javascripts/select-kit/components/combo-box.js.es6
index 8dd4756c5d9..e3bba9697c5 100644
--- a/app/assets/javascripts/select-kit/components/combo-box.js.es6
+++ b/app/assets/javascripts/select-kit/components/combo-box.js.es6
@@ -7,8 +7,8 @@ export default SingleSelectComponent.extend({
   autoFilterable: true,
   headerComponent: "combo-box/combo-box-header",
 
-  caretUpIcon: "caret-up",
-  caretDownIcon: "caret-down",
+  caretUpIcon: "caret-up fa-fw",
+  caretDownIcon: "caret-down fa-fw",
   clearable: false,
 
   computeHeaderContent() {
diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
index a48d1620f0a..434c47b6954 100644
--- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
+++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6
@@ -39,7 +39,7 @@ export default ComboBox.extend(Tags, {
 
   @computed("hasReachedLimit")
   caretIcon(hasReachedLimit) {
-    return hasReachedLimit ? null : "plus";
+    return hasReachedLimit ? null : "plus fa-fw";
   },
 
   @computed("tags")
diff --git a/app/assets/stylesheets/common/select-kit/combo-box.scss b/app/assets/stylesheets/common/select-kit/combo-box.scss
index b9ce024633a..df7b8097629 100644
--- a/app/assets/stylesheets/common/select-kit/combo-box.scss
+++ b/app/assets/stylesheets/common/select-kit/combo-box.scss
@@ -6,14 +6,14 @@
     }
 
     .select-kit-row {
-      margin: 5px;
+      margin: 4px;
       min-height: 1px;
-      padding: 5px;
+      padding: 4px;
     }
 
     .select-kit-filter {
       line-height: $line-height-medium;
-      padding: 6px 10px;
+      padding: 5px 6px;
       border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
       border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
 
@@ -25,7 +25,7 @@
     .select-kit-header {
       background: $secondary;
       border: 1px solid $primary-medium;
-      padding: 4px 10px;
+      padding: 4px;
       font-weight: 500;
       font-size: $font-0;
       line-height: $line-height-large;