diff --git a/data/images/add-friend-button-pressed.png b/data/images/add-friend-button-pressed.png
deleted file mode 100644
index 960a85862..000000000
Binary files a/data/images/add-friend-button-pressed.png and /dev/null differ
diff --git a/data/images/add-friend-button-rest.png b/data/images/add-friend-button-rest.png
deleted file mode 100644
index a3c2a4447..000000000
Binary files a/data/images/add-friend-button-rest.png and /dev/null differ
diff --git a/data/images/add.png b/data/images/add.png
old mode 100644
new mode 100755
index 0f98d972a..75a4294bf
Binary files a/data/images/add.png and b/data/images/add.png differ
diff --git a/data/images/automatic-playlist.png b/data/images/automatic-playlist.png
new file mode 100644
index 000000000..d22c14a5d
Binary files /dev/null and b/data/images/automatic-playlist.png differ
diff --git a/data/images/back.png b/data/images/back.png
old mode 100644
new mode 100755
index 3c9be3ebe..83b627ce7
Binary files a/data/images/back.png and b/data/images/back.png differ
diff --git a/data/images/forward.png b/data/images/forward.png
old mode 100644
new mode 100755
index 4b9ede5c5..5112d0ba9
Binary files a/data/images/forward.png and b/data/images/forward.png differ
diff --git a/data/images/list-add.png b/data/images/list-add.png
index 1e03be9bc..75a4294bf 100644
Binary files a/data/images/list-add.png and b/data/images/list-add.png differ
diff --git a/data/images/list-remove.png b/data/images/list-remove.png
old mode 100644
new mode 100755
index 5a4d15b7b..eaf2d8373
Binary files a/data/images/list-remove.png and b/data/images/list-remove.png differ
diff --git a/data/images/magnifying-glass.png b/data/images/magnifying-glass.png
deleted file mode 100644
index 04db422cd..000000000
Binary files a/data/images/magnifying-glass.png and /dev/null differ
diff --git a/data/images/playlist-icon.png b/data/images/playlist-icon.png
index 658b5bc51..88bdca760 100644
Binary files a/data/images/playlist-icon.png and b/data/images/playlist-icon.png differ
diff --git a/data/images/recently-played.png b/data/images/recently-played.png
old mode 100644
new mode 100755
index 436553bf7..0b2001914
Binary files a/data/images/recently-played.png and b/data/images/recently-played.png differ
diff --git a/data/images/search-box.png b/data/images/search-box.png
deleted file mode 100644
index c6c136689..000000000
Binary files a/data/images/search-box.png and /dev/null differ
diff --git a/data/images/source-info.png b/data/images/source-info.png
deleted file mode 100644
index c65f61630..000000000
Binary files a/data/images/source-info.png and /dev/null differ
diff --git a/data/images/source-off-pressed.png b/data/images/source-off-pressed.png
deleted file mode 100644
index 90ee6e3e2..000000000
Binary files a/data/images/source-off-pressed.png and /dev/null differ
diff --git a/data/images/source-off-rest.png b/data/images/source-off-rest.png
deleted file mode 100644
index 9c9b09392..000000000
Binary files a/data/images/source-off-rest.png and /dev/null differ
diff --git a/data/images/source-on-pressed.png b/data/images/source-on-pressed.png
deleted file mode 100644
index 4a0f0d3d4..000000000
Binary files a/data/images/source-on-pressed.png and /dev/null differ
diff --git a/data/images/source-on-rest.png b/data/images/source-on-rest.png
deleted file mode 100644
index 2877e476e..000000000
Binary files a/data/images/source-on-rest.png and /dev/null differ
diff --git a/data/images/station.png b/data/images/station.png
new file mode 100644
index 000000000..8aac259f8
Binary files /dev/null and b/data/images/station.png differ
diff --git a/data/images/status-alert-icon.png b/data/images/status-alert-icon.png
deleted file mode 100644
index a2c2f9f2f..000000000
Binary files a/data/images/status-alert-icon.png and /dev/null differ
diff --git a/data/images/status-bar-bkg.png b/data/images/status-bar-bkg.png
deleted file mode 100644
index 10ad87e54..000000000
Binary files a/data/images/status-bar-bkg.png and /dev/null differ
diff --git a/data/images/status-dismiss-x.png b/data/images/status-dismiss-x.png
deleted file mode 100644
index 0e8827181..000000000
Binary files a/data/images/status-dismiss-x.png and /dev/null differ
diff --git a/data/images/supercollection.png b/data/images/supercollection.png
index e068927b0..e965f88e4 100644
Binary files a/data/images/supercollection.png and b/data/images/supercollection.png differ
diff --git a/data/images/user-avatar.png b/data/images/user-avatar.png
index 0cbd4d6ce..ae26a18a4 100644
Binary files a/data/images/user-avatar.png and b/data/images/user-avatar.png differ
diff --git a/resources.qrc b/resources.qrc
index 952acaa8a..ceccafdcc 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -1,7 +1,5 @@
 <RCC>
   <qresource>
-    <file>./data/images/add-friend-button-pressed.png</file>
-    <file>./data/images/add-friend-button-rest.png</file>
     <file>./data/images/avatar-dude-plus.png</file>
     <file>./data/images/avatar-dude.png</file>
     <file>./data/images/back-pressed.png</file>
@@ -9,7 +7,6 @@
     <file>./data/images/cover-shadow.png</file>
     <file>./data/images/loved.png</file>
     <file>./data/images/not-loved.png</file>
-    <file>./data/images/magnifying-glass.png</file>
     <file>./data/images/no-album-art-placeholder.png</file>
     <file>./data/images/now-playing-panel.png</file>
     <file>./data/images/now-playing-speaker.png</file>
@@ -27,7 +24,6 @@
     <file>./data/images/repeat-off-pressed.png</file>
     <file>./data/images/repeat-off-rest.png</file>
     <file>./data/images/search-box-dismiss-x.png</file>
-    <file>./data/images/search-box.png</file>
     <file>./data/images/seek-and-volume-knob-pressed.png</file>
     <file>./data/images/seek-and-volume-knob-rest.png</file>
     <file>./data/images/seek-slider-bkg.png</file>
@@ -38,14 +34,6 @@
     <file>./data/images/shuffle-on-rest.png</file>
     <file>./data/images/skip-pressed.png</file>
     <file>./data/images/skip-rest.png</file>
-    <file>./data/images/source-info.png</file>
-    <file>./data/images/source-off-pressed.png</file>
-    <file>./data/images/source-off-rest.png</file>
-    <file>./data/images/source-on-pressed.png</file>
-    <file>./data/images/source-on-rest.png</file>
-    <file>./data/images/status-alert-icon.png</file>
-    <file>./data/images/status-bar-bkg.png</file>
-    <file>./data/images/status-dismiss-x.png</file>
     <file>./data/images/user-avatar.png</file>
     <file>./data/images/view-toggle-active-centre.png</file>
     <file>./data/images/view-toggle-active-left.png</file>
@@ -90,6 +78,8 @@
     <file>./data/images/music-settings.png</file>
     <file>./data/images/resolvers-settings.png</file>
     <file>./data/images/lastfm-settings.png</file>
+    <file>./data/images/automatic-playlist.png</file>
+    <file>./data/images/station.png</file>
     <file>./data/stylesheets/topbar-radiobuttons.css</file>
     <file>./data/icons/tomahawk-icon-16x16.png</file>
     <file>./data/icons/tomahawk-icon-32x32.png</file>
diff --git a/src/libtomahawk/widgets/overlaywidget.cpp b/src/libtomahawk/widgets/overlaywidget.cpp
index 64471b272..077062e49 100644
--- a/src/libtomahawk/widgets/overlaywidget.cpp
+++ b/src/libtomahawk/widgets/overlaywidget.cpp
@@ -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
@@ -22,10 +22,10 @@
 #include <QPainter>
 #include <QPropertyAnimation>
 
-#define CORNER_ROUNDNESS 16.0
+#define CORNER_ROUNDNESS 8.0
 #define FADING_DURATION 500
 #define FONT_SIZE 16
-#define OPACITY 0.86
+#define OPACITY 0.70
 
 
 OverlayWidget::OverlayWidget( QWidget* parent )
@@ -87,7 +87,7 @@ OverlayWidget::show( int timeoutSecs )
 
     QPropertyAnimation* animation = new QPropertyAnimation( this, "opacity" );
     animation->setDuration( FADING_DURATION );
-    animation->setEndValue( OPACITY );
+    animation->setEndValue( 1.0 );
     animation->start();
 
     if( timeoutSecs > 0 )
@@ -108,7 +108,7 @@ OverlayWidget::hide()
 }
 
 
-bool 
+bool
 OverlayWidget::shown() const
 {
     if ( !isEnabled() )
@@ -134,7 +134,7 @@ OverlayWidget::paintEvent( QPaintEvent* event )
 
     QPen pen( palette().dark().color(), .5 );
     p.setPen( pen );
-    p.setBrush( palette().highlight() );
+    p.setBrush( QColor( 30, 30, 30, 255.0 * OPACITY ) );
 
     p.drawRoundedRect( r, CORNER_ROUNDNESS, CORNER_ROUNDNESS );
 
@@ -160,6 +160,7 @@ OverlayWidget::paintEvent( QPaintEvent* event )
         fm = QFontMetricsF( f );
         textHeight = fm.boundingRect( textRect, Qt::AlignCenter | Qt::TextWordWrap, text() ).height();
     }
+
     p.setFont( f );
     p.setPen( palette().highlightedText().color() );
     p.drawText( r.adjusted( 8, 8, -8, -8 ), text(), to );
diff --git a/src/sourcetree/items/playlistitems.cpp b/src/sourcetree/items/playlistitems.cpp
index eeeaa1111..b3461cf1f 100644
--- a/src/sourcetree/items/playlistitems.cpp
+++ b/src/sourcetree/items/playlistitems.cpp
@@ -320,3 +320,13 @@ DynamicPlaylistItem::willAcceptDrag( const QMimeData* data ) const
 {
     return false;
 }
+
+QIcon
+DynamicPlaylistItem::icon() const
+{
+    if( m_dynplaylist->mode() == OnDemand ) {
+        return QIcon( RESPATH "images/station.png" );
+    } else {
+        return QIcon( RESPATH "images/automatic-playlist.png" );
+    }
+}
diff --git a/src/sourcetree/items/playlistitems.h b/src/sourcetree/items/playlistitems.h
index 1c811cf75..ec974b74f 100644
--- a/src/sourcetree/items/playlistitems.h
+++ b/src/sourcetree/items/playlistitems.h
@@ -62,6 +62,7 @@ public:
     virtual bool willAcceptDrag( const QMimeData* data ) const;
     virtual void activate();
     virtual int peerSortValue() const;
+    virtual QIcon icon() const;
 
 private slots:
     void onDynamicPlaylistLoaded( Tomahawk::DynamicPlaylistRevision revision );