diff --git a/src/libtomahawk/widgets/BasicHeader.cpp b/src/libtomahawk/widgets/BasicHeader.cpp
index b37c77b88..b598284a8 100644
--- a/src/libtomahawk/widgets/BasicHeader.cpp
+++ b/src/libtomahawk/widgets/BasicHeader.cpp
@@ -51,6 +51,8 @@ BasicHeader::BasicHeader( QWidget* parent )
         ui->captionLabel->setFont( f );
         ui->captionLabel->setPalette( p );
 
+        ui->iconLabel->hide();
+
         ui->anchor1Label->hide();
         ui->anchor2Label->hide();
         ui->anchor3Label->hide();
@@ -97,8 +99,11 @@ BasicHeader::setDescription( const QString& /* s */ )
 
 
 void
-BasicHeader::setPixmap( const QPixmap& /* p */ )
+BasicHeader::setPixmap( const QPixmap& p )
 {
-    //FIXME
-//    m_imageLabel->setPixmap( p.scaledToHeight( m_imageLabel->height(), Qt::SmoothTransformation ) );
+    ui->iconLabel->setFixedHeight( 20 );
+    ui->iconLabel->setPixmap( p.scaledToHeight( ui->iconLabel->height(), Qt::SmoothTransformation ) );
+
+    if ( !p.isNull() )
+        ui->iconLabel->show();
 }
diff --git a/src/libtomahawk/widgets/HeaderWidget.ui b/src/libtomahawk/widgets/HeaderWidget.ui
index 9fbf4dc94..439449081 100644
--- a/src/libtomahawk/widgets/HeaderWidget.ui
+++ b/src/libtomahawk/widgets/HeaderWidget.ui
@@ -41,14 +41,27 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>8</number>
+     </property>
      <property name="margin">
       <number>0</number>
      </property>
+     <item>
+      <widget class="QLabel" name="iconLabel">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QLabel" name="captionLabel">
        <property name="text">
         <string>TextLabel</string>
        </property>
+       <property name="alignment">
+        <set>Qt::AlignLeft|Qt::AlignVCenter</set>
+       </property>
       </widget>
      </item>
      <item>
@@ -69,6 +82,9 @@
        <property name="text">
         <string>TextLabel</string>
        </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
       </widget>
      </item>
      <item>
@@ -81,7 +97,7 @@
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>32</width>
+         <width>24</width>
          <height>20</height>
         </size>
        </property>
@@ -92,6 +108,9 @@
        <property name="text">
         <string>TextLabel</string>
        </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
       </widget>
      </item>
      <item>
@@ -104,7 +123,7 @@
        </property>
        <property name="sizeHint" stdset="0">
         <size>
-         <width>32</width>
+         <width>24</width>
          <height>20</height>
         </size>
        </property>
@@ -115,6 +134,9 @@
        <property name="text">
         <string>TextLabel</string>
        </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
       </widget>
      </item>
      <item>