diff --git a/themes/Onyx-Citrus/openbox-3/themerc b/themes/Onyx-Citrus/openbox-3/themerc
index 57db5e8e..244af1c1 100644
--- a/themes/Onyx-Citrus/openbox-3/themerc
+++ b/themes/Onyx-Citrus/openbox-3/themerc
@@ -53,19 +53,26 @@ window.inactive.grip.bg.color: #a0a0a0
 
 !! Window buttons
 window.*.button.*.bg: parentrelative
-window.*.button.*.image.color: #e0e0e0
 
-window.*.button.*.hover.bg: flat splitvertical gradient border
-window.*.button.*.hover.bg.color: #e18a51
-window.*.button.*.hover.bg.colorTo: #e1621d
-window.*.button.*.hover.bg.border.color: #ab5d20
+window.active.button.*.hover.bg: flat splitvertical gradient border
+window.inactive.button.*.hover.bg: parentrelative
 
 window.*.button.*.pressed.bg: flat splitvertical gradient border
-window.*.button.*.pressed.bg.color: #99663c
-window.*.button.*.pressed.bg.colorTo: #99663c
-window.*.button.*.pressed.image.color: #888888
-window.*.button.*.pressed.bg.border.color: #683913
 
+window.active.button.*.hover.bg.color: #e18a51
+window.active.button.*.hover.bg.colorTo: #e1621d
+window.active.button.*.hover.bg.border.color: #ab5d20
+
+window.active.button.*.pressed.bg.color: #99663c
+window.active.button.*.pressed.bg.colorTo: #99663c
+window.active.button.*.pressed.image.color: #888888
+window.active.button.*.pressed.bg.border.color: #683913
+window.inactive.button.*.pressed.bg.color: #f0bfa1
+window.inactive.button.*.pressed.bg.colorTo: #f0b08d
+window.inactive.button.*.pressed.image.color: #7f7f7f
+window.inactive.button.*.pressed.bg.border.color: #d3ab8b
+
+window.active.button.*.image.color: #e0e0e0
 window.inactive.button.*.image.color: #606060
 
 !! Borders
diff --git a/themes/Onyx/openbox-3/themerc b/themes/Onyx/openbox-3/themerc
index 9d014900..337b550d 100644
--- a/themes/Onyx/openbox-3/themerc
+++ b/themes/Onyx/openbox-3/themerc
@@ -53,19 +53,24 @@ window.inactive.grip.bg.color: #a0a0a0
 
 !! Window buttons
 window.*.button.*.bg: parentrelative
-window.*.button.*.image.color: #e0e0e0
-
-window.*.button.*.hover.bg: flat splitvertical gradient border
-window.*.button.*.hover.bg.color: #398dc6
-window.*.button.*.hover.bg.colorTo: #236d83
-window.*.button.*.hover.bg.border.color: #236d83
-
+window.active.button.*.hover.bg: flat splitvertical gradient border
+window.inactive.button.*.hover.bg: parentrelative
 window.*.button.*.pressed.bg: flat splitvertical gradient border
-window.*.button.*.pressed.bg.color: #235679
-window.*.button.*.pressed.bg.colorTo: #154350
-window.*.button.*.pressed.image.color: #898989
-window.*.button.*.pressed.bg.border.color: #154350
 
+window.active.button.*.hover.bg.color: #398dc6
+window.active.button.*.hover.bg.colorTo: #236d83
+window.active.button.*.hover.bg.border.color: #236d83
+
+window.active.button.*.pressed.bg.color: #235679
+window.active.button.*.pressed.bg.colorTo: #154350
+window.active.button.*.pressed.image.color: #898989
+window.active.button.*.pressed.bg.border.color: #154350
+window.inactive.button.*.pressed.bg.color: #b1dcfa
+window.inactive.button.*.pressed.bg.colorTo: #a3c2cc
+window.inactive.button.*.pressed.image.color: #7f7f7f
+window.inactive.button.*.pressed.bg.border.color: #a3c2cc
+
+window.active.button.*.image.color: #e0e0e0
 window.inactive.button.*.image.color: #606060
 
 !! Borders