diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 29162aeec..29a0471d1 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -118,15 +118,11 @@ SettingsDialog::SettingsDialog( QWidget *parent )
 
     connect( m_accountModel, SIGNAL( createAccount( Tomahawk::Accounts::AccountFactory* ) ), this, SLOT( createAccountFromFactory( Tomahawk::Accounts::AccountFactory* ) ) );
 
-    connect( ui->accountsView->selectionModel(), SIGNAL( selectionChanged( QItemSelection,QItemSelection ) ), this, SLOT( accountsSelectionChanged() ) );
-
     if ( !Servent::instance()->isReady() )
     {
         m_sipSpinner = new LoadingSpinner( ui->accountsView );
         m_sipSpinner->fadeIn();
 
-        ui->addNewServiceBtn->setEnabled( false );
-        ui->removeServiceBtn->setEnabled( false );
         connect( Servent::instance(), SIGNAL( ready() ), this, SLOT( serventReady() ) );
     }
     ui->staticHostName->setText( s->externalHostname() );
@@ -225,8 +221,6 @@ void
 SettingsDialog::serventReady()
 {
     m_sipSpinner->fadeOut();
-    ui->addNewServiceBtn->setEnabled( true );
-    ui->removeServiceBtn->setEnabled( true );
 }
 
 
@@ -424,20 +418,6 @@ SettingsDialog::onLastFmFinished()
 }
 
 
-void
-SettingsDialog::accountsSelectionChanged()
-{
-    if( !ui->accountsView->selectionModel()->selectedIndexes().isEmpty() )
-    {
-        ui->removeServiceBtn->setEnabled( true );
-    }
-    else
-    {
-        ui->addNewServiceBtn->setEnabled( false );
-    }
-}
-
-
 void
 SettingsDialog::openAccountConfig( Account* account, bool showDelete )
 {
diff --git a/src/settingsdialog.h b/src/settingsdialog.h
index 6be871778..363dc3a2f 100644
--- a/src/settingsdialog.h
+++ b/src/settingsdialog.h
@@ -90,8 +90,6 @@ private slots:
 
     void createAccountFromFactory( Tomahawk::Accounts::AccountFactory* );
 
-    void accountsSelectionChanged();
-
     void openAccountConfig( Tomahawk::Accounts::Account*, bool showDelete = false );
     void openAccountFactoryConfig( Tomahawk::Accounts::AccountFactory* );
     void accountConfigClosed( int value );
diff --git a/src/stackedsettingsdialog.ui b/src/stackedsettingsdialog.ui
index a32f74f67..584a89ace 100644
--- a/src/stackedsettingsdialog.ui
+++ b/src/stackedsettingsdialog.ui
@@ -97,12 +97,33 @@
            <property name="title">
             <string>Internet Sources</string>
            </property>
-           <layout class="QVBoxLayout" name="verticalLayout_14">
-            <property name="margin">
-             <number>2</number>
-            </property>
+           <layout class="QVBoxLayout" name="verticalLayout_8">
             <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_2"/>
+             <layout class="QHBoxLayout" name="horizontalLayout_2">
+              <item>
+               <spacer name="horizontalSpacer">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <widget class="QLabel" name="label">
+                <property name="text">
+                 <string>Filter by capability:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QComboBox" name="comboBox"/>
+              </item>
+             </layout>
             </item>
             <item>
              <widget class="QListView" name="accountsView"/>
@@ -519,9 +540,7 @@
    <header location="global">widgets/checkdirtree.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../resources.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>