diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index 0f8064165f..801037713b 100644
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -371,12 +371,12 @@
     <Option name="feedback alert: led active" value="00000000"/>
     <Option name="feedback alert: text" value="969696ff"/>
     <Option name="feedback alert: text active" value="e5e5e5ff"/>
-    <Option name="mute button: border start" value="ffcb8bff"/>
-    <Option name="mute button: border end" value="0c0802ff"/>
+    <Option name="mute button: border start" value="ffc300ff"/>
+    <Option name="mute button: border end" value="856237ff"/>
     <Option name="mute button: border start selected" value="00000000"/>
     <Option name="mute button: border end selected" value="00000000"/>
-    <Option name="mute button: fill start" value="ac8568ff"/>
-    <Option name="mute button: fill end" value="241e0bff"/>
+    <Option name="mute button: fill start" value="bf9a24ff"/>
+    <Option name="mute button: fill end" value="846137ff"/>
     <Option name="mute button: fill start active" value="ffc300ff"/>
     <Option name="mute button: fill end active" value="ea8400ff"/>
     <Option name="mute button: led" value="00000000"/>
@@ -384,11 +384,11 @@
     <Option name="mute button: text" value="bfbfbfff"/>
     <Option name="mute button: text active" value="191919ff"/>
     <Option name="solo button: border start" value="ffffffff"/>
-    <Option name="solo button: border end" value="0c0c02ff"/>
+    <Option name="solo button: border end" value="4c5c2bff"/>
     <Option name="solo button: border start selected" value="000000ff"/>
     <Option name="solo button: border end selected" value="000000ff"/>
     <Option name="solo button: fill start" value="a09865ff"/>
-    <Option name="solo button: fill end" value="323c1cff"/>
+    <Option name="solo button: fill end" value="4c5b2aff"/>
     <Option name="solo button: fill start active" value="fffd9bff"/>
     <Option name="solo button: fill end active" value="ffff00ff"/>
     <Option name="solo button: led" value="00000000"/>
@@ -419,18 +419,6 @@
     <Option name="send alert button: led active" value="00000000"/>
     <Option name="send alert button: text" value="ccccccff"/>
     <Option name="send alert button: text active" value="000000ff"/>
-    <Option name="midi input button: border start" value="9e9e9eff"/>
-    <Option name="midi input button: border end" value="070707ff"/>
-    <Option name="midi input button: border start selected" value="00000000"/>
-    <Option name="midi input button: border end selected" value="00000000"/>
-    <Option name="midi input button: fill start" value="656867ff"/>
-    <Option name="midi input button: fill end" value="333333ff"/>
-    <Option name="midi input button: fill start active" value="a1ff43ff"/>
-    <Option name="midi input button: fill end active" value="00a300ff"/>
-    <Option name="midi input button: led" value="00000000"/>
-    <Option name="midi input button: led active" value="00000000"/>
-    <Option name="midi input button: text" value="00000000"/>
-    <Option name="midi input button: text active" value="00000000"/>
     <Option name="transport button: border start" value="9e9e9eff"/>
     <Option name="transport button: border end" value="070707ff"/>
     <Option name="transport button: border start selected" value="00000000"/>
@@ -563,6 +551,18 @@
     <Option name="mixer strip name button: led active" value="ffa500ff"/>
     <Option name="mixer strip name button: text" value="c7c7d8ff"/>
     <Option name="mixer strip name button: text active" value="c8c8d9ff"/>
+    <Option name="midi input button: border start" value="9e9e9eff"/>
+    <Option name="midi input button: border end" value="070707ff"/>
+    <Option name="midi input button: border start selected" value="00000000"/>
+    <Option name="midi input button: border end selected" value="00000000"/>
+    <Option name="midi input button: fill start" value="656867ff"/>
+    <Option name="midi input button: fill end" value="333333ff"/>
+    <Option name="midi input button: fill start active" value="a1ff43ff"/>
+    <Option name="midi input button: fill end active" value="00a300ff"/>
+    <Option name="midi input button: led" value="00000000"/>
+    <Option name="midi input button: led active" value="00000000"/>
+    <Option name="midi input button: text" value="00000000"/>
+    <Option name="midi input button: text active" value="00000000"/>
     <Option name="transport clock: background" value="000000ff"/>
     <Option name="transport clock: text" value="6bb620ff"/>
     <Option name="transport clock: edited text" value="ffa500ff"/>