diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index c0838eb722..e639016ea2 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -30,9 +30,7 @@
             <iconbutton id="tracks_button"
                         width="48" height="51"
                         normalicon="tracks"
-                        activeicon="tracks_active"
-                        prelighticon="tracks_prelight"/>
-            
+                        activeicon="tracks_active"/>
             <Layout width="407" height="51">
               <icon source="top_bar_background.png"/>
               <HBox id="time_info_box_home"
@@ -41,21 +39,19 @@
               <HBox id="primary_clock_home"
                     x="132"
                     y="6"/>
-                <dropdown id="display_format_dropdown"
-                          bgnormal="#43919A"
-                          fgnormal="#ffffff"
-                          fgactive="#ffffff"
-                          fghover="#ffffff"
-                          winfont ="Arial 8"
-                          macfont ="Helvetica 8"
-                          x="200"
-                          y="28"
-                          width="63"
-                          height="18"
-                          normalicon="topbar_button"
-                          activeicon="topbar_button_active"
-                          prelighticon="topbar_button_prelight"/>
-                
+              <dropdown id="display_format_dropdown"
+                        bgnormal="#43919A"
+                        fgnormal="#ffffff"
+                        fgactive="#ffffff"
+                        fghover="#ffffff"
+                        winfont ="Arial 8"
+                        macfont ="Helvetica 8"
+                        x="200"
+                        y="28"
+                        width="63"
+                        height="18"
+                        normalicon="topbar_button"
+                        activeicon="topbar_button_active"/>
               <Iconbutton id="bit_depth_button"
                           fgnormal="#ffffff"
                           fgactive="#ffffff"
@@ -67,8 +63,7 @@
                           width="63"
                           height="18"
                           normalicon="topbar_button_upper"
-                          activeicon="topbar_button_upper_active"
-                          prelighticon="topbar_button_upper_prelight"/>
+                          activeicon="topbar_button_upper_active"/>
               <Iconbutton id="frame_rate_button"
                           winfont ="Arial 8"
                           fgnormal="#ffffff"
@@ -80,37 +75,33 @@
                           width="63"
                           height="18"
                           normalicon="topbar_button"
-                          activeicon="topbar_button_active"
-                          prelighticon="topbar_button_prelight"/>
-                <dropdown id="sample_rate_dropdown"
-                          bgnormal="#43919A"
-                          fgnormal="#ffffff"
-                          fgactive="#ffffff"
-                          fghover="#ffffff"
-                          winfont ="Arial 8"
-                          macfont ="Helvetica 8"
-                          x="269"
-                          y="28"
-                          width="63"
-                          height="18"
-                          normalicon="topbar_button"
-                          activeicon="topbar_button_active"
-                          prelighticon="topbar_button_prelight"/>
-                
-                <dropdown id="timecode_selector_dropdown"
-                          bgnormal="#43919A"
-                          fgnormal="#ffffff"
-                          fgactive="#ffffff"
-                          fghover="#ffffff"
-                          winfont ="Arial 8"
-                          macfont ="Helvetica 8"
-                          x="338"
-                          y="5"
-                          width="63"
-                          height="18"
-                          normalicon="topbar_button_upper"
-                          activeicon="topbar_button_upper_active"
-                          prelighticon="topbar_button_upper_prelight"/>                
+                          activeicon="topbar_button_active"/>
+              <dropdown id="sample_rate_dropdown"
+                        bgnormal="#43919A"
+                        fgnormal="#ffffff"
+                        fgactive="#ffffff"
+                        fghover="#ffffff"
+                        winfont ="Arial 8"
+                        macfont ="Helvetica 8"
+                        x="269"
+                        y="28"
+                        width="63"
+                        height="18"
+                        normalicon="topbar_button"
+                        activeicon="topbar_button_active"/>
+              <dropdown id="timecode_selector_dropdown"
+                        bgnormal="#43919A"
+                        fgnormal="#ffffff"
+                        fgactive="#ffffff"
+                        fghover="#ffffff"
+                        winfont ="Arial 8"
+                        macfont ="Helvetica 8"
+                        x="338"
+                        y="5"
+                        width="63"
+                        height="18"
+                        normalicon="topbar_button_upper"
+                        activeicon="topbar_button_upper_active"/>
             </Layout>
             <EventBox bgnormal="#383838"
                       width="17"
@@ -198,14 +189,12 @@
                           width="79" height="25"
                           normalicon="mode_stereo_out"
                           activeicon="mode_stereo_out_active"
-                          prelighticon="mode_stereo_out_prelight"
                           active="true"/>
               <iconbutton id="mode_multi_out_button"
                           tooltip="Multi Out Mode"
                           width="79" height="25"
                           normalicon="mode_multi_out"
-                          activeicon="mode_multi_out_active"
-                          prelighticon="mode_multi_out_prelight"/>
+                          activeicon="mode_multi_out_active"/>
             </VBox>
           </HBox>
         </EventBox>
@@ -216,20 +205,17 @@
                         tooltip="Show/Hide Inspector"
                         width="48" height="26"
                         normalicon="inspector_on"
-                        activeicon="inspector_on_active"
-                        prelighticon="inspector_on_prelight"/>
+                        activeicon="inspector_on_active"/>
             <iconbutton id="mixer_on_button"
                         tooltip="Show/Hide Mixer"
                         width="48" height="26"
                         normalicon="mixer_on"
-                        activeicon="mixer_on_active"
-                        prelighticon="mixer_on_prelight"/>
+                        activeicon="mixer_on_active"/>
             <iconbutton id="meter_bridge_on_button"
                         tooltip="Show/Hide Meter Bridge"
                         width="48" height="26"
                         normalicon="meter_bridge_on"
-                        activeicon="meter_bridge_on_active"
-                        prelighticon="meter_bridge_on_prelight"/>
+                        activeicon="meter_bridge_on_active"/>
             <Layout width="54"
                     height="26"
                     bgnormal="#3E3E3E"/>
@@ -237,44 +223,37 @@
                         tooltip="Rewind"
                         width="34" height="26"
                         normalicon="transport_start"
-                        activeicon="transport_start_active"
-                        prelighticon="transport_start_prelight"/>
+                        activeicon="transport_start_active"/>
             <iconbutton id="transport_end_button"
                         tooltip="Forward"
                         width="34" height="26"
                         normalicon="transport_end"
-                        activeicon="transport_end_active"
-                        prelighticon="transport_end_prelight"/>
+                        activeicon="transport_end_active"/>
             <iconbutton id="transport_play_button"
                         tooltip="Play"
                         width="34" height="26"
                         normalicon="transport_play"
-                        activeicon="transport_play_active"
-                        prelighticon="transport_play_prelight"/>
+                        activeicon="transport_play_active"/>
             <iconbutton id="transport_record_button"
                         tooltip="Record"
                         width="34" height="26"
                         normalicon="transport_record"
-                        activeicon="transport_record_active"
-                        prelighticon="transport_record_prelight"/>
+                        activeicon="transport_record_active"/>
             <iconbutton id="transport_stop_button"
                         tooltip="Stop"
                         width="34" height="26"
                         normalicon="transport_stop"
-                        activeicon="transport_stop_active"
-                        prelighticon="transport_stop_prelight"/>
+                        activeicon="transport_stop_active"/>
             <iconbutton id="transport_loop_button"
                         tooltip="Loop"
                         width="34" height="26"
                         normalicon="transport_loop"
-                        activeicon="transport_loop_active"
-                        prelighticon="transport_loop_prelight"/>
+                        activeicon="transport_loop_active"/>
             <iconbutton id="lock_session_button"
                         tooltip="Lock"
                         width="34" height="26"
                         normalicon="lock_session"
-                        activeicon="lock_session_active"
-                        prelighticon="lock_session_prelight"/>
+                        activeicon="lock_session_active"/>
             <Layout width="60"
                     height="26"
                     bgnormal="#3E3E3E"/>
@@ -282,26 +261,22 @@
                         tooltip="Range Select Tool"
                         width="34" height="26"
                         normalicon="tool_marker"
-                        activeicon="tool_marker_active"
-                        prelighticon="tool_marker_prelight"/>
+                        activeicon="tool_marker_active"/>
             <iconbutton id="tool_arrow_button"
                         tooltip="Pointer Tool"
                         width="34" height="26"
                         normalicon="tool_arrow"
-                        activeicon="tool_arrow_active"
-                        prelighticon="tool_arrow_prelight"/>
+                        activeicon="tool_arrow_active"/>
             <iconbutton id="tool_cut_button"
                         tooltip="Split Tool"
                         width="34" height="26"
                         normalicon="tool_cut"
-                        activeicon="tool_cut_active"
-                        prelighticon="tool_cut_prelight"/>
+                        activeicon="tool_cut_active"/>
             <iconbutton id="tool_zoom_button"
                         tooltip="Zoom Tool"
                         width="34" height="26"
                         normalicon="tool_zoom"
-                        activeicon="tool_zoom_active"
-                        prelighticon="tool_zoom_prelight"/>
+                        activeicon="tool_zoom_active"/>
             <HBox box.pack="end" spacing ="1">
               <Adjustment id="temporal_zoom_adjustment"
                           minvalue="0"
@@ -340,8 +315,7 @@
                           tooltip="Media Button"
                           width="48" height="26"
                           normalicon="media_button"
-                          activeicon="media_button_active"
-                          prelighticon="media_button_prelight"/>
+                          activeicon="media_button_active"/>
             </HBox>
           </HBox>
         </EventBox>
@@ -385,8 +359,7 @@
                           winfont ="Arial 8"
                           macfont ="Helvetica 8"
                           normalicon="top_bar_button"
-                          activeicon="top_bar_button"
-                          prelighticon="top_bar_button"/>
+                          activeicon="top_bar_button"/>
                   <iconbutton id="add_marker_button"
                           text="+"
                           x="200"
@@ -396,8 +369,7 @@
                           winfont ="Arial 8"
                           macfont ="Helvetica 8"
                           normalicon="add_marker_button"
-                          activeicon="add_marker_button"
-                          prelighticon="add_marker_button"/>
+                          activeicon="add_marker_button"/>
                   <Button id="skip_button"
                          text="SKIP"
                          x="0"
@@ -415,8 +387,7 @@
                           width="139"
                           height="18"
                           normalicon="global_tracks_button"
-                          activeicon="global_tracks_button"
-                          prelighticon="global_tracks_button"/>
+                          activeicon="global_tracks_button"/>
                   <EventBox id="master_bus_ui_home"
                             x="0"
                             y="54"