diff --git a/gtk2_ardour/ui/audio_time_axis.xml b/gtk2_ardour/ui/audio_time_axis.xml
index 831f2d9f8f..824f844d20 100644
--- a/gtk2_ardour/ui/audio_time_axis.xml
+++ b/gtk2_ardour/ui/audio_time_axis.xml
@@ -124,15 +124,13 @@
       height="20"
       normalicon="time_axis_playlist"
       activeicon="time_axis_playlist"
-      _prelighticon="time_axis_playlist" ui.orphan="true"/>
+      _prelighticon="time_axis_playlist"
+      ui.orphan="true"/>
   <Button id="master_mute_button" ui.orphan="true"/>
   <Icon id="rec_enable_indicator_on"
         source="rec_enable_indicator_on.png"
-        visible="false"
-        noshowall="true"/>
-  
+        ui.orphan="true"/>
   <Icon id="rec_enable_indicator_off"
         source="rec_enable_indicator_off.png"
-        visible="false"
-        noshowall="true"/>
+        ui.orphan="true"/>
 </RouteUI>
diff --git a/gtk2_ardour/ui/editor_mixer.xml b/gtk2_ardour/ui/editor_mixer.xml
index 9b026f5454..6dc99bfa59 100644
--- a/gtk2_ardour/ui/editor_mixer.xml
+++ b/gtk2_ardour/ui/editor_mixer.xml
@@ -296,11 +296,9 @@
   
   <Icon id="rec_enable_indicator_on"
         source="rec_enable_indicator_on.png"
-        visible="false"
-        noshowall="true"/>
+        ui.orphan="true"/>
   
   <Icon id="rec_enable_indicator_off"
         source="rec_enable_indicator_off.png"
-        visible="false"
-        noshowall="true"/>
+        ui.orphan="true"/>
  </RouteUI>
diff --git a/gtk2_ardour/ui/inspector_gain_meter.xml b/gtk2_ardour/ui/inspector_gain_meter.xml
index c980eca7ae..f3cc42bc95 100644
--- a/gtk2_ardour/ui/inspector_gain_meter.xml
+++ b/gtk2_ardour/ui/inspector_gain_meter.xml
@@ -43,12 +43,19 @@
            x="66"
            y="24"
            bgnormal="#383838"/>
-    <EventBox id="gain_display_home"
-          x="1"
-          y="242"
-          width="95"
-          height="16"
-          visible="false"/>
+    <Entry id="gain_display_entry"
+           x="1"
+           y="242"
+           width="95"
+           height="16"
+           horzalignment="end"
+           winfont="Arial Bold 12"
+           macfont="Helvetica Bold 12"
+           cssname="EditorTrackNameDisplay"
+           textcolornormal="#ffffff"
+           textcoloractive="#ffffff"
+           textcolorselected="#ffffff"
+           visible="false"/>
     <Button id="gain_display_button"
             x="1"
             y="242"
diff --git a/gtk2_ardour/ui/master_ui_gain_meter.xml b/gtk2_ardour/ui/master_ui_gain_meter.xml
index 1498d38a71..fa605b4461 100644
--- a/gtk2_ardour/ui/master_ui_gain_meter.xml
+++ b/gtk2_ardour/ui/master_ui_gain_meter.xml
@@ -24,7 +24,7 @@
             fgnormal="#000000"
             fgactive="#000000"
             bghover="#C47474"/>
-    <EventBox id="gain_display_home"/>
+    <Entry id="gain_display_entry"/>
     <Button id="gain_display_button"
             x="0" y="0"
             width="97" height="18"
diff --git a/gtk2_ardour/ui/meter_strip_gain_meter.xml b/gtk2_ardour/ui/meter_strip_gain_meter.xml
index be49ff381a..842dbbf9e2 100644
--- a/gtk2_ardour/ui/meter_strip_gain_meter.xml
+++ b/gtk2_ardour/ui/meter_strip_gain_meter.xml
@@ -23,7 +23,7 @@
     </HBox>
     <HBox height="10"/>
   </VBox>
-  <EventBox id="gain_display_home"
+  <Entry id="gain_display_entry"
             width="57"
             height="16"
             noshowall="true"
diff --git a/gtk2_ardour/ui/mixer_gain_meter.xml b/gtk2_ardour/ui/mixer_gain_meter.xml
index 9ec2422e30..90fe212127 100644
--- a/gtk2_ardour/ui/mixer_gain_meter.xml
+++ b/gtk2_ardour/ui/mixer_gain_meter.xml
@@ -43,11 +43,18 @@
                box.padding="2"/>
       </VBox>
     </HBox>
-    <EventBox id="gain_display_home"
-              width="58"
-              height="18"
-              noshowall="true"
-              visible="false"/>
+    <Entry id="gain_display_entry"
+           width="58"
+           height="18"
+           winfont="Arial Bold 9"
+           macfont="Helvetica Bold 9"
+           horzalignment="end"
+           noshowall="true"
+           visible="false"
+           cssname="EditorTrackNameDisplay"
+           textcolornormal="#ffffff"
+           textcoloractive="#ffffff"
+           textcolorselected="#ffffff"/>
     <Button id="gain_display_button"
             width="58"
             height="18"
diff --git a/gtk2_ardour/ui/mixer_strip.xml b/gtk2_ardour/ui/mixer_strip.xml
index 4ce469eebd..545f9a5860 100644
--- a/gtk2_ardour/ui/mixer_strip.xml
+++ b/gtk2_ardour/ui/mixer_strip.xml
@@ -119,11 +119,9 @@
   <VBox id="info_panel_home" ui.orphan="true"/>
   <Icon id="rec_enable_indicator_on"
         source="rec_enable_indicator_on.png"
-        visible="false"
-        noshowall="true"/>
+        ui.orphan="true"/>
   
   <Icon id="rec_enable_indicator_off"
         source="rec_enable_indicator_off.png"
-        visible="false"
-        noshowall="true"/>
+        ui.orphan="true"/>
 </RouteUI>
diff --git a/gtk2_ardour/ui/track_header_gain_meter.xml b/gtk2_ardour/ui/track_header_gain_meter.xml
index c18e9d816b..24287c7589 100644
--- a/gtk2_ardour/ui/track_header_gain_meter.xml
+++ b/gtk2_ardour/ui/track_header_gain_meter.xml
@@ -27,7 +27,7 @@
             bghover="#C47474"
             bordercolor="#C9C9C9"
             borderwidth="1 1 0 0"/>
-    <EventBox id="gain_display_home"/>
+    <Entry id="gain_display_entry"/>
     <Button id="gain_display_button"
             x="0" y="0"
             width="97" height="18"