diff --git a/src/ui/albumcovermanager.cpp b/src/ui/albumcovermanager.cpp
index 952b5cb0c..e8b7abf01 100644
--- a/src/ui/albumcovermanager.cpp
+++ b/src/ui/albumcovermanager.cpp
@@ -327,8 +327,9 @@ void AlbumCoverManager::ArtistChanged(QListWidgetItem* current) {
     // Don't show songs without an album, obviously
     if (info.album_name.isEmpty()) continue;
 
+    QIcon no_cover(no_cover_icon_.pixmap(120, 120));
     QListWidgetItem* item =
-        new QListWidgetItem(no_cover_icon_, info.album_name, ui_->albums);
+        new QListWidgetItem(no_cover, info.album_name, ui_->albums);
     item->setData(Role_ArtistName, info.artist);
     item->setData(Role_AlbumName, info.album_name);
     item->setData(Role_FirstUrl, info.first_url);
diff --git a/src/ui/albumcovermanager.ui b/src/ui/albumcovermanager.ui
index d95b7aff2..0b127665a 100644
--- a/src/ui/albumcovermanager.ui
+++ b/src/ui/albumcovermanager.ui
@@ -19,7 +19,16 @@
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QVBoxLayout" name="verticalLayout_2">
-    <property name="margin">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
      <number>0</number>
     </property>
     <item>
@@ -49,7 +58,16 @@
         <property name="spacing">
          <number>0</number>
         </property>
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
@@ -171,6 +189,18 @@
             <property name="spacing">
              <number>0</number>
             </property>
+            <property name="leftMargin">
+             <number>5</number>
+            </property>
+            <property name="topMargin">
+             <number>5</number>
+            </property>
+            <property name="rightMargin">
+             <number>5</number>
+            </property>
+            <property name="bottomMargin">
+             <number>5</number>
+            </property>
             <item>
              <widget class="QPushButton" name="fetch">
               <property name="text">
@@ -184,6 +214,22 @@
               </property>
              </widget>
             </item>
+            <item>
+             <spacer name="verticalSpacer">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>5</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
             <item>
              <widget class="QPushButton" name="export_covers">
               <property name="text">