diff --git a/src/audiocontrols.cpp b/src/audiocontrols.cpp
index 56b9d2f7a..0169d7d54 100644
--- a/src/audiocontrols.cpp
+++ b/src/audiocontrols.cpp
@@ -39,13 +39,6 @@ AudioControls::AudioControls( QWidget* parent )
 {
     ui->setupUi( this );
 
-    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 );
-
     QFont font( ui->artistTrackLabel->font() );
     font.setPixelSize( 12 );
 
@@ -171,6 +164,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
 }
 
diff --git a/src/audiocontrols.ui b/src/audiocontrols.ui
index 4ad1d807d..d97d9e7f4 100644
--- a/src/audiocontrols.ui
+++ b/src/audiocontrols.ui
@@ -82,7 +82,7 @@
       <item>
        <layout class="QStackedLayout" name="stackedLayout">
         <property name="spacing">
-         <number>2</number>
+         <number>0</number>
         </property>
         <item>
          <widget class="ImageButton" name="playPauseButton">
diff --git a/src/libtomahawk/playlist/albumview.h b/src/libtomahawk/playlist/albumview.h
index 194eab8d7..98e41101c 100644
--- a/src/libtomahawk/playlist/albumview.h
+++ b/src/libtomahawk/playlist/albumview.h
@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify