diff --git a/src/components/Button.res b/src/components/Button.res
index febc84b62..b253d6243 100644
--- a/src/components/Button.res
+++ b/src/components/Button.res
@@ -510,8 +510,7 @@ let make = (
         ? switch buttonState {
           | Disabled => ""
           | Loading => `${borderWidth} border-border_gray`
-          | _ =>
-            `${borderWidth} border-border_gray border-opacity-20 dark:border-jp-gray-960 dark:border-opacity-100`
+          | _ => `${borderWidth} border-border_gray dark:border-jp-gray-960 dark:border-opacity-100`
           }
         : switch buttonState {
           | Disabled => ""
diff --git a/src/config/UIConfig.res b/src/config/UIConfig.res
index ba876b08f..369791f43 100644
--- a/src/config/UIConfig.res
+++ b/src/config/UIConfig.res
@@ -151,7 +151,7 @@ let defaultUIConfig: t = {
   },
   border: {
     borderColor: {
-      primaryNormal: "border-primary",
+      primaryNormal: "border border-primary",
       primaryFocused: "focus:border-primary",
     },
   },