diff --git a/res/skins/Tango/waveform.xml b/res/skins/Tango/waveform.xml
index 6e0bf334f35..981ec3b1a6d 100644
--- a/res/skins/Tango/waveform.xml
+++ b/res/skins/Tango/waveform.xml
@@ -131,25 +131,79 @@ Variables:
         <Layout>vertical</Layout>
         <!-- Horizontal size is 82px and we'll add the WaveformContainer's negative margin
             (shifts waveform center mark) so that all buttons are visible -->
-        <Size>82f,50me</Size>
+        <SizePolicy>max,me</SizePolicy>
         <Children>
-          <WidgetGroup><Size>1me,0me</Size></WidgetGroup>
-          <WidgetGroup><Size>1me,1f</Size></WidgetGroup>
+          <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+          <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
           <WidgetGroup><!-- beat grid buttons row -->
             <ObjectName>Spacer0f</ObjectName>
             <Layout>horizontal</Layout>
             <SizePolicy>f,f</SizePolicy>
             <Children>
-              <Template src="skin:button_1state_right.xml">
-                <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
-                <SetVariable name="ObjectName">BeatgridCurpos</SetVariable>
-                <SetVariable name="Size">24f,49f</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_curpos</SetVariable>
-                <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
-              </Template>
 
-              <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <Size>f,f</Size>
+                <Children>
+                  <Template src="skin:button_1state_right.xml">
+                    <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
+                    <SetVariable name="ObjectName">BeatgridCurpos</SetVariable>
+                    <SetVariable name="Size">24f,49f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_curpos</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],timing_shift_buttons</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <SizePolicy>f,f</SizePolicy>
+                <Children>
+                  <Template src="skin:button_1state_right.xml">
+                    <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
+                    <SetVariable name="ObjectName">BeatgridCurpos</SetVariable>
+                    <SetVariable name="Size">49f,24f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_curpos</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
+                  </Template>
+
+                  <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>f,f</SizePolicy>
+                    <Children>
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">FIXME</SetVariable>
+                        <SetVariable name="ObjectName">ShiftEarlier</SetVariable>
+                        <SetVariable name="Size">24f,24f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,shift_times_earlier</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,shift_times_earlier_small</SetVariable>
+                      </Template>
+                      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">FIXME</SetVariable>
+                        <SetVariable name="ObjectName">ShiftLater</SetVariable>
+                        <SetVariable name="Size">24f,24f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,shift_times_later</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,shift_times_later_small</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],timing_shift_buttons</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
               <WidgetGroup><!-- beats earlier & faster -->
                 <Layout>vertical</Layout>
@@ -170,24 +224,6 @@ Variables:
                     <SetVariable name="Size">28f,24f</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_faster</SetVariable>
                   </Template>
-
-                  <WidgetGroup>
-                    <Layout>vertical</Layout>
-                    <Size>f,f</Size>
-                    <Children>
-                      <Template src="skin:button_1state_right.xml">
-                        <SetVariable name="TooltipId">FIXME</SetVariable>
-                        <SetVariable name="ObjectName">ShiftEarlier</SetVariable>
-                        <SetVariable name="Size">28f,24f</SetVariable>
-                        <SetVariable name="ConfigKey"><Variable name="group"/>,shift_times_earlier</SetVariable>
-                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,shift_times_earlier_small</SetVariable>
-                      </Template>
-                    </Children>
-                    <Connection>
-                      <ConfigKey persist="true">[Skin],timing_shift_buttons</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
                 </Children>
               </WidgetGroup><!-- /beats earlier & faster -->
 
@@ -213,23 +249,6 @@ Variables:
                     <SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_slower</SetVariable>
                   </Template>
 
-                  <WidgetGroup>
-                    <Layout>vertical</Layout>
-                    <Size>f,f</Size>
-                    <Children>
-                      <Template src="skin:button_1state_right.xml">
-                        <SetVariable name="TooltipId">FIXME</SetVariable>
-                        <SetVariable name="ObjectName">ShiftLater</SetVariable>
-                        <SetVariable name="Size">28f,24f</SetVariable>
-                        <SetVariable name="ConfigKey"><Variable name="group"/>,shift_times_later</SetVariable>
-                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,shift_times_later_small</SetVariable>
-                      </Template>
-                    </Children>
-                    <Connection>
-                      <ConfigKey persist="true">[Skin],timing_shift_buttons</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
                 </Children>
               </WidgetGroup><!-- /beats later & slower -->
             </Children>