diff --git a/src/widgets/AccountsToolButton.cpp b/src/widgets/AccountsToolButton.cpp
index 1e3d83ae8..5d6cbd693 100644
--- a/src/widgets/AccountsToolButton.cpp
+++ b/src/widgets/AccountsToolButton.cpp
@@ -49,10 +49,9 @@ AccountsToolButton::AccountsToolButton( QWidget* parent )
     QVBoxLayout *wMainLayout = new QVBoxLayout( w );
     w->setLayout( wMainLayout  );
 
-#ifdef Q_OS_MAC
-    w->setContentsMargins( 4, 4, 2, 2 );
-    wMainLayout->setContentsMargins( 4, 4, 2, 2 );
-#endif
+    TomahawkUtils::unmarginLayout( w->layout() );
+
+    w->setContentsMargins( 6, 6, 6, 6 );
 
     m_popup->setWidget( w );
     connect( m_popup, SIGNAL( hidden() ), SLOT( popupHidden() ) );
@@ -77,6 +76,8 @@ AccountsToolButton::AccountsToolButton( QWidget* parent )
     separatorLine->setStyleSheet( "QWidget { border-top: 1px solid rgb( 140, 140, 140 ); }" ); //from ProxyStyle
     wMainLayout->addWidget( separatorLine );
 
+    wMainLayout->addSpacing( 6 );
+
     QPushButton *settingsButton = new QPushButton( w );
     settingsButton->setIcon( QIcon( RESPATH "images/account-settings.png" ) );
     settingsButton->setText( tr( "Configure Accounts" ) );