diff --git a/src/libtomahawk/widgets/ToggleButton.cpp b/src/libtomahawk/widgets/ToggleButton.cpp
index a99308c0e..328412797 100644
--- a/src/libtomahawk/widgets/ToggleButton.cpp
+++ b/src/libtomahawk/widgets/ToggleButton.cpp
@@ -25,14 +25,14 @@
 
 ToggleButton::ToggleButton( QWidget* parent )
     : QPushButton( parent )
-    , m_toggled( false )
 {
     setStyleSheet( QString( "QPushButton { color: white; background-color: %1; border-style: outset; border-width: 1px; border-radius: 4px; border-color: white; font: bold; } "
+                            "QPushButton:checked { background-color: %2; border-style: inset; }"
                             "QPushButton:pressed { background-color: %2; border-style: inset; }" )
                       .arg( StyleHelper::headerUpperColor().name() )
                       .arg( StyleHelper::headerLowerColor().darker().name() ) );
 
-    connect( this, SIGNAL( released() ), SLOT( onToggled() ) );
+    setCheckable( true );
 }
 
 
@@ -41,24 +41,6 @@ ToggleButton::~ToggleButton()
 }
 
 
-void
-ToggleButton::setDown( bool b )
-{
-    m_toggled = b;
-    QPushButton::setDown( b );
-}
-
-
-void
-ToggleButton::onToggled()
-{
-    m_toggled ^= true;
-    setDown( m_toggled );
-
-    emit toggled( m_toggled );
-}
-
-
 void
 ToggleButton::paintEvent( QPaintEvent* event )
 {
diff --git a/src/libtomahawk/widgets/ToggleButton.h b/src/libtomahawk/widgets/ToggleButton.h
index 31042a7c6..7b395fe9e 100644
--- a/src/libtomahawk/widgets/ToggleButton.h
+++ b/src/libtomahawk/widgets/ToggleButton.h
@@ -36,17 +36,8 @@ public:
     ToggleButton( QWidget* parent = 0 );
     virtual ~ToggleButton();
 
-public slots:
-    void setDown( bool b );
-
 protected:
     virtual void paintEvent( QPaintEvent* );
-
-private slots:
-    void onToggled();
-
-private:
-    bool m_toggled;
 };
 
 #endif
diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
index 6f03385e6..9340fdd0e 100644
--- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
+++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
@@ -70,7 +70,7 @@ ArtistInfoWidget::ArtistInfoWidget( const Tomahawk::artist_ptr& artist, QWidget*
 
     ui->albumHeader->setContentsMargins( 0, 0, 4, 0 );
     ui->button->setFixedWidth( 200 );
-    ui->button->setDown( true );
+    ui->button->setChecked( true );
 
     m_pixmap = QPixmap( RESPATH "images/no-album-art-placeholder.png" ).scaledToWidth( 48, Qt::SmoothTransformation );