diff --git a/src/libtomahawk/playlist/GridItemDelegate.cpp b/src/libtomahawk/playlist/GridItemDelegate.cpp
index 9271dac32..cfc074d06 100644
--- a/src/libtomahawk/playlist/GridItemDelegate.cpp
+++ b/src/libtomahawk/playlist/GridItemDelegate.cpp
@@ -198,7 +198,7 @@ GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
     painter->drawRect( gradientRect );
     painter->restore();
 
-    painter->setPen( Qt::white );
+    painter->setPen( TomahawkUtils::Colors::SELECTION_FOREGROUND );
 
     QRect textRect = option.rect.adjusted( 6, option.rect.height() - frameHeight, -6, -6 );
     bool oneLiner = false;
@@ -225,8 +225,8 @@ GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
         r.adjust( 4, 0, -4, -1 );
         if ( m_hoveringOver == index )
         {
-            TomahawkUtils::drawQueryBackground( painter, opt.palette, r, 1.1 );
-            painter->setPen( opt.palette.color( QPalette::HighlightedText ) );
+            TomahawkUtils::drawQueryBackground( painter, r );
+            painter->setPen( TomahawkUtils::Colors::SELECTION_FOREGROUND );
         }
 
         to.setAlignment( Qt::AlignHCenter | Qt::AlignBottom );
diff --git a/src/libtomahawk/widgets/PlayableCover.cpp b/src/libtomahawk/widgets/PlayableCover.cpp
index 2c5652f26..016f19b89 100644
--- a/src/libtomahawk/widgets/PlayableCover.cpp
+++ b/src/libtomahawk/widgets/PlayableCover.cpp
@@ -251,8 +251,8 @@ PlayableCover::paintEvent( QPaintEvent* event )
 
         if ( m_hoveredRect == r )
         {
-            TomahawkUtils::drawQueryBackground( &bufpainter, palette(), r, 1.1 );
-            bufpainter.setPen( Qt::white );
+            TomahawkUtils::drawQueryBackground( &bufpainter, r );
+            bufpainter.setPen( TomahawkUtils::Colors::SELECTION_FOREGROUND );
         }
         
         to.setAlignment( Qt::AlignHCenter | Qt::AlignBottom );
diff --git a/src/libtomahawk/widgets/QueryLabel.cpp b/src/libtomahawk/widgets/QueryLabel.cpp
index 35b11628c..efa6cede4 100644
--- a/src/libtomahawk/widgets/QueryLabel.cpp
+++ b/src/libtomahawk/widgets/QueryLabel.cpp
@@ -387,21 +387,22 @@ QueryLabel::paintEvent( QPaintEvent* event )
             m_hoverType = Track;
         }
 
-        TomahawkUtils::drawQueryBackground( &p, palette(), m_hoverArea );
+        TomahawkUtils::drawQueryBackground( &p, m_hoverArea );
     }
 
     if ( elidedText != s || ( m_result.isNull() && m_query.isNull() && m_artist.isNull() && m_album.isNull() ) )
     {
         if ( m_hoverArea.width() )
         {
-            p.setPen( palette().highlightedText().color() );
-            p.setBrush( palette().highlight() );
+            p.setBrush( TomahawkUtils::Colors::SELECTION_BACKGROUND );
+            p.setPen( TomahawkUtils::Colors::SELECTION_FOREGROUND );
         }
         else
         {
             p.setBrush( palette().window() );
             p.setPen( palette().color( foregroundRole() ) );
         }
+
         p.drawText( r, m_align, elidedText );
     }
     else