diff --git a/gtk2_ardour/ui/add_tracks_dialog.xml b/gtk2_ardour/ui/add_tracks_dialog.xml
index 5938188c77..183d09205e 100644
--- a/gtk2_ardour/ui/add_tracks_dialog.xml
+++ b/gtk2_ardour/ui/add_tracks_dialog.xml
@@ -37,7 +37,7 @@
               height="20"
               normalicon="added_track_format_dropdown"
               activeicon="added_track_format_dropdown_active"
-              prelighticon="added_track_format_dropdown_prelight"
+              _prelighticon="added_track_format_dropdown_prelight"
               inactiveicon="added_track_format_dropdown_inactive">
       <HBox>
         <VBox width="10"/>
diff --git a/gtk2_ardour/ui/audio_time_axis.xml b/gtk2_ardour/ui/audio_time_axis.xml
index b7fb5a6b92..ed7030c36e 100644
--- a/gtk2_ardour/ui/audio_time_axis.xml
+++ b/gtk2_ardour/ui/audio_time_axis.xml
@@ -59,7 +59,7 @@
               height="20"
               normalicon="time_axis_playlist"
               activeicon="time_axis_playlist"
-              prelighticon="time_axis_playlist"/>
+              _prelighticon="time_axis_playlist"/>
           <HBox width="3"/>
           <HBox>
             <EventBox width="1" bgnormal="#000000" bgactive="#000000"/>
@@ -70,7 +70,7 @@
                           height="20"
                           normalicon="time_axis_record"
                           activeicon="time_axis_record_active"
-                          prelighticon="time_axis_record_prelight"
+                          _prelighticon="time_axis_record_prelight"
                           tooltip="Record Enable"/>
               <EventBox height="1" bgnormal="#000000" bgactive="#000000"/>
             </VBox>
@@ -83,7 +83,7 @@
                           normalicon="time_axis_solo"
                           activeicon="time_axis_solo_active"
                           implicitactiveicon="time_axis_solo_safe"
-                          prelighticon="time_axis_solo_prelight"
+                          _prelighticon="time_axis_solo_prelight"
                           tooltip="Solo"/>
               <EventBox height="1" bgnormal="#000000" bgactive="#000000"/>
             </VBox>
@@ -99,7 +99,7 @@
                         height="20"
                         normalicon="time_axis_monitor_input"
                         activeicon="time_axis_monitor_input_active"
-                        prelighticon="time_axis_monitor_input_prelight"
+                        _prelighticon="time_axis_monitor_input_prelight"
                         tooltip="Input Monitoring"/>
             <EventBox height="1" bgnormal="#000000" bgactive="#000000"/>
           </VBox>
@@ -111,7 +111,7 @@
                         normalicon="time_axis_mute"
                         activeicon="time_axis_mute_active"
                         implicitactiveicon="time_axis_mute_implicit"
-                        prelighticon="time_axis_mute_prelight"
+                        _prelighticon="time_axis_mute_prelight"
                         tooltip="Mute"/>
             <Button id="master_mute_button" ui.orphan="true"/>
             <EventBox height="1" bgnormal="#000000" bgactive="#000000"/>
diff --git a/gtk2_ardour/ui/editor_mixer.xml b/gtk2_ardour/ui/editor_mixer.xml
index d2d861782e..6939f6f7d1 100644
--- a/gtk2_ardour/ui/editor_mixer.xml
+++ b/gtk2_ardour/ui/editor_mixer.xml
@@ -30,31 +30,31 @@
                       height="19"
                       normalicon="inspector_color_1"
                       activeicon="inspector_color_1_active"
-                      prelighticon="inspector_color_1_prelight"/>
+                      _prelighticon="inspector_color_1_prelight"/>
           <iconbutton id="color_button_2"
                       width="19"
                       height="19"
                       normalicon="inspector_color_2"
                       activeicon="inspector_color_2_active"
-                      prelighticon="inspector_color_2_prelight"/>
+                      _prelighticon="inspector_color_2_prelight"/>
           <iconbutton id="color_button_3"
                       width="19"
                       height="19"
                       normalicon="inspector_color_3"
                       activeicon="inspector_color_3_active"
-                      prelighticon="inspector_color_3_prelight"/>
+                      _prelighticon="inspector_color_3_prelight"/>
           <iconbutton id="color_button_4"
                       width="19"
                       height="19"
                       normalicon="inspector_color_4"
                       activeicon="inspector_color_4_active"
-                      prelighticon="inspector_color_4_prelight"/>
+                      _prelighticon="inspector_color_4_prelight"/>
           <iconbutton id="color_button_5"
                       width="19"
                       height="19"
                       normalicon="inspector_color_5"
                       activeicon="inspector_color_5_active"
-                      prelighticon="inspector_color_5_prelight"/>
+                      _prelighticon="inspector_color_5_prelight"/>
         </HBox>
         <HBox>
           <HBox width="1"/>
@@ -63,31 +63,31 @@
                       height="19"
                       normalicon="inspector_color_6"
                       activeicon="inspector_color_6_active"
-                      prelighticon="inspector_color_6_prelight"/>
+                      _prelighticon="inspector_color_6_prelight"/>
           <iconbutton id="color_button_7"
                       width="19"
                       height="19"
                       normalicon="inspector_color_7"
                       activeicon="inspector_color_7_active"
-                      prelighticon="inspector_color_7_prelight"/>
+                      _prelighticon="inspector_color_7_prelight"/>
           <iconbutton id="color_button_8"
                       width="19"
                       height="19"
                       normalicon="inspector_color_8"
                       activeicon="inspector_color_8_active"
-                      prelighticon="inspector_color_8_prelight"/>
+                      _prelighticon="inspector_color_8_prelight"/>
           <iconbutton id="color_button_9"
                       width="19"
                       height="19"
                       normalicon="inspector_color_9"
                       activeicon="inspector_color_9_active"
-                      prelighticon="inspector_color_9_prelight"/>
+                      _prelighticon="inspector_color_9_prelight"/>
           <iconbutton id="color_button_10"
                       width="19"
                       height="19"
                       normalicon="inspector_color_10"
                       activeicon="inspector_color_10_active"
-                      prelighticon="inspector_color_10_prelight"/>
+                      _prelighticon="inspector_color_10_prelight"/>
         </HBox>
         <HBox>
           <HBox width="1"/>
@@ -96,31 +96,31 @@
                       height="19"
                       normalicon="inspector_color_11"
                       activeicon="inspector_color_11_active"
-                      prelighticon="inspector_color_11_prelight"/>
+                      _prelighticon="inspector_color_11_prelight"/>
           <iconbutton id="color_button_12"
                       width="19"
                       height="19"
                       normalicon="inspector_color_12"
                       activeicon="inspector_color_12_active"
-                      prelighticon="inspector_color_12_prelight"/>
+                      _prelighticon="inspector_color_12_prelight"/>
           <iconbutton id="color_button_13"
                       width="19"
                       height="19"
                       normalicon="inspector_color_13"
                       activeicon="inspector_color_13_active"
-                      prelighticon="inspector_color_13_prelight"/>
+                      _prelighticon="inspector_color_13_prelight"/>
           <iconbutton id="color_button_14"
                       width="19"
                       height="19"
                       normalicon="inspector_color_14"
                       activeicon="inspector_color_14_active"
-                      prelighticon="inspector_color_14_prelight"/>
+                      _prelighticon="inspector_color_14_prelight"/>
           <iconbutton id="color_button_15"
                       width="19"
                       height="19"
                       normalicon="inspector_color_15"
                       activeicon="inspector_color_15_active"
-                      prelighticon="inspector_color_15_prelight"/>
+                      _prelighticon="inspector_color_15_prelight"/>
         </HBox>
         <VBox height="1"/>
       </VBox>
@@ -191,7 +191,7 @@
                             height="20"
                             normalicon="inspector_record"
                             activeicon="inspector_record_active"
-                            prelighticon="inspector_record_prelight"
+                            _prelighticon="inspector_record_prelight"
                             visible="false"
                             noshowall="true"/>
                 <EventBox width="1"
@@ -201,7 +201,7 @@
                             height="20"
                             normalicon="inspector_monitor_input"
                             activeicon="inspector_monitor_input_active"
-                            prelighticon="inspector_monitor_input_prelight"
+                            _prelighticon="inspector_monitor_input_prelight"
                             visible="false"
                             noshowall="true"/>
               </HBox>
@@ -214,7 +214,7 @@
                             normalicon="inspector_mute"
                             activeicon="inspector_mute_active"
                             implicitactiveicon="inspector_mute_implicit"
-                            prelighticon="inspector_mute_prelight"
+                            _prelighticon="inspector_mute_prelight"
                             visible="false"
                             noshowall="true"/>
                 <EventBox width="1"
@@ -225,7 +225,7 @@
                             normalicon="inspector_solo"
                             activeicon="inspector_solo_active"
                             implicitactiveicon="inspector_solo_safe"
-                            prelighticon="inspector_solo_prelight"
+                            _prelighticon="inspector_solo_prelight"
                             visible="false"
                             noshowall="true"/>
               </HBox>
@@ -241,7 +241,7 @@
                       height="41"
                       normalicon="inspector_master_mute"
                       activeicon="inspector_master_mute_active"
-                      prelighticon="inspector_master_mute_prelight"
+                      _prelighticon="inspector_master_mute_prelight"
                       visible="false"
                       noshowall="true"/>
           
diff --git a/gtk2_ardour/ui/master_ui.xml b/gtk2_ardour/ui/master_ui.xml
index 1ce49b7dad..77792e8b44 100644
--- a/gtk2_ardour/ui/master_ui.xml
+++ b/gtk2_ardour/ui/master_ui.xml
@@ -33,7 +33,7 @@
                   height="17"
                   normalicon="master_mute"
                   activeicon="master_mute_active"
-                  prelighticon="master_mute_prelight"
+                  _prelighticon="master_mute_prelight"
                   tooltip="Mute"/>
       <EventBox width="1"
                 bgnormal="#424242"
@@ -69,14 +69,14 @@
               height="27"
               normalicon="master_clear_solo"
               activeicon="master_clear_solo_active"
-              prelighticon="master_clear_solo_prelight"
+              _prelighticon="master_clear_solo_prelight"
               ui.orphan="true"/>
   <iconbutton id="global_rec_button"
               width="47"
               height="27"
               normalicon="master_global_rec"
               activeicon="master_global_rec_active"
-              prelighticon="master_global_rec_prelight"
+              _prelighticon="master_global_rec_prelight"
               ui.orphan="true"/>
   <icon id="master_bus_multi_out_mode_icon"
         source="master_bus_multi_out_mode.png"
diff --git a/gtk2_ardour/ui/meter_strip.xml b/gtk2_ardour/ui/meter_strip.xml
index ba86929b5a..15e5f978c4 100644
--- a/gtk2_ardour/ui/meter_strip.xml
+++ b/gtk2_ardour/ui/meter_strip.xml
@@ -19,7 +19,7 @@
                             height="12"
                             normalicon="meter_strip_record"
                             activeicon="meter_strip_record_active"
-                            prelighticon="meter_strip_record_prelight"/>
+                            _prelighticon="meter_strip_record_prelight"/>
                 <EventBox bgnormal="#000000"
                           bgactive="#000000"
                           width="1"/>
@@ -28,7 +28,7 @@
                             height="12"
                             normalicon="meter_strip_monitor_input"
                             activeicon="meter_strip_monitor_input_active"
-                            prelighticon="meter_strip_monitor_input_prelight"/>
+                            _prelighticon="meter_strip_monitor_input_prelight"/>
               </HBox>
               <EventBox bgnormal="#000000"
                         bgactive="#000000"
@@ -40,7 +40,7 @@
                             normalicon="meter_strip_mute"
                             activeicon="meter_strip_mute_active"
                             implicitactiveicon="meter_strip_mute_implicit"
-                            prelighticon="mixer_mute_prelight"/>
+                            _prelighticon="mixer_mute_prelight"/>
                 <EventBox bgnormal="#000000"
                           bgactive="#000000"
                           width="1"/>
@@ -50,7 +50,7 @@
                             normalicon="meter_strip_solo"
                             activeicon="meter_strip_solo_active"
                             implicitactiveicon="meter_strip_solo_safe"
-                            prelighticon="meter_strip_solo_prelight"/>
+                            _prelighticon="meter_strip_solo_prelight"/>
               </HBox>
               <EventBox bgnormal="#000000"
                         bgactive="#000000"
diff --git a/gtk2_ardour/ui/mixer_strip.xml b/gtk2_ardour/ui/mixer_strip.xml
index b9a0154988..4c4255e363 100644
--- a/gtk2_ardour/ui/mixer_strip.xml
+++ b/gtk2_ardour/ui/mixer_strip.xml
@@ -19,7 +19,7 @@
                             height="20"
                             normalicon="mixer_record"
                             activeicon="mixer_record_active"
-                            prelighticon="mixer_record_prelight"/>
+                            _prelighticon="mixer_record_prelight"/>
                 <EventBox bgnormal="#000000"
                           bgactive="#000000"
                           width="1"/>
@@ -28,7 +28,7 @@
                             height="20"
                             normalicon="mixer_monitor_input"
                             activeicon="mixer_monitor_input_active"
-                            prelighticon="mixer_monitor_input_prelight"/>
+                            _prelighticon="mixer_monitor_input_prelight"/>
               </HBox>
               <EventBox bgnormal="#000000"
                         bgactive="#000000"
@@ -40,7 +40,7 @@
                             normalicon="mixer_mute"
                             activeicon="mixer_mute_active"
                             implicitactiveicon="mixer_mute_implicit"
-                            prelighticon="mixer_mute_prelight"/>
+                            _prelighticon="mixer_mute_prelight"/>
                 <EventBox bgnormal="#000000"
                           bgactive="#000000"
                           width="1"/>
@@ -50,7 +50,7 @@
                             normalicon="mixer_solo"
                             activeicon="mixer_solo_active"
                             implicitactiveicon="mixer_solo_safe"
-                            prelighticon="mixer_solo_prelight"/>
+                            _prelighticon="mixer_solo_prelight"/>
               </HBox>
               <EventBox bgnormal="#000000"
                         bgactive="#000000"
diff --git a/gtk2_ardour/ui/tracks_preferences.xml b/gtk2_ardour/ui/tracks_preferences.xml
index 2d629394bc..fa66eea342 100644
--- a/gtk2_ardour/ui/tracks_preferences.xml
+++ b/gtk2_ardour/ui/tracks_preferences.xml
@@ -35,7 +35,7 @@
                   height="65"
                   normalicon="preferences_audio_settings_tab_button"
                   activeicon="preferences_audio_settings_tab_button_active"
-                  prelighticon="preferences_audio_settings_tab_button_prelight"/>
+                  _prelighticon="preferences_audio_settings_tab_button_prelight"/>
       <EventBox bgnormal="#A0A0A0"
                 width="107"
                 height="1"/>
@@ -44,7 +44,7 @@
                   height="65"
                   normalicon="preferences_midi_settings_tab_button"
                   activeicon="preferences_midi_settings_tab_button_active"
-                  prelighticon="preferences_midi_settings_tab_button_prelight"/>
+                  _prelighticon="preferences_midi_settings_tab_button_prelight"/>
       <EventBox bgnormal="#A0A0A0"
                 width="107"
                 height="1"/>
@@ -53,7 +53,7 @@
                   height="65"
                   normalicon="preferences_session_settings_tab_button"
                   activeicon="preferences_session_settings_tab_button_active"
-                  prelighticon="preferences_session_settings_tab_button_prelight"/>
+                  _prelighticon="preferences_session_settings_tab_button_prelight"/>
       <EventBox bgnormal="#A0A0A0"
                 width="107"
                 height="1"/>
@@ -72,7 +72,7 @@
                   height="28"
                   normalicon="preferences_ok_button"
                   activeicon="preferences_ok_button_active"
-                  prelighticon="preferences_ok_button_prelight"/>
+                  _prelighticon="preferences_ok_button_prelight"/>
       <Iconbutton id="cancel_button"
                   style="generic_button"
                   x="347"
@@ -81,7 +81,7 @@
                   height="28"
                   normalicon="preferences_cancel_button"
                   activeicon="preferences_cancel_button_active"
-                  prelighticon="preferences_cancel_button_prelight"/>
+                  _prelighticon="preferences_cancel_button_prelight"/>
       <Iconbutton id="apply_button"
                   style="generic_button"
                   x="419"
@@ -90,7 +90,7 @@
                   height="28"
                   normalicon="preferences_apply_button"
                   activeicon="preferences_apply_button_active"
-                  prelighticon="preferences_apply_button_prelight"/>
+                  _prelighticon="preferences_apply_button_prelight"/>
     </Layout>
     <Layout id="midi_settings_layout"
             bgnormal="#565656"
@@ -180,7 +180,7 @@
                   height="20"
                   normalicon="preference_device_dropdown"
                   activeicon="preference_device_dropdown_active"
-                  prelighticon="preference_device_dropdown_prelight"
+                  _prelighticon="preference_device_dropdown_prelight"
                   inactiveicon="preference_device_dropdown_inactive">
           <HBox>
             <VBox width="10"/>
@@ -205,7 +205,7 @@
                   height="20"
                   normalicon="preference_device_dropdown"
                   activeicon="preference_device_dropdown_active"
-                  prelighticon="preference_device_dropdown_prelight"
+                  _prelighticon="preference_device_dropdown_prelight"
                   inactiveicon="preference_device_dropdown_inactive">
           <HBox>
             <VBox width="10"/>
@@ -229,7 +229,7 @@
                   height="20"
                   normalicon="preference_rate_buffer_dropdown"
                   activeicon="preference_rate_buffer_dropdown_active"
-                  prelighticon="preference_rate_buffer_dropdown_prelight"
+                  _prelighticon="preference_rate_buffer_dropdown_prelight"
                   inactiveicon="preference_rate_buffer_dropdown_inactive">
           <HBox>
             <VBox width="10"/>
@@ -253,7 +253,7 @@
                   height="20"
                   normalicon="preference_rate_buffer_dropdown"
                   activeicon="preference_rate_buffer_dropdown_active"
-                  prelighticon="preference_rate_buffer_dropdown_prelight"
+                  _prelighticon="preference_rate_buffer_dropdown_prelight"
                   inactiveicon="preference_rate_buffer_dropdown_inactive">
           <HBox>
             <VBox width="10"/>
@@ -272,7 +272,7 @@
                     height="49"
                     normalicon="preferences_device_control_panel_button"
                     activeicon="preferences_device_control_panel_button_active"
-                    prelighticon="preferences_device_control_panel_button_prelight"/>
+                    _prelighticon="preferences_device_control_panel_button_prelight"/>
 
         <Label id="latency_label" style="generic_control" text="INPUT LATENCY:" x="16" y="74  " width="476"/>
       </Layout>
@@ -289,7 +289,7 @@
                     height="28"
                     normalicon="preferences_multi_out_button"
                     activeicon="preferences_multi_out_button_active"
-                    prelighticon="preferences_multi_out_button_prelight"/>
+                    _prelighticon="preferences_multi_out_button_prelight"/>
         <Iconbutton id="stereo_out_button"
                     x="387"
                     y="6"
@@ -297,7 +297,7 @@
                     height="28"
                     normalicon="preferences_stereo_out_button"
                     activeicon="preferences_stereo_out_button_active"
-                    prelighticon="preferences_stereo_out_button_prelight"/>
+                    _prelighticon="preferences_stereo_out_button_prelight"/>
       </Layout>
       <Layout bgnormal="#565656" x="0" y="141" width="505" height="416">
         <Layout bgnormal="#862579" x="16" y="13" width="3" height="41"/>
@@ -395,7 +395,7 @@
                     height="39"
                     normalicon="preference_name_track_after_driver_button"
                     activeicon="preference_name_track_after_driver_active"
-                    prelighticon="preference_name_track_after_driver_prelight"/>
+                    _prelighticon="preference_name_track_after_driver_prelight"/>
         <Iconbutton id="reset_tracks_name_to_default_button"
                     x="153"
                     y="369"
@@ -403,7 +403,7 @@
                     height="39"
                     normalicon="preference_reset_track_names_button"
                     activeicon="preference_reset_track_names_button_active"
-                    prelighticon="preference_reset_track_names_button_prelight"/>
+                    _prelighticon="preference_reset_track_names_button_prelight"/>
         <Iconbutton id="yes_button"
                     text="YES"
                     x="292"
@@ -412,7 +412,7 @@
                     height="39"
                     normalicon="preference_yes_button"
                     activeicon="preference_yes_button_active"
-                    prelighticon="preference_yes_button_prelight"/>
+                    _prelighticon="preference_yes_button_prelight"/>
         <Iconbutton id="no_button"
                     text="NO"
                     x="345"
@@ -421,7 +421,7 @@
                     height="39"
                     normalicon="preference_no_button"
                     activeicon="preference_no_button_active"
-                    prelighticon="preference_no_button_prelight"/>
+                    _prelighticon="preference_no_button_prelight"/>
       </Layout>
     </Layout>
     <Layout id="session_settings_layout" bgnormal="#565656" x="113" y="1" width="505" height="557" visible="false">
@@ -439,7 +439,7 @@
                 height="20"
                 normalicon="preference_session_settings_dropdown"
                 activeicon="preference_session_settings_dropdown_active"
-                prelighticon="preference_session_settings_dropdown_prelight">
+                _prelighticon="preference_session_settings_dropdown_prelight">
         <HBox>
           <VBox width="10"/>
           <Label style="generic_control"
@@ -466,7 +466,7 @@
                 height="20"
                 normalicon="preference_session_settings_dropdown"
                 activeicon="preference_session_settings_dropdown_active"
-                prelighticon="preference_session_settings_dropdown_prelight">
+                _prelighticon="preference_session_settings_dropdown_prelight">
         <HBox>
           <VBox width="10"/>
           <Label style="generic_control"
@@ -491,7 +491,7 @@
                 height="20"
                 normalicon="preference_session_settings_dropdown"
                 activeicon="preference_session_settings_dropdown_active"
-                prelighticon="preference_session_settings_dropdown_prelight">
+                _prelighticon="preference_session_settings_dropdown_prelight">
         <HBox>
           <VBox width="10"/>
           <Label style="generic_control"
@@ -523,7 +523,7 @@
                 height="20"
                 normalicon="preference_session_settings_dropdown"
                 activeicon="preference_session_settings_dropdown_active"
-                prelighticon="preference_session_settings_dropdown_prelight">
+                _prelighticon="preference_session_settings_dropdown_prelight">
         <HBox>
           <VBox width="10"/>
           <Label style="generic_control"
@@ -554,7 +554,7 @@
                 height="20"
                 normalicon="preference_session_settings_dropdown"
                 activeicon="preference_session_settings_dropdown_active"
-                prelighticon="preference_session_settings_dropdown_prelight">
+                _prelighticon="preference_session_settings_dropdown_prelight">
         <HBox>
           <VBox width="10"/>
           <Label style="generic_control"
@@ -588,7 +588,7 @@
                 height="20"
                 normalicon="preference_session_settings_dropdown"
                 activeicon="preference_session_settings_dropdown_active"
-                prelighticon="preference_session_settings_dropdown_prelight">
+                _prelighticon="preference_session_settings_dropdown_prelight">
         <HBox>
           <VBox width="10"/>
           <Label style="generic_control"
@@ -616,7 +616,7 @@
                   height = "28"
                   normalicon="preferences_browse_button"
                   activeicon="preferences_browse_button_active"
-                  prelighticon="preferences_browse_button_prelight"/>
+                  _prelighticon="preferences_browse_button_prelight"/>
       <Label id="default_open_path"
              style="generic_control"
              text=""
diff --git a/gtk2_ardour/waves_button.cc b/gtk2_ardour/waves_button.cc
index fa04c39598..c88717c1f7 100644
--- a/gtk2_ardour/waves_button.cc
+++ b/gtk2_ardour/waves_button.cc
@@ -120,7 +120,7 @@ WavesButton::render (cairo_t* cr, cairo_rectangle_t*)
 											(_hovering ? 
 												(_pushed ? 
 													Gtk::STATE_ACTIVE :
-													Gtk::STATE_PRELIGHT ) :
+													Gtk::STATE_NORMAL ) : // or Gtk::STATE_PRELIGHT if you want hovering
 												(get_active() ? 
 													Gtk::STATE_ACTIVE :
 													Gtk::STATE_NORMAL)));