diff --git a/src/audiocontrols.cpp b/src/audiocontrols.cpp
index a37675893..14b46c3f6 100644
--- a/src/audiocontrols.cpp
+++ b/src/audiocontrols.cpp
@@ -50,8 +50,6 @@ AudioControls::AudioControls( QWidget* parent )
     ui->setupUi( this );
     setAcceptDrops( true );
 
-    ui->buttonAreaLayout->setSpacing( 2 );
-
     QFont font( ui->artistTrackLabel->font() );
     font.setPixelSize( 12 );
 
@@ -181,6 +179,15 @@ AudioControls::AudioControls( QWidget* parent )
 
     connect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) );
 
+
+    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 );
+
     onPlaybackStopped(); // initial state
 }
 
@@ -301,6 +308,8 @@ AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result )
 /*    m_playAction->setEnabled( false );
     m_pauseAction->setEnabled( true ); */
 
+    ui->stackedLayout->setCurrentWidget( ui->pauseButton );
+
     ui->pauseButton->setEnabled( true );
     ui->pauseButton->setVisible( true );
     ui->playPauseButton->setVisible( false );
@@ -341,23 +350,16 @@ AudioControls::onPlaybackPaused()
 /*    m_pauseAction->setEnabled( false );
     m_playAction->setEnabled( true ); */
 
-    ui->pauseButton->setVisible( false );
-    ui->pauseButton->setEnabled( false );
-    ui->playPauseButton->setEnabled( true );
-    ui->playPauseButton->setVisible( true );
+    ui->stackedLayout->setCurrentWidget( ui->playPauseButton );
 }
 
-
 void
 AudioControls::onPlaybackResumed()
 {
 /*    m_playAction->setEnabled( false );
     m_pauseAction->setEnabled( true ); */
 
-    ui->playPauseButton->setVisible( false );
-    ui->playPauseButton->setEnabled( false );
-    ui->pauseButton->setVisible( true );
-    ui->pauseButton->setEnabled( true );
+    ui->stackedLayout->setCurrentWidget( ui->pauseButton );
     ui->loveButton->setVisible( true );
 }
 
@@ -375,10 +377,7 @@ AudioControls::onPlaybackStopped()
     ui->coverImage->setPixmap( QPixmap() );
     ui->seekSlider->setVisible( false );
 
-    ui->pauseButton->setVisible( false );
-    ui->pauseButton->setEnabled( false );
-    ui->playPauseButton->setEnabled( true );
-    ui->playPauseButton->setVisible( true );
+    ui->stackedLayout->setCurrentWidget( ui->playPauseButton );
     ui->loveButton->setEnabled( false );
     ui->loveButton->setVisible( false );
 
diff --git a/src/audiocontrols.ui b/src/audiocontrols.ui
index 872d5089f..a73e384b8 100644
--- a/src/audiocontrols.ui
+++ b/src/audiocontrols.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>939</width>
+    <width>929</width>
     <height>80</height>
    </rect>
   </property>
@@ -60,7 +60,7 @@
      </property>
      <layout class="QHBoxLayout" name="buttonAreaLayout">
       <item>
-       <spacer name="horizontalSpacer">
+       <spacer name="horizontalSpacer_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -80,18 +80,25 @@
        </widget>
       </item>
       <item>
-       <widget class="ImageButton" name="playPauseButton">
-        <property name="text">
-         <string>Play</string>
+       <layout class="QStackedLayout" name="stackedLayout">
+        <property name="spacing">
+         <number>0</number>
         </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="ImageButton" name="pauseButton">
-        <property name="text">
-         <string>Pause</string>
-        </property>
-       </widget>
+        <item>
+         <widget class="ImageButton" name="playPauseButton">
+          <property name="text">
+           <string>Play</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="ImageButton" name="pauseButton">
+          <property name="text">
+           <string>Pause</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
       <item>
        <widget class="ImageButton" name="nextButton">
@@ -101,7 +108,7 @@
        </widget>
       </item>
       <item>
-       <spacer name="horizontalSpacer_2">
+       <spacer name="horizontalSpacer">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>