diff --git a/gtk2_ardour/ui/waves_export_dialog.xml b/gtk2_ardour/ui/waves_export_dialog.xml
index 4325fd7683..9581b23536 100644
--- a/gtk2_ardour/ui/waves_export_dialog.xml
+++ b/gtk2_ardour/ui/waves_export_dialog.xml
@@ -1,44 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Dialog title="Tracks Live" CACHEIT="false">
   <style name="generic_control"
-         winfont ="Arial Bold 12"
-         macfont ="Helvetica Bold 12"
+         winfont ="Arial Bold 10"
+         macfont ="Helvetica Bold 10"
          fgnormal="#6F6F6F"
          bgnormal="#6C6C6C"
          fgactive="#BFBFBF"
-         bgactive="#454545"
-         fghover="#CCCCCC"
-         bghover="#898989"/>
-
+         bgactive="#454545"/>
   <style name="generic_button"
          style="generic_control"
-         winfont ="Arial Bold 12"
-         macfont ="Helvetica Bold 12"
          bgnormal="#CACAC5"
          fgactive="#EDECE8"
          bgactive="#6D6E72"
          width="80"
          height="22"/>
+  <style name="tab_button"
+         style="generic_button"
+         bgnormal="#CACAC5"
+         fgactive="#6F6F6F"
+         bgactive="#EDECE8"
+         width="80"
+         height="22"/>
 
   <EventBox bgnormal="#EDECE8"
             box.pack="end">
     <VBox>
-      <VBox>
+      <EventBox bgnormal="#CACAC5">
         <HBox spacing="1">
           <Button id="file_format_selector_button"
-                  style="generic_button"
+                  style="tab_button"
                   text="File Format"/>
           <Button id="timespan_selector_button"
-                  style="generic_button"
+                  style="tab_button"
                   text="Time Span"/>
           <Button id="channel_selector_button"
-                  style="generic_button"
+                  style="tab_button"
                   text="Channels"/>
         </HBox>
+      </EventBox>
+      <VBox borderwidth="10">
         <EventBox id="selectors_home"
                   bgnormal="#EDECE8"
                   width="642"
-                  height="273">
+                  height="210">
           <VBox id="file_format_selector">
             <HBox id="preset_selector_home" ui.orphan="true"/>
             <HBox id="file_notebook_home"/>
@@ -46,46 +50,50 @@
           <VBox id="timespan_selector_home"/>
           <VBox id="channel_selector_home"/>
         </EventBox>
-      </VBox>
-      <HBox id="warning_widget">
-        <Label id="warn_label"
-               style="generic_control"
-               usemarkup="true"
-               box.fill="true"
-               box.expand="true"
-               fgnormal="#E2974B"/>
-        <HBox id="list_files_widget">
-          <Button id="list_files_button"
-                  style="generic_button"
-                  box.pack="end"
-                  text="List Files"/>
-          <Label style="generic_control"
-                 text="Some already existing files will be overwritten."
-                 box.pack="end"
+        <VBox spacing="10">
+          <VBox height="22">
+            <HBox id="warning_widget">
+              <Label id="warn_label"
+                 style="generic_control"
+                 usemarkup="true"
+                 box.fill="true"
+                 box.expand="true"
                  fgnormal="#E2974B"/>
-        </HBox>
-      </HBox>
-      <VBox id="export_progress_widget">
-        <ProgressBar id="export_progress_bar"
-                     height="21"
-                     bgnormal="#6B6B6B"/>
+              <HBox id="list_files_widget" spacing="10">
+                <Button id="list_files_button"
+                        style="generic_button"
+                        box.pack="end"
+                        text="List Files"/>
+                <Label style="generic_control"
+                       text="Some already existing files will be overwritten."
+                       box.pack="end"
+                       fgnormal="#E2974B"/>
+              </HBox>
+            </HBox>
+            <VBox id="export_progress_widget">
+              <ProgressBar id="export_progress_bar"
+                           height="22"
+                           bgnormal="#6B6B6B"/>
+            </VBox>
+          </VBox>
+          <HBox spacing="10" >
+            <Button id="export_button"
+                    style="generic_button"
+                    box.pack="end"
+                    text="Export"/>
+            <Button id="cancel_button"
+                    style="generic_button"
+                    box.pack="end"
+                    text="Cancel"/>
+            <Button id="stop_export_button"
+                    style="generic_button"
+                    box.pack="end"
+                    visible="false"
+                    noshowall="true"
+                    text="Stop Export"/>
+          </HBox>
+        </VBox>
       </VBox>
-      <HBox spacing="10">
-        <Button id="cancel_button"
-                style="generic_button"
-                box.pack="end"
-                text="Cancel"/>
-        <Button id="stop_export_button"
-                style="generic_button"
-                box.pack="end"
-                visible="false"
-                noshowall="true"
-                text="Stop Export"/>
-        <Button id="export_button"
-                style="generic_button"
-                box.pack="end"
-                text="Export"/>
-      </HBox>
     </VBox>
   </EventBox>
 </Dialog>
\ No newline at end of file
diff --git a/gtk2_ardour/ui/waves_export_file_notebook.xml b/gtk2_ardour/ui/waves_export_file_notebook.xml
index 9ea83b74aa..bc6f0fa666 100644
--- a/gtk2_ardour/ui/waves_export_file_notebook.xml
+++ b/gtk2_ardour/ui/waves_export_file_notebook.xml
@@ -10,23 +10,17 @@
          fghover="#CCCCCC"
          bghover="#898989"/>
   <style name="generic_button"
-         winfont ="Arial Bold 12"
-         macfont ="Helvetica Bold 12"
-         fgnormal="#EDECE8"
-         fgactive="#6D6E72"
-         textcolornormal="#6D6E72"
-         bgnormal="#6D6E72"
-         bgactive="#CACAC5"
-         borderwidth="0 0 0 0"
-         bordercolor="#6D6E72"/>
+         style="generic_control"
+         bgnormal="#CACAC5"
+         fgactive="#EDECE8"
+         bgactive="#6D6E72"
+         width="80"
+         height="22"/>
   <style name="generic_dropdown"
          style="generic_control"
          bgnormal="#6C6C6C"
          fgnormal="#C1C1C1"/>
   <style name="generic_dropdown_menu"
          style="generic_dropdown"/>
-  <EventBox bgnormal="#00ff00" height="1"/>
-  <EventBox id="file_page_home"
-            bgnormal="#CBDBF5"/>
-  <EventBox bgnormal="#ffff00" height="1" box.pack="end"/>
+  <VBox id="file_page_home"/>
 </VBox>
\ No newline at end of file
diff --git a/gtk2_ardour/ui/waves_export_file_notebook_page.xml b/gtk2_ardour/ui/waves_export_file_notebook_page.xml
index 8f1c7db873..52091dbab8 100644
--- a/gtk2_ardour/ui/waves_export_file_notebook_page.xml
+++ b/gtk2_ardour/ui/waves_export_file_notebook_page.xml
@@ -31,24 +31,25 @@
          horzalignment="start"/>
   <style name="generic_dropdown_menu"
          style="generic_dropdown"/>
-  <EventBox bgnormal="#ff0000" height="3"/>
-  <Label style="generic_control"
-         winfont ="Arial Bold 11"
-         macfont ="Helvetica Bold 11"
-         text="Format"
+  <VBox spacing="5">
+    <Label style="generic_control"
+         text="Format options"
+         vertalignment="bottom"
          horzalignment="start"/>
   <HBox>
     <VBox width="18"/>
     <HBox id="format_selector_home"/>
   </HBox>
+  </VBox>
+  <VBox spacing="5">
   <Label style="generic_control"
-         winfont ="Arial Bold 11"
-         macfont ="Helvetica Bold 11"
-         text="Location"
+         text="Location options"
+         height="25"
+         vertalignment="bottom"
          horzalignment="start"/>
   <HBox>
     <VBox width="18"/>
     <VBox id="filename_selector_home"/>
   </HBox>
-  <EventBox bgnormal="#ffff00" height="3" box.pack="end"/>
+  </VBox>    
 </VBox>
\ No newline at end of file
diff --git a/gtk2_ardour/ui/waves_export_filename_selector.xml b/gtk2_ardour/ui/waves_export_filename_selector.xml
index 5f56413108..2e50811e14 100644
--- a/gtk2_ardour/ui/waves_export_filename_selector.xml
+++ b/gtk2_ardour/ui/waves_export_filename_selector.xml
@@ -24,7 +24,9 @@
   <style name="generic_dropdown"
          style="generic_control"
          bgnormal="#6C6C6C"
-         fgnormal="#C1C1C1"/>
+         basenormal="#6C6C6C"
+         fgnormal="#C1C1C1"
+         textcolornormal="#C1C1C1"/>
   <style name="generic_dropdown_menu"
          style="generic_dropdown"/>
   <VBox>
@@ -32,7 +34,7 @@
       <Label style="generic_control"
              text="Folder:"/>
       <Entry id="path_entry"
-             style="generic_button"
+             style="generic_dropdown"
              activatesdefault="true"
              hasframe="false"
              horzalignment="start"
@@ -55,7 +57,7 @@
       <Label style="generic_control"
              text="Label:"/>
       <Entry id="label_entry"
-             style="generic_button"
+             style="generic_dropdown"
              hasframe="false"
              activatesdefault="true"
              horzalignment="start"
@@ -112,7 +114,7 @@
       </HBox>
       <HBox>
         <Entry id="revision_entry"
-               style="generic_button"
+               style="generic_dropdown"
                hasframe="false"
                horzalignment="start"
                width="32"
diff --git a/gtk2_ardour/ui/waves_export_format_selector.xml b/gtk2_ardour/ui/waves_export_format_selector.xml
index 2b3f0e2ac1..e95e59db52 100644
--- a/gtk2_ardour/ui/waves_export_format_selector.xml
+++ b/gtk2_ardour/ui/waves_export_format_selector.xml
@@ -3,28 +3,22 @@
   <style name="generic_control"
          winfont ="Arial Bold 10"
          macfont ="Helvetica Bold 10"
-         fgnormal="#6D6E72"
+         fgnormal="#6F6F6F"
          bgnormal="#6C6C6C"
          fgactive="#BFBFBF"
-         bgactive="#454545"
-         fghover="#CCCCCC"
-         bghover="#898989"/>
+         bgactive="#454545"/>
   <style name="generic_button"
-         winfont ="Arial Bold 10"
-         macfont ="Helvetica Bold 10"
-         fgnormal="#6D6E72"
-         textcolornormal="#6D6E72"
+         style="generic_control"
          bgnormal="#CACAC5"
-         basenormal="#CACAC5"
          fgactive="#EDECE8"
          bgactive="#6D6E72"
-         borderwidth="0 0 0 0"
-         bordercolor="#6D6E72"
-         height="20"/>
+         width="80"
+         height="22"/>
   <style name="generic_dropdown"
          style="generic_button"
-         fgnormal="#EDECE8"
-         bgnormal="#454545"
+         fgnormal="#C1C1C1"
+         textcolornormal="#C1C1C1"
+         bgnormal="#6C6C6C"
          normalicon="dropdown_90x20"
          activeicon="dropdown_90x20_active"
          inactiveicon="dropdown_90x20_inactive"
@@ -44,7 +38,7 @@
                 style="generic_dropdown">
         <HBox>
           <VBox width="10"/>
-          <Label style="generic_dropdown"/>
+          <Label style="generic_dropdown_menu"/>
         </HBox>
         <DropdownMenu style="generic_dropdown_menu">
           <DropdownItem style="generic_dropdown_menu" title="Wave" data="1"/>
@@ -61,9 +55,9 @@
                 style="generic_dropdown">
         <HBox>
           <VBox width="10"/>
-          <Label style="generic_dropdown"/>
+          <Label style="generic_dropdown_menu"/>
         </HBox>
-        <DropdownMenu bgnormal="#454545">
+        <DropdownMenu style="generic_dropdown_menu">
           <DropdownItem style="generic_dropdown_menu" title="16 bit" data="16"/>
           <DropdownItem style="generic_dropdown_menu" title="24 bit" data="24"/>
         </DropdownMenu>
@@ -77,9 +71,9 @@
                 style="generic_dropdown">
         <HBox>
           <VBox width="10"/>
-          <Label style="generic_dropdown"/>
+          <Label style="generic_dropdown_menu"/>
         </HBox>
-        <DropdownMenu bgnormal="#454545">
+        <DropdownMenu style="generic_dropdown_menu">
           <DropdownItem style="generic_dropdown_menu" title="Session" data="1"/>
           <DropdownItem style="generic_dropdown_menu" title="44.1 kHz" data="44100"/>
           <DropdownItem style="generic_dropdown_menu" title="48 kHz" data="48000"/>
@@ -101,10 +95,9 @@
                 inactiveicon="dropdown_126x20_inactive">
         <HBox>
           <VBox width="10"/>
-          <Label style="generic_dropdown"/>
+          <Label style="generic_dropdown_menu"/>
         </HBox>
-        <DropdownMenu style="generic_dropdown"
-                      bgnormal="#454545">
+        <DropdownMenu style="generic_dropdown_menu">
           <DropdownItem style="generic_dropdown_menu" title="None" data="0"/>
           <DropdownItem style="generic_dropdown_menu" title="Triangular" data="1"/>
           <DropdownItem style="generic_dropdown_menu" title="Rectangular" data="2"/>
diff --git a/gtk2_ardour/ui/waves_export_timespan_selector.xml b/gtk2_ardour/ui/waves_export_timespan_selector.xml
index 65e01f21a3..7da4886fd1 100644
--- a/gtk2_ardour/ui/waves_export_timespan_selector.xml
+++ b/gtk2_ardour/ui/waves_export_timespan_selector.xml
@@ -1,30 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<VBox CACHEIT="false">
+<VBox CACHEIT="false" UI.NEEDINIT="true" spacing="10">
   <style name="generic_control"
-         winfont="Arial Bold 10"
-         macfont="Helvetica Bold 10"
-         fgnormal="#C1C1C1"
+         winfont ="Arial Bold 10"
+         macfont ="Helvetica Bold 10"
+         fgnormal="#6F6F6F"
          bgnormal="#6C6C6C"
          fgactive="#BFBFBF"
-         bgactive="#454545"
-         fghover="#CCCCCC"
-         bghover="#898989"
-         fgdisabled ="#959595"/>
+         bgactive="#454545"/>
   <style name="generic_button"
          style="generic_control"
+         bgnormal="#CACAC5"
+         fgactive="#EDECE8"
+         bgactive="#6D6E72"
          width="80"
-         height="20"/>
+         height="22"/>
   <style name="generic_dropdown"
-         style="generic_control"
-         bgdisabled="#373737"/>
+         style="generic_button"
+         fgnormal="#EDECE8"
+         bgnormal="#6C6C6C"
+         horzalignment="start"/>
   <style name="generic_dropdown_menu"
-         bgnormal="#6C6C6C"/>
-  <HBox>
+         style="generic_dropdown"
+         height="-1"
+         width="-1"/>
+  <HBox spacing="5">
     <Label style="generic_control"
            text="Show Times as:"/>
     <Dropdown id="time_format_dropdown"
-              style="generic_control"
+              style="generic_dropdown"
               width="126"
               height="20"
               normalicon="dropdown_126x20"
@@ -32,35 +36,28 @@
               inactiveicon="dropdown_126x20_inactive">
       <HBox>
         <VBox width="10"/>
-        <Label style="generic_control"
+        <Label style="generic_dropdown"
                horzalignment="start"
                width="117"
                height="20"/>
       </HBox>
       <DropdownMenu style="generic_dropdown_menu">
-        <Dropdownitem style="generic_control"
-                      title="Timecode"
-                      data="0"
-                      horzalignment="start"/>
-        <Dropdownitem style="generic_control"
-                      title="Minutes:Seconds"
-                      data="1"
-                      horzalignment="start"/>
-        <Dropdownitem style="generic_control"
-                      title="Bars:Beats"
-                      data="2"
-                      horzalignment="start"/>
+        <Dropdownitem style="generic_dropdown_menu" title="Timecode" data="0"/>
+        <Dropdownitem style="generic_dropdown_menu" title="Minutes:Seconds" data="1"/>
+        <Dropdownitem style="generic_dropdown_menu" title="Bars:Beats" data="2"/>
       </DropdownMenu>
     </Dropdown>
     <Button id="select_all_button"
             style="generic_button"
-            text="Select All"/>
+            text="Select All"
+            height="20"/>
     <Button id="deselect_all_button"
             style="generic_button"
-            text="Deslect All"/>
+            text="Deslect All"
+            height="20"/>
   </HBox>
   <ScrolledWindow id="range_scroller"
-                  height="232">
+                  height="170">
     <TreeView id="range_view"/>
   </ScrolledWindow>
 </VBox>
diff --git a/gtk2_ardour/ui/waves_port_export_channel_selector.xml b/gtk2_ardour/ui/waves_port_export_channel_selector.xml
index 9cfb2019c2..7e54e22b9b 100644
--- a/gtk2_ardour/ui/waves_port_export_channel_selector.xml
+++ b/gtk2_ardour/ui/waves_port_export_channel_selector.xml
@@ -1,46 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <HBox CACHEIT="false" 
       UI.NEEDINIT="true"
-      spacing="5"
-      borderwidth="10">
+      spacing="5">
   <style name="generic_control"
          winfont ="Arial Bold 10"
          macfont ="Helvetica Bold 10"
-         fgnormal="#6D6E72"
+         fgnormal="#6F6F6F"
          bgnormal="#6C6C6C"
          fgactive="#BFBFBF"
-         bgactive="#454545"
-         fghover="#CCCCCC"
-         bghover="#898989"/>
+         bgactive="#454545"/>
   <style name="generic_button"
-         winfont ="Arial Bold 10"
-         macfont ="Helvetica Bold 10"
-         fgnormal="#6D6E72"
-         textcolornormal="#6D6E72"
+         style="generic_control"
          bgnormal="#CACAC5"
-         basenormal="#CACAC5"
          fgactive="#EDECE8"
          bgactive="#6D6E72"
-         borderwidth="0 0 0 0"
-         bordercolor="#6D6E72"/>
+         width="80"
+         height="22"/>
   <style name="generic_dropdown"
          style="generic_button"
-         fgnormal="#EDECE8"
-         normalicon="dropdown_90x20"
-         activeicon="dropdown_90x20_active"
-         inactiveicon="dropdown_90x20_inactive"
-         width="90"
-         height="20"
-         horzalignment="start"/>
+         fgnormal="#C1C1C1"
+         textcolornormal="#C1C1C1"
+         basenormal="#6C6C6C"
+         bgnormal="#6C6C6C"/>
   <style name="generic_dropdown_menu"
          style="generic_dropdown"/>
   <VBox spacing="5">
-    <HBox spacing="8">
+    <HBox spacing="5">
       <Label style="generic_control"
              text="Channels:"/>
-      <HBox>
+      <HBox box.fill="true" box.expand="true">
         <Entry id="channels_entry"
-               style="generic_button"
+               style="generic_dropdown"
                hasframe="false"
                horzalignment="start"
                width="32"
@@ -52,13 +42,13 @@
                       width="12"
                       height="11"
                       normalicon="spin_up_12x11"
-                      activeicon="spin_up_12x11_inactive"
+                      activeicon="spin_up_12x11_active"
                       inactiveicon="spin_up_12x11_inactive"/>
           <iconbutton id="channels_dec_button"
                       width="12"
                       height="11"
                       normalicon="spin_down_12x11"
-                      activeicon="spin_down_12x11_inactive"
+                      activeicon="spin_down_12x11_active"
                       inactiveicon="spin_down_12x11_inactive"/>
         </VBox>
       </HBox>
@@ -74,8 +64,11 @@
              text="Split mono files"/>
     </Hbox>
   </VBox>
+  <VBox box.fill="true"
+        box.expand="true">
   <ScrolledWindow id="channel_scroller"
-                  height="130"
                   box.fill="true"
                   box.expand="true"/>
+  <VBox height="10"/>
+  </VBox>
 </HBox>
\ No newline at end of file
diff --git a/gtk2_ardour/ui/waves_region_export_channel_selector.xml b/gtk2_ardour/ui/waves_region_export_channel_selector.xml
index 8b51c0c395..3717bd144b 100644
--- a/gtk2_ardour/ui/waves_region_export_channel_selector.xml
+++ b/gtk2_ardour/ui/waves_region_export_channel_selector.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <HBox CACHEIT="false"
       UI.NEEDINIT="true"
-      spacing="5"
-      borderwidth="8">
+      spacing="5">
   <style name="generic_control"
          winfont ="Arial Bold 10"
          macfont ="Helvetica Bold 10"
@@ -34,11 +33,11 @@
          horzalignment="start"/>
   <style name="generic_dropdown_menu"
          style="generic_dropdown"/>
-  <VBox>
+  <VBox spacing="10">
     <HBox>
       <IconButton id="raw_button"
-                  width="20"
-                  height="20"
+                  width="24"
+                  height="14"
                   normalicon="waves_darker_radio_button"
                   activeicon="waves_darker_radio_button_active"
                   toggleable="true"/>
@@ -51,8 +50,8 @@
     </HBox>
     <HBox>
       <IconButton id="fades_button"
-                  width="20"
-                  height="20"
+                  width="24"
+                  height="14"
                   normalicon="waves_darker_radio_button"
                   activeicon="waves_darker_radio_button_active"
                   toggleable="true"
@@ -66,8 +65,8 @@
     </HBox>
     <HBox>
       <IconButton id="processed_button"
-                  width="20"
-                  height="20"
+                  width="24"
+                  height="14"
                   normalicon="waves_darker_radio_button"
                   activeicon="waves_darker_radio_button_active"
                   toggleable="true"/>
diff --git a/gtk2_ardour/ui/waves_track_export_channel_selector.xml b/gtk2_ardour/ui/waves_track_export_channel_selector.xml
index 3d8db20eaf..4ba012f8be 100644
--- a/gtk2_ardour/ui/waves_track_export_channel_selector.xml
+++ b/gtk2_ardour/ui/waves_track_export_channel_selector.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <HBox CACHEIT="false"
       UI.NEEDINIT="true"
-      spacing="5"
-      borderwidth="10">
+      spacing="5">
   <style name="generic_control"
          winfont ="Arial Bold 10"
          macfont ="Helvetica Bold 10"
@@ -35,11 +34,11 @@
   <style name="generic_dropdown_menu"
          style="generic_dropdown"/>
   <VBox spacing="5">
-    <Hbox spacing="8">
-      <HBox>
+    <Hbox spacing="5">
+      <HBox spacing="10">
         <IconButton id="region_contents_button"
-                    width="20"
-                    height="20"
+                    width="14"
+                    height="14"
                     normalicon="waves_darker_radio_button"
                     activeicon="waves_darker_radio_button_active"
                     toggleable="true"
@@ -47,10 +46,10 @@
         <Label style="generic_control"
          text="Export region contents"/>
       </HBox>
-      <HBox>
+      <HBox spacing="5">
         <IconButton id="track_output_button"
-                    width="20"
-                    height="20"
+                    width="14"
+                    height="14"
                     normalicon="waves_darker_radio_button"
                     activeicon="waves_darker_radio_button_active"
                     toggleable="true"/>
@@ -59,7 +58,7 @@
       </HBox>
     </Hbox>
     <ScrolledWindow id="track_scroller"
-                    height="130"
-                    width="622"/>
+                    height="175"
+                    width="642"/>
   </VBox>
 </HBox>
\ No newline at end of file