diff --git a/src/tomahawk/AudioControls.cpp b/src/tomahawk/AudioControls.cpp
index 69c86c3f0..c7b93ba1a 100644
--- a/src/tomahawk/AudioControls.cpp
+++ b/src/tomahawk/AudioControls.cpp
@@ -172,27 +172,8 @@ AudioControls::AudioControls( QWidget* parent )
 
     connect( ViewManager::instance(), SIGNAL( viewPageDestroyed() ), SLOT( onControlStateChanged() ) );
 
-//    TomahawkUtils::unmarginLayout( ui->horizontalLayout );
-//    TomahawkUtils::unmarginLayout( ui->buttonAreaLayout );
-//    ui->buttonAreaLayout->setSpacing( 0 );
-    ui->stackedLayout->setSpacing( 0 );
-    ui->stackedLayout->setContentsMargins( 0, 0, 0, 0 );
-    ui->stackedLayout->setMargin( 0 );
-    ui->playPauseButton->setContentsMargins( 0, 0, 0, 0 );
-    ui->pauseButton->setContentsMargins( 0, 0, 0, 0 );
-    ui->stackedLayout->setSizeConstraint( QLayout::SetFixedSize );
-
-    // setFixedSize corrections for stuff in .ui :(
-//    ui->buttonArea->setFixedSize( scaled( 170, 66 ) );
-    //ui->coverImage->setFixedSize( scaled( 60, 60 ) );
-    //ui->metaDataArea->setMaximumHeight( scaledY( 74 ) );
-    //ui->widget_4->setFixedSize( scaled( 170, 66 ) );
-//    ui->volumeSlider->setFixedHeight( 20 );
-//    ui->verticalLayout->setContentsMargins( scaledX( 2 ), scaledY( 6 ),
-//                                            0, scaledY( 6 ) );
-
     connect( InfoSystem::InfoSystem::instance(), SIGNAL( updatedSupportedPushTypes( Tomahawk::InfoSystem::InfoTypeSet ) ),
-             this, SLOT( onInfoSystemPushTypesUpdated( Tomahawk::InfoSystem::InfoTypeSet ) ) );
+             SLOT( onInfoSystemPushTypesUpdated( Tomahawk::InfoSystem::InfoTypeSet ) ) );
     onInfoSystemPushTypesUpdated( InfoSystem::InfoSystem::instance()->supportedPushTypes() );
 
     onPlaybackStopped(); // initial state
@@ -334,7 +315,8 @@ AudioControls::onPlaybackLoading( const Tomahawk::result_ptr result )
     ui->timeLeftLabel->setText( "-" + duration );
     m_lastTextSecondShown = 0;
 
-    ui->stackedLayout->setCurrentWidget( ui->pauseButton );
+    ui->playPauseButton->setVisible( false );
+    ui->pauseButton->setVisible( true );
 
 /*    ui->loveButton->setEnabled( true );
     ui->loveButton->setVisible( true );
@@ -462,7 +444,8 @@ void
 AudioControls::onPlaybackPaused()
 {
     tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-    ui->stackedLayout->setCurrentWidget( ui->playPauseButton );
+    ui->playPauseButton->setVisible( true );
+    ui->pauseButton->setVisible( false );
     m_sliderTimeLine.setPaused( true );
 }
 
@@ -471,7 +454,8 @@ void
 AudioControls::onPlaybackResumed()
 {
     tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-    ui->stackedLayout->setCurrentWidget( ui->pauseButton );
+    ui->playPauseButton->setVisible( false );
+    ui->pauseButton->setVisible( true );
     m_seeked = true;
     onPlaybackTimer( m_lastSliderCheck );
 }
@@ -504,7 +488,8 @@ AudioControls::onPlaybackStopped()
     m_phononTickCheckTimer.stop();
     ui->ownerButton->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultResolver, TomahawkUtils::Original, QSize( 34, 34 ) ) );
 
-    ui->stackedLayout->setCurrentWidget( ui->playPauseButton );
+    ui->playPauseButton->setVisible( true );
+    ui->pauseButton->setVisible( false );
 /*    ui->loveButton->setEnabled( false );
     ui->loveButton->setVisible( false );
     ui->socialButton->setEnabled( false );
diff --git a/src/tomahawk/AudioControls.ui b/src/tomahawk/AudioControls.ui
index ee4ff2cfa..0a8549de8 100644
--- a/src/tomahawk/AudioControls.ui
+++ b/src/tomahawk/AudioControls.ui
@@ -6,14 +6,17 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1014</width>
-    <height>108</height>
+    <width>1043</width>
+    <height>112</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
+   <property name="spacing">
+    <number>0</number>
+   </property>
    <property name="leftMargin">
     <number>32</number>
    </property>
@@ -24,17 +27,17 @@
     <number>32</number>
    </property>
    <property name="bottomMargin">
-    <number>24</number>
+    <number>16</number>
    </property>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="margin">
+     <property name="spacing">
       <number>0</number>
      </property>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0,0">
-       <property name="margin">
-        <number>0</number>
+      <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0,0,0,0">
+       <property name="spacing">
+        <number>8</number>
        </property>
        <item>
         <spacer name="horizontalSpacer_4">
@@ -118,9 +121,9 @@
       </spacer>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,1,0,0,0">
-       <property name="margin">
-        <number>0</number>
+      <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,2,0,0,0,0,0,0,0,0,0,0">
+       <property name="spacing">
+        <number>8</number>
        </property>
        <item>
         <widget class="QWidget" name="buttonArea" native="true">
@@ -144,12 +147,21 @@
          </property>
          <layout class="QHBoxLayout" name="buttonAreaLayout">
           <property name="spacing">
-           <number>0</number>
+           <number>8</number>
           </property>
           <property name="sizeConstraint">
            <enum>QLayout::SetMinimumSize</enum>
           </property>
-          <property name="margin">
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
            <number>0</number>
           </property>
           <item>
@@ -176,28 +188,30 @@
            </spacer>
           </item>
           <item>
-           <layout class="QStackedLayout" name="stackedLayout">
-            <property name="margin">
-             <number>0</number>
+           <widget class="ImageButton" name="playPauseButton">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
             </property>
-            <property name="spacing">
-             <number>0</number>
+            <property name="text">
+             <string notr="true" extracomment="not translatable because is placeholder text">Play</string>
             </property>
-            <item row="0" column="0">
-             <widget class="ImageButton" name="playPauseButton">
-              <property name="text">
-               <string notr="true" extracomment="not translatable because is placeholder text">Play</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="0">
-             <widget class="ImageButton" name="pauseButton">
-              <property name="text">
-               <string notr="true" extracomment="not translatable because is placeholder text">Pause</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
+           </widget>
+          </item>
+          <item>
+           <widget class="ImageButton" name="pauseButton">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string notr="true" extracomment="not translatable because is placeholder text">Pause</string>
+            </property>
+           </widget>
           </item>
           <item>
            <spacer name="horizontalSpacer_8">
@@ -247,7 +261,7 @@
           <string notr="true" extracomment="not translatable because is placeholder text">Time</string>
          </property>
          <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
@@ -282,137 +296,137 @@
           <string notr="true" extracomment="not translatable because is placeholder text">Time Left</string>
          </property>
          <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignTop</set>
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
        <item>
-           <spacer name="horizontalSpacer_6">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>32</width>
-              <height>8</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="ImageButton" name="shuffleButton">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string notr="true" extracomment="not translatable because is placeholder text">Shuffle</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>32</width>
-              <height>8</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="ImageButton" name="repeatButton">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string notr="true" extracomment="not translatable because is placeholder text">Repeat</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_9">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>32</width>
-              <height>8</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="ImageButton" name="volumeLowButton">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string notr="true" extracomment="not translatable because is placeholder text">Low</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="horizontalSpacer_7">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>4</width>
-              <height>8</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item>
-           <widget class="SeekSlider" name="volumeSlider">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>80</width>
-              <height>4</height>
-             </size>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>80</width>
-              <height>4</height>
-             </size>
-            </property>
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-           </widget>
+        <spacer name="horizontalSpacer_6">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>32</width>
+           <height>8</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="ImageButton" name="shuffleButton">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string notr="true" extracomment="not translatable because is placeholder text">Shuffle</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>32</width>
+           <height>8</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="ImageButton" name="repeatButton">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string notr="true" extracomment="not translatable because is placeholder text">Repeat</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_9">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>32</width>
+           <height>8</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="ImageButton" name="volumeLowButton">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string notr="true" extracomment="not translatable because is placeholder text">Low</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_7">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>4</width>
+           <height>8</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="SeekSlider" name="volumeSlider">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>80</width>
+           <height>4</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>80</width>
+           <height>4</height>
+          </size>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
        </item>
       </layout>
      </item>