diff --git a/basis/ui/gadgets/buttons/buttons.factor b/basis/ui/gadgets/buttons/buttons.factor
index bc9a77add1..e6e75e6b5b 100644
--- a/basis/ui/gadgets/buttons/buttons.factor
+++ b/basis/ui/gadgets/buttons/buttons.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs classes colors.constants combinators
+USING: accessors assocs classes colors colors.constants combinators
 combinators.short-circuit combinators.smart fry kernel locals
 math.vectors models namespaces sequences ui.commands ui.gadgets
 ui.gadgets.borders ui.gadgets.colors ui.gadgets.labels ui.gadgets.packs
@@ -121,13 +121,10 @@ PRIVATE>
         [ append theme-image ] tri-curry@ tri
     ] 2dip <tile-pen> ;
 
-CONSTANT: button-background COLOR: FactorLightTan
-CONSTANT: button-clicked-background COLOR: FactorDarkSlateBlue
-
 : <border-button-pen> ( -- pen )
-    "button" button-background button-clicked-background
+    "button" transparent button-text-color
     <border-button-state-pen> dup
-    "button-clicked" button-clicked-background COLOR: white
+    "button-clicked" transparent button-clicked-text-color
     <border-button-state-pen> dup dup
     <button-pen> ;
 
diff --git a/basis/ui/gadgets/colors/colors.factor b/basis/ui/gadgets/colors/colors.factor
index 95584d6212..528bf7a15b 100644
--- a/basis/ui/gadgets/colors/colors.factor
+++ b/basis/ui/gadgets/colors/colors.factor
@@ -12,6 +12,9 @@ CONSTANT: menu-border-color COLOR: grey75
 CONSTANT: status-bar-background COLOR: FactorDarkSlateBlue
 CONSTANT: status-bar-foreground COLOR: white
 
+CONSTANT: button-text-color COLOR: FactorDarkSlateBlue
+CONSTANT: button-clicked-text-color COLOR: white
+
 CONSTANT: line-color COLOR: grey75
 
 CONSTANT: column-title-background COLOR: grey95
diff --git a/basis/ui/gadgets/theme/button-clicked-left.tiff b/basis/ui/gadgets/theme/button-clicked-left.tiff
index cb6f76087c..ad85bf15a8 100644
Binary files a/basis/ui/gadgets/theme/button-clicked-left.tiff and b/basis/ui/gadgets/theme/button-clicked-left.tiff differ
diff --git a/basis/ui/gadgets/theme/button-clicked-middle.tiff b/basis/ui/gadgets/theme/button-clicked-middle.tiff
index 7a75ef9e83..4573006a6d 100644
Binary files a/basis/ui/gadgets/theme/button-clicked-middle.tiff and b/basis/ui/gadgets/theme/button-clicked-middle.tiff differ
diff --git a/basis/ui/gadgets/theme/button-clicked-right.tiff b/basis/ui/gadgets/theme/button-clicked-right.tiff
index 496cb1f5fd..ee70645420 100644
Binary files a/basis/ui/gadgets/theme/button-clicked-right.tiff and b/basis/ui/gadgets/theme/button-clicked-right.tiff differ
diff --git a/basis/ui/gadgets/theme/button-left.tiff b/basis/ui/gadgets/theme/button-left.tiff
index 2507499a2a..dba2fc4ec7 100644
Binary files a/basis/ui/gadgets/theme/button-left.tiff and b/basis/ui/gadgets/theme/button-left.tiff differ
diff --git a/basis/ui/gadgets/theme/button-middle.tiff b/basis/ui/gadgets/theme/button-middle.tiff
index a8168cca99..0c6c353331 100644
Binary files a/basis/ui/gadgets/theme/button-middle.tiff and b/basis/ui/gadgets/theme/button-middle.tiff differ
diff --git a/basis/ui/gadgets/theme/button-right.tiff b/basis/ui/gadgets/theme/button-right.tiff
index bb5dd6953d..aaff61e0bb 100644
Binary files a/basis/ui/gadgets/theme/button-right.tiff and b/basis/ui/gadgets/theme/button-right.tiff differ