diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index d3d17fda7a..2f29a00de2 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1599,8 +1599,7 @@ custom-search-field
   :version "24.1"
   :group 'custom-buffer)
 
-(defcustom custom-raised-buttons (not (equal (face-valid-attribute-values :box)
-					     '(("unspecified" . unspecified))))
+(defcustom custom-raised-buttons t
   "If non-nil, indicate active buttons in a raised-button style.
 Otherwise use brackets."
   :type 'boolean
@@ -2113,7 +2112,8 @@ custom-magic-reset
 (defface custom-button
   '((((type x w32 ns) (class color))	; Like default mode line
      :box (:line-width 2 :style released-button)
-     :background "lightgrey" :foreground "black"))
+     :background "lightgrey" :foreground "black")
+    (t :inherit custom-button-unraised))
   "Face for custom buffer buttons if `custom-raised-buttons' is non-nil."
   :version "21.1"
   :group 'custom-faces)
@@ -2137,17 +2137,23 @@ custom-button-unraised
   :version "22.1"
   :group 'custom-faces)
 
+(defface custom-button-mouse-unraised
+  '((t :inherit highlight))
+  "Mouse face for custom buffer buttons if `custom-raised-buttons' is nil."
+  :version "22.1"
+  :group 'custom-faces)
+
 (setq custom-button
       (if custom-raised-buttons 'custom-button 'custom-button-unraised))
 
 (setq custom-button-mouse
-      (if custom-raised-buttons 'custom-button-mouse 'highlight))
+      (if custom-raised-buttons 'custom-button-mouse 'custom-button-mouse-unraised))
 
 (defface custom-button-pressed
   '((((type x w32 ns) (class color))
      :box (:line-width 2 :style pressed-button)
      :background "lightgrey" :foreground "black")
-    (t :inverse-video t))
+    (t :inherit custom-button-pressed-unraised))
   "Face for pressed custom buttons if `custom-raised-buttons' is non-nil."
   :version "21.1"
   :group 'custom-faces)