diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less
index d025ad69d..33bdcb1c8 100755
--- a/src/definitions/elements/button.less
+++ b/src/definitions/elements/button.less
@@ -211,6 +211,11 @@
   pointer-events: none;
 }
 
+/* Basic Group With Disabled */
+.ui.basic.buttons .ui.disabled.button {
+  border-color: @disabledBorderColor;
+}
+
 /*******************************
              Types
 *******************************/
@@ -714,6 +719,7 @@
 }
 
 
+
 /*--------------
   Labeled Icon
 ---------------*/
diff --git a/src/themes/default/elements/button.variables b/src/themes/default/elements/button.variables
index 78ee7aba8..cf29ce59b 100644
--- a/src/themes/default/elements/button.variables
+++ b/src/themes/default/elements/button.variables
@@ -223,8 +223,8 @@
 
 
 /* Basic Group */
-@basicGroupBorder: 1px solid @borderColor;
-@basicGroupBoxShadow: 0px 0px 0px 1px @borderColor;
+@basicGroupBorder: @basicBorderSize solid @borderColor;
+@basicGroupBoxShadow: 0px 0px 0px @basicBorderSize @borderColor;
 
 /*-------------------
       Variations
diff --git a/src/themes/default/globals/site.variables b/src/themes/default/globals/site.variables
index 957cae8c9..6b9b33de6 100644
--- a/src/themes/default/globals/site.variables
+++ b/src/themes/default/globals/site.variables
@@ -351,6 +351,7 @@
 
 @borderColor                   : rgba(39, 41, 43, 0.15);
 @selectedBorderColor           : rgba(39, 41, 43, 0.3);
+@disabledBorderColor           : rgba(39, 41, 43, 0.5);
 
 @solidBorderColor              : #D4D4D5;
 @solidSelectedBorderColor      : #BEBEBF;