diff --git a/app/client/ui2018/buttons.ts b/app/client/ui2018/buttons.ts
index 83378ac2..07c78108 100644
--- a/app/client/ui2018/buttons.ts
+++ b/app/client/ui2018/buttons.ts
@@ -33,9 +33,8 @@ export const cssButton = styled('button', `
   color:            ${theme.controlFg};
   --icon-color:     ${theme.controlFg};
 
-  border:        ${vars.controlBorder};
+  border:        ${theme.controlBorder};
   border-radius: ${vars.controlBorderRadius};
-  border-color:  ${theme.controlBorder};
 
   cursor: pointer;
 
diff --git a/app/client/ui2018/cssVars.ts b/app/client/ui2018/cssVars.ts
index 5c0c61fb..d2d88abd 100644
--- a/app/client/ui2018/cssVars.ts
+++ b/app/client/ui2018/cssVars.ts
@@ -359,7 +359,7 @@ export const theme = {
   controlDisabledBg: new CustomProp('theme-control-disabled-bg', undefined, colors.slate),
   controlPrimaryDisabled: new CustomProp('theme-control-primary-disabled', undefined,
     colors.inactiveCursor),
-  controlBorder: new CustomProp('theme-control-border', undefined, '#11B683'),
+  controlBorder: new CustomProp('theme-control-border', undefined, vars.controlBorder),
 
   /* Checkboxes */
   checkboxBg: new CustomProp('theme-checkbox-bg', undefined, colors.light),
diff --git a/app/common/themes/GristDark.ts b/app/common/themes/GristDark.ts
index e53f2199..ada133e3 100644
--- a/app/common/themes/GristDark.ts
+++ b/app/common/themes/GristDark.ts
@@ -175,7 +175,7 @@ export const GristDark: ThemeColors = {
   'control-disabled-fg': '#A4A4A4',
   'control-disabled-bg': '#69697D',
   'control-primary-disabled': '#5F8C7B',
-  'control-border': '#11B683',
+  'control-border': '1px solid #1DA270',
 
   /* Checkboxes */
   'checkbox-bg': '#32323F',
diff --git a/app/common/themes/GristLight.ts b/app/common/themes/GristLight.ts
index 2350758a..111b024d 100644
--- a/app/common/themes/GristLight.ts
+++ b/app/common/themes/GristLight.ts
@@ -175,7 +175,7 @@ export const GristLight: ThemeColors = {
   'control-disabled-fg': '#FFFFFF',
   'control-disabled-bg': '#929299',
   'control-primary-disabled': '#A2E1C9',
-  'control-border': '#11B683',
+  'control-border': '1px solid #11B683',
 
   /* Checkboxes */
   'checkbox-bg': '#FFFFFF',