diff --git a/awx/ui/client/lib/theme/_base-variables.less b/awx/ui/client/lib/theme/_base-variables.less
deleted file mode 100644
index a87db5a81b..0000000000
--- a/awx/ui/client/lib/theme/_base-variables.less
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * All base variables used. These should only be referenced by the contextual variables defined 
- * in the _contextual-variables.less file. In development, unless you are intentionally making a 
- * fundamental change, these variables should not be modified, removed, or added to.
- *
- * These variables should not be used directly in development of components or features. If an
- * alias doesn't exist for the context you're working within, check with UX to create a new alias
- * or to define a more applicable alias.
- *
- * The goal is for UX to define the contexts for the contextual variables, so it's easy to make 
- * modifications like, "Change heading text to be smaller" or "Make all warnings a lighter shade  
- * of orange"
- *
- * 1. Colors
- * 2. Typography
- * 3. Layout
- *
- */
-
-// 1. Colors --------------------------------------------------------------------------------------
-
-@at-gray-light-3x: #fcfcfc;
-@at-gray-light-2x: #f2f2f2;
-@at-gray-light: #ebebeb;
-@at-gray: #e1e1e1;
-@at-gray-dark: #d7d7d7;
-@at-gray-dark-2x: #b7b7b7;
-@at-gray-dark-3x: #A9A9A9;
-@at-gray-dark-4x: #848992;
-@at-gray-dark-5x: #707070;
-@at-gray-dark-6x: #161b1f;
-
-@at-white: #ffffff;
-@at-white-hover: #f2f2f2;
-
-@at-blue: #337ab7;
-@at-blue-hover: #286090;
-
-@at-green: #5cb85c;
-@at-green-hover: #449D44;
-
-@at-orange: #f0ad4e;
-@at-orange-hover: #ec971f;
-
-@at-red: #d9534f;
-@at-red-hover: #c9302c;
-
-@at-red-bright: #ff0000;
-@at-red-bright-hover: #d81f1f;
-
-// 2. Typography ----------------------------------------------------------------------------------
-
-@at-font-size: 12px;
-@at-font-size-2x: 13px;
-@at-font-size-3x: 14px;
-@at-font-size-4x: 16px;
-@at-font-size-5x: 20px;
-
-@at-font-weight: 400;
-@at-font-weight-2x: 700;
-
-// 3. Layout --------------------------------------------------------------------------------------
-
-@at-space: 5px;
-@at-space-2x: 10px;
-@at-space-3x: 15px;
-@at-space-4x: 20px;
-
diff --git a/awx/ui/client/lib/theme/_mixins.less b/awx/ui/client/lib/theme/_mixins.less
index 147cb75a7e..e72f8cd391 100644
--- a/awx/ui/client/lib/theme/_mixins.less
+++ b/awx/ui/client/lib/theme/_mixins.less
@@ -37,6 +37,10 @@
         background-color: @at-color-input-button;
         cursor: pointer;
     }
+
+    &:hover {
+        background-color: @at-color-input-button-hover;
+    }
 }
 
 .at-mixin-ButtonColor (@background, @color, @hover: '@{background}-hover') {
diff --git a/awx/ui/client/lib/theme/_variables.less b/awx/ui/client/lib/theme/_variables.less
index d42c2af8c5..89c0286107 100644
--- a/awx/ui/client/lib/theme/_variables.less
+++ b/awx/ui/client/lib/theme/_variables.less
@@ -1,3 +1,71 @@
+/**
+ * All base variables used. These should only be referenced by the contextual variables defined 
+ * below. In development, unless you are intentionally making a fundamental change, these variables
+ * should not be modified, removed, or added to.
+ *
+ * These variables should not be used directly in development of components or features. If an
+ * alias doesn't exist for the context you're working within, check with UX to create a new alias
+ * or to define a more applicable alias.
+ *
+ * The goal is for UX to define the contexts for the contextual variables, so it's easy to make 
+ * modifications like, "Change heading text to be smaller" or "Make all warnings a lighter shade  
+ * of orange"
+ *
+ * 1. Colors
+ * 2. Typography
+ * 3. Layout
+ *
+ */
+
+// 1. Colors --------------------------------------------------------------------------------------
+
+@at-gray-light-3x: #fcfcfc;
+@at-gray-light-2x: #f2f2f2;
+@at-gray-light: #ebebeb;
+@at-gray: #e1e1e1;
+@at-gray-dark: #d7d7d7;
+@at-gray-dark-2x: #b7b7b7;
+@at-gray-dark-3x: #A9A9A9;
+@at-gray-dark-4x: #848992;
+@at-gray-dark-5x: #707070;
+@at-gray-dark-6x: #161b1f;
+
+@at-white: #ffffff;
+@at-white-hover: #f2f2f2;
+
+@at-blue: #337ab7;
+@at-blue-hover: #286090;
+
+@at-green: #5cb85c;
+@at-green-hover: #449D44;
+
+@at-orange: #f0ad4e;
+@at-orange-hover: #ec971f;
+
+@at-red: #d9534f;
+@at-red-hover: #c9302c;
+
+@at-red-bright: #ff0000;
+@at-red-bright-hover: #d81f1f;
+
+// 2. Typography ----------------------------------------------------------------------------------
+
+@at-font-size: 12px;
+@at-font-size-2x: 13px;
+@at-font-size-3x: 14px;
+@at-font-size-4x: 16px;
+@at-font-size-5x: 20px;
+
+@at-font-weight: 400;
+@at-font-weight-2x: 700;
+
+// 3. Layout --------------------------------------------------------------------------------------
+
+@at-space: 5px;
+@at-space-2x: 10px;
+@at-space-3x: 15px;
+@at-space-4x: 20px;
+
 /**
  * All variables used in the UI. Use these variables directly during the development of components
  * and features. Be sure the context of the variable name applies to the work that's being done.
@@ -60,6 +128,7 @@
 @at-color-input-background: @at-gray-light-3x;
 @at-color-input-border: @at-gray-dark-2x;
 @at-color-input-button: @at-gray-light-3x;
+@at-color-input-button-hover: @at-gray-light-2x;
 @at-color-input-disabled: @at-gray-light;
 @at-color-input-error: @at-color-error;
 @at-color-input-focus: @at-color-info;
diff --git a/awx/ui/client/lib/theme/index.less b/awx/ui/client/lib/theme/index.less
index 3a5acefae2..c1854f09c9 100644
--- a/awx/ui/client/lib/theme/index.less
+++ b/awx/ui/client/lib/theme/index.less
@@ -152,7 +152,6 @@
  * more than one location, take a moment to move it to this more general location for easy reuse
  * and to avoid duplication.
  */
-@import '_base-variables';
 @import '_variables';
 @import '_mixins';
 @import '_utility';