diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index 3959957a05..1532bc42ec 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+                             
 <Window>
+  <style name="topbar_dropdown"
+         bgnormal="#43919A"
+         fgnormal="#ffffff"
+         fgactive="#ffffff"
+         fghover="#ffffff"
+         winfont ="Arial 8"
+         macfont ="Helvetica 8"
+         width="63"
+         height="18"/>
+  <style name="topbar_dropdown_menu"
+         bgnormal="#43919A"
+         fgnormal="#ffffff"
+         fgactive="#ffffff"
+         fghover="#ffffff"
+         winfont ="Arial 8"
+         macfont ="Helvetica 8"/>
   <VBox id="vpacker">
     <Adjustment id="vertical_adjustment"
                 initial_value="0"
@@ -42,69 +58,65 @@
               <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"
+              <Dropdown id="display_format_dropdown"
+                        style="topbar_dropdown"
                         x="200"
                         y="28"
-                        width="63"
-                        height="18"
                         normalicon="topbar_button"
-                        activeicon="topbar_button_active"/>
+                        activeicon="topbar_button_active">
+                <Label style="topbar_dropdown_menu"/>
+                <DropdownMenu style="topbar_dropdown_menu"/>
+              </Dropdown>
               <Iconbutton id="bit_depth_button"
-                          fgnormal="#ffffff"
-                          fgactive="#ffffff"
-                          fghover="#ffffff"
-                          winfont ="Arial 8"
-                          macfont ="Helvetica 8"
+                          style="topbar_dropdown"
                           x="269"
                           y="5"
-                          width="63"
-                          height="18"
                           normalicon="topbar_button_upper"
-                          activeicon="topbar_button_upper_active"/>
+                          activeicon="topbar_button_upper_active">
+                <HBox>
+                  <VBox width="10"/>
+                  <Label style="topbar_dropdown_menu"
+                         horzalignment="start"/>
+                </HBox>
+              </Iconbutton>
               <Iconbutton id="frame_rate_button"
-                          winfont ="Arial 8"
-                          fgnormal="#ffffff"
-                          fgactive="#ffffff"
-                          fghover="#ffffff"
-                          macfont ="Helvetica 8"
+                          style="topbar_dropdown"
                           x="338"
                           y="28"
-                          width="63"
-                          height="18"
                           normalicon="topbar_button"
-                          activeicon="topbar_button_active"/>
-              <dropdown id="sample_rate_dropdown"
-                        bgnormal="#43919A"
-                        fgnormal="#ffffff"
-                        fgactive="#ffffff"
-                        fghover="#ffffff"
-                        winfont ="Arial 8"
-                        macfont ="Helvetica 8"
+                          activeicon="topbar_button_active">
+                <HBox>
+                  <VBox width="10"/>
+                  <Label style="topbar_dropdown_menu"
+                         horzalignment="start"/>
+                </HBox>
+              </Iconbutton>
+              <Dropdown id="sample_rate_dropdown"
+                        style="topbar_dropdown"
                         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"
+                        activeicon="topbar_button_active">
+                <HBox>
+                  <VBox width="10"/>
+                  <Label style="topbar_dropdown_menu"
+                         horzalignment="start"/>
+                </HBox>
+                <DropdownMenu style="topbar_dropdown_menu"/>
+              </Dropdown>
+              <Dropdown id="timecode_selector_dropdown"
+                        style="topbar_dropdown"
                         x="338"
                         y="5"
-                        width="63"
-                        height="18"
                         normalicon="topbar_button_upper"
-                        activeicon="topbar_button_upper_active"/>
+                        activeicon="topbar_button_upper_active">
+                <HBox>
+                  <VBox width="10"/>
+                  <Label style="topbar_dropdown_menu"
+                         horzalignment="start"/>
+                </HBox>
+                <DropdownMenu style="topbar_dropdown_menu"/>
+              </Dropdown>
             </Layout>
             <EventBox bgnormal="#383838"
                       width="17"
diff --git a/gtk2_ardour/ui/tracks_preferences.xml b/gtk2_ardour/ui/tracks_preferences.xml
index 45fba3c7cd..2d629394bc 100644
--- a/gtk2_ardour/ui/tracks_preferences.xml
+++ b/gtk2_ardour/ui/tracks_preferences.xml
@@ -188,7 +188,7 @@
                    horzalignment="start"
                    width="93"/>
           </HBox>
-          <DROPDOWNMENU style="generic_dropdown_menu"/>
+          <DropdownMenu style="generic_dropdown_menu"/>
         </Dropdown>
 
         <Label style="generic_control"
@@ -213,7 +213,7 @@
                    horzalignment="start"
                    width="93"/>
           </HBox>
-          <DROPDOWNMENU style="generic_dropdown_menu"/>
+          <DropdownMenu style="generic_dropdown_menu"/>
         </Dropdown>
         <Label style="generic_control"
                text="SAMPLE RATE"
@@ -237,7 +237,7 @@
                    horzalignment="start"
                    width="57"/>
           </HBox>
-          <DROPDOWNMENU style="generic_dropdown_menu"/>
+          <DropdownMenu style="generic_dropdown_menu"/>
         </Dropdown>
         <Label style="generic_control"
                text="BUFFER SIZE"
@@ -261,7 +261,7 @@
                    horzalignment="start"
                    width="57"/>
           </HBox>
-          <DROPDOWNMENU style="generic_dropdown_menu"/>
+          <DropdownMenu style="generic_dropdown_menu"/>
         </Dropdown>
 
         <Iconbutton id="control_panel_button"
@@ -446,7 +446,7 @@
                  horzalignment="start"
                  width="117"/>
         </HBox>
-        <DROPDOWNMENU style="generic_dropdown_menu">
+        <DropdownMenu style="generic_dropdown_menu">
           <Dropdownitem title="Caf"
                         horzalignment="start"/>
           <Dropdownitem title="BWav"
@@ -455,7 +455,7 @@
                         horzalignment="start"/>
           <Dropdownitem title="Wave64"
                         horzalignment="start"/>
-        </DROPDOWNMENU>          
+        </DropdownMenu>          
       </Dropdown>
       <Label style="generic_control" text="BIT DEPTH" x="24" y="70"/>
       <Dropdown style="generic_dropdown"
@@ -473,14 +473,14 @@
                  horzalignment="start"
                  width="117"/>
         </HBox>
-        <DROPDOWNMENU style="generic_dropdown_menu">
+        <DropdownMenu style="generic_dropdown_menu">
           <Dropdownitem title="16 bit"
                         horzalignment="start"/>
           <Dropdownitem title="24 bit"
                         horzalignment="start"/>
           <Dropdownitem title="32 bit floating point"
                         horzalignment="start"/>
-        </DROPDOWNMENU>
+        </DropdownMenu>
       </Dropdown>
       <Label style="generic_control" text="SESSION FRAME RATE" x="24" y="100"/>
       <Dropdown style="generic_dropdown"
@@ -498,7 +498,7 @@
                  horzalignment="start"
                  width="117"/>
         </HBox>
-        <DROPDOWNMENU style="generic_dropdown_menu">
+        <DropdownMenu style="generic_dropdown_menu">
           <Dropdownitem title="24 fps"
                         horzalignment="start"/>
           <Dropdownitem title="25 fps"
@@ -509,7 +509,7 @@
                         horzalignment="start"/>
           <Dropdownitem title="29.97 fps"
                         horzalignment="start"/>
-        </DROPDOWNMENU>
+        </DropdownMenu>
       </Dropdown>
       <Label style="generic_control"
              text="AUTO LOCK TIMER"
@@ -530,7 +530,7 @@
                  horzalignment="start"
                  width="117"/>
         </HBox>
-        <DROPDOWNMENU style="generic_dropdown_menu">
+        <DropdownMenu style="generic_dropdown_menu">
           <Dropdownitem title="0 Min"
                         horzalignment="start"/>
           <Dropdownitem title="1 Min"
@@ -543,7 +543,7 @@
                         horzalignment="start"/>
           <Dropdownitem title="15 Min"
                         horzalignment="start"/>
-          </DROPDOWNMENU>
+          </DropdownMenu>
       </Dropdown>
       <Label style="generic_control" text="AUTO SAVE TIMER" x="24" y="205"/>
       <Dropdown style="generic_button"
@@ -561,7 +561,7 @@
                  horzalignment="start"
                  width="117"/>
         </HBox>
-        <DROPDOWNMENU style="generic_dropdown_menu">
+        <DropdownMenu style="generic_dropdown_menu">
           <Dropdownitem title="0 Min"
                         horzalignment="start"/>
           <Dropdownitem title="1 Min"
@@ -574,7 +574,7 @@
                         horzalignment="start"/>
           <Dropdownitem title="15 Min"
                         horzalignment="start"/>
-          </DROPDOWNMENU>
+          </DropdownMenu>
       </Dropdown>
       <Label style="generic_control"
              text="PRE RECORD BUFFER"
@@ -595,14 +595,14 @@
                  horzalignment="start"
                  width="117"/>
         </HBox>
-        <DROPDOWNMENU style="generic_dropdown_menu">
+        <DropdownMenu style="generic_dropdown_menu">
           <Dropdownitem title="0 Min"
                         horzalignment="start"/>
           <Dropdownitem title="1 Min"
                         horzalignment="start"/>
           <Dropdownitem title="2 Min"
                         horzalignment="start"/>
-        </DROPDOWNMENU>
+        </DropdownMenu>
       </Dropdown>
       <Label style="generic_control"
              text="DEFAULT FOLDER FOR NEW SESSION"