diff --git a/src/translations/ar.po b/src/translations/ar.po
index cdaa95be4..5edb104a7 100644
--- a/src/translations/ar.po
+++ b/src/translations/ar.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr ""
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/be.po b/src/translations/be.po
index e6a2f33e6..b0cfe66f5 100644
--- a/src/translations/be.po
+++ b/src/translations/be.po
@@ -406,7 +406,7 @@ msgstr "Працягласць буфера"
 msgid "Buttons"
 msgstr "Клавішы"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -576,6 +576,23 @@ msgstr "Немагчыма адкрыць выхадны файл %1"
 msgid "Cover Manager"
 msgstr "Менеджэр вокладак"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Перакрыжаванае згасанне пры аўтаматычнай змене кампазіцыі"
 
diff --git a/src/translations/bg.po b/src/translations/bg.po
index fe76742f2..2092e1cdd 100644
--- a/src/translations/bg.po
+++ b/src/translations/bg.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr "Бутони"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr "Обложки"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/br.po b/src/translations/br.po
index 688915fbc..02d3f5e76 100644
--- a/src/translations/br.po
+++ b/src/translations/br.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr ""
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/ca.po b/src/translations/ca.po
index 95e6fd66b..33a4fd102 100644
--- a/src/translations/ca.po
+++ b/src/translations/ca.po
@@ -416,7 +416,7 @@ msgstr ""
 msgid "Buttons"
 msgstr "Botons"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -589,6 +589,23 @@ msgstr "No es va poder obrir el fitxer de sortida %1"
 msgid "Cover Manager"
 msgstr "Gestor de caràtules"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Fondre quan es canviï la pista automàticament"
 
diff --git a/src/translations/cs.po b/src/translations/cs.po
index 88e24e51a..01188e3a2 100644
--- a/src/translations/cs.po
+++ b/src/translations/cs.po
@@ -413,7 +413,7 @@ msgstr "Doba trvání vyrovnávací paměti"
 msgid "Buttons"
 msgstr "Tlačítka"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -584,6 +584,23 @@ msgstr "Nepodařilo se otevřít výstupní soubor %1"
 msgid "Cover Manager"
 msgstr "Správce obalů"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Prolínání při automatické změně skladby"
 
diff --git a/src/translations/cy.po b/src/translations/cy.po
index 7a9a15b5e..b8a0c0ef4 100644
--- a/src/translations/cy.po
+++ b/src/translations/cy.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr ""
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/da.po b/src/translations/da.po
index b16d145e8..004584b35 100644
--- a/src/translations/da.po
+++ b/src/translations/da.po
@@ -404,7 +404,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -563,6 +563,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr "Omslagshåndtering"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Fade over når der automatisk skiftes spor"
 
diff --git a/src/translations/de.po b/src/translations/de.po
index ca3c44144..35e9ca851 100644
--- a/src/translations/de.po
+++ b/src/translations/de.po
@@ -415,7 +415,7 @@ msgstr "Zwischenspeichergröße"
 msgid "Buttons"
 msgstr "Tasten"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -588,6 +588,23 @@ msgstr "Ausgabedatei %1 konnte nicht geöffnet werden"
 msgid "Cover Manager"
 msgstr "Coververwaltung"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Überblenden bei automatischem Stückwechsel"
 
diff --git a/src/translations/el.po b/src/translations/el.po
index e175b8a21..0750a9fc2 100644
--- a/src/translations/el.po
+++ b/src/translations/el.po
@@ -417,7 +417,7 @@ msgstr "Διάρκεια του απομονωτής (buffer)"
 msgid "Buttons"
 msgstr "Κουμπιά"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -593,6 +593,23 @@ msgstr "Δεν μπορεί να ανοίξει το αρχείο εξόδου %
 msgid "Cover Manager"
 msgstr "Διαχείριση εξώφυλλων"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Χρήση «Cross-Fade» κατά την αυτόματη αλλαγή του κομματιού"
 
diff --git a/src/translations/en_CA.po b/src/translations/en_CA.po
index de782c242..32b8e410d 100644
--- a/src/translations/en_CA.po
+++ b/src/translations/en_CA.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -564,6 +564,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr "Cover Manager"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Cross-fade when changing tracks automatically"
 
diff --git a/src/translations/en_GB.po b/src/translations/en_GB.po
index f045bceef..2f52d4faa 100644
--- a/src/translations/en_GB.po
+++ b/src/translations/en_GB.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr "Cover Manager"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Cross-fade when changing tracks automatically"
 
diff --git a/src/translations/eo.po b/src/translations/eo.po
index 8685d9b09..482b63eda 100644
--- a/src/translations/eo.po
+++ b/src/translations/eo.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr ""
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/es.po b/src/translations/es.po
index 6accc2273..e49317128 100644
--- a/src/translations/es.po
+++ b/src/translations/es.po
@@ -418,7 +418,7 @@ msgstr "Duración del buffer"
 msgid "Buttons"
 msgstr "Botones"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -590,6 +590,23 @@ msgstr "No se pudo abrir el archivo de salida %1"
 msgid "Cover Manager"
 msgstr "Gestor de carátulas"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Fundir cuando se cambie la pista automáticamente"
 
diff --git a/src/translations/et.po b/src/translations/et.po
index bb9918c92..b85159f03 100644
--- a/src/translations/et.po
+++ b/src/translations/et.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr "Nupud"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr "Kaanepildi haldur"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/eu.po b/src/translations/eu.po
index 1ee3b5fb0..a33ce5d48 100644
--- a/src/translations/eu.po
+++ b/src/translations/eu.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr ""
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/fi.po b/src/translations/fi.po
index ec0fd579c..89aff14da 100644
--- a/src/translations/fi.po
+++ b/src/translations/fi.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr "Kansikuvaselain"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/fr.po b/src/translations/fr.po
index a6dfd0fa1..f47a215a8 100644
--- a/src/translations/fr.po
+++ b/src/translations/fr.po
@@ -421,7 +421,7 @@ msgstr "Durée du tampon"
 msgid "Buttons"
 msgstr "Boutons"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -592,6 +592,23 @@ msgstr "Impossible d'ouvrir le fichier de sortie %1"
 msgid "Cover Manager"
 msgstr "Gestionnaire de jaquettes"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Appliquer un fondu lors des changements de piste automatiques"
 
diff --git a/src/translations/gl.po b/src/translations/gl.po
index dc0f19192..92d6fa907 100644
--- a/src/translations/gl.po
+++ b/src/translations/gl.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr "Botóns"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -566,6 +566,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr ""
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/he.po b/src/translations/he.po
index 5377372c6..a1a505d76 100644
--- a/src/translations/he.po
+++ b/src/translations/he.po
@@ -405,7 +405,7 @@ msgstr ""
 msgid "Buttons"
 msgstr "לחצנים"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -564,6 +564,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr "מנהל עטיפות"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/hi.po b/src/translations/hi.po
index a4a3b1a1d..366f97986 100644
--- a/src/translations/hi.po
+++ b/src/translations/hi.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr ""
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/hr.po b/src/translations/hr.po
index 8ea3a1c87..ed952c585 100644
--- a/src/translations/hr.po
+++ b/src/translations/hr.po
@@ -409,7 +409,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -568,6 +568,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr ""
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/hu.po b/src/translations/hu.po
index dba1f10b8..3bf208147 100644
--- a/src/translations/hu.po
+++ b/src/translations/hu.po
@@ -411,7 +411,7 @@ msgstr "Puffer hossza"
 msgid "Buttons"
 msgstr "Gombok"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -584,6 +584,23 @@ msgstr "A %1 célfájl megnyitása sikertelen"
 msgid "Cover Manager"
 msgstr "Borítókezelő"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Átúsztatás használata számok automatikus váltásánál"
 
diff --git a/src/translations/it.po b/src/translations/it.po
index 216c409e0..e83d9bd4c 100644
--- a/src/translations/it.po
+++ b/src/translations/it.po
@@ -418,7 +418,7 @@ msgstr "Durata del buffer"
 msgid "Buttons"
 msgstr "Pulsanti"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -588,6 +588,23 @@ msgstr "Impossibile aprire il file di uscita %1"
 msgid "Cover Manager"
 msgstr "Gestore copertine"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Dissolvenza incrociata al cambio automatico di traccia"
 
diff --git a/src/translations/ja.po b/src/translations/ja.po
index 085671353..651e3ebae 100644
--- a/src/translations/ja.po
+++ b/src/translations/ja.po
@@ -409,7 +409,7 @@ msgstr ""
 msgid "Buttons"
 msgstr "ボタン"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -579,6 +579,23 @@ msgstr "出力ファイル %1 を開けませんでした"
 msgid "Cover Manager"
 msgstr "カバー マネージャー"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "トラックの変更時に自動的にクロスフェードする"
 
diff --git a/src/translations/kk.po b/src/translations/kk.po
index 14020d2ea..4f970166e 100644
--- a/src/translations/kk.po
+++ b/src/translations/kk.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr ""
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/lt.po b/src/translations/lt.po
index e577f8bb0..d0102173b 100644
--- a/src/translations/lt.po
+++ b/src/translations/lt.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr ""
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/nb.po b/src/translations/nb.po
index 4b8afb520..aaf55c2a6 100644
--- a/src/translations/nb.po
+++ b/src/translations/nb.po
@@ -406,7 +406,7 @@ msgstr ""
 msgid "Buttons"
 msgstr "Knapper"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -573,6 +573,23 @@ msgstr "Kunne ikke åpne output fil %1"
 msgid "Cover Manager"
 msgstr "Behandling av plateomslag"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/nl.po b/src/translations/nl.po
index ad77d573b..5a83c76bd 100644
--- a/src/translations/nl.po
+++ b/src/translations/nl.po
@@ -411,7 +411,7 @@ msgstr ""
 msgid "Buttons"
 msgstr "Knoppen"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -580,6 +580,23 @@ msgstr "Kon uitvoerbestand: %1 niet openen"
 msgid "Cover Manager"
 msgstr "Albumhoesbeheer"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Cross-fade wanneer automatisch van track veranderd wordt"
 
diff --git a/src/translations/oc.po b/src/translations/oc.po
index c5d4ec7f4..d3a7febe0 100644
--- a/src/translations/oc.po
+++ b/src/translations/oc.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr "Gestionari de pochetas"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/pl.po b/src/translations/pl.po
index 46f0ea692..b30db97c6 100644
--- a/src/translations/pl.po
+++ b/src/translations/pl.po
@@ -411,7 +411,7 @@ msgstr ""
 msgid "Buttons"
 msgstr "Przyciski"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -583,6 +583,23 @@ msgstr "Nie można otworzyć pliku %1"
 msgid "Cover Manager"
 msgstr "Menadżer okładek"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Płynne przejście przy automatycznej zmianie ścieżek"
 
diff --git a/src/translations/pt.po b/src/translations/pt.po
index 64a7f4a2f..9ac60f24c 100644
--- a/src/translations/pt.po
+++ b/src/translations/pt.po
@@ -415,7 +415,7 @@ msgstr "Duração da memória"
 msgid "Buttons"
 msgstr "Botões"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -588,6 +588,23 @@ msgstr "Não foi possível abrir o ficheiro %1"
 msgid "Cover Manager"
 msgstr "Gestor de capas"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Silenciar progressivo ao mudar automaticamente de faixas"
 
diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po
index d627ca6bb..2ab95d137 100644
--- a/src/translations/pt_BR.po
+++ b/src/translations/pt_BR.po
@@ -411,7 +411,7 @@ msgstr ""
 msgid "Buttons"
 msgstr "Botões"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -581,6 +581,23 @@ msgstr "Não pode abrir o arquivo de saída %1"
 msgid "Cover Manager"
 msgstr "Gerenciador de Capas"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Diminuir e aumentar automaticamente quando mudar de faixa"
 
diff --git a/src/translations/ro.po b/src/translations/ro.po
index 7eb29e2c3..677c7854b 100644
--- a/src/translations/ro.po
+++ b/src/translations/ro.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -562,6 +562,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr "Gestionar de coperte"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/ru.po b/src/translations/ru.po
index 457683088..1acf3eff5 100644
--- a/src/translations/ru.po
+++ b/src/translations/ru.po
@@ -410,7 +410,7 @@ msgstr "Продолжительность буфера"
 msgid "Buttons"
 msgstr "Клавиши"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -581,6 +581,23 @@ msgstr "Невозможно открыть выходной файл %1"
 msgid "Cover Manager"
 msgstr "Менеджер обложек"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Перекрестное затухание при автоматической смене композиции"
 
diff --git a/src/translations/sk.po b/src/translations/sk.po
index f96629b1a..2a78ed8e4 100644
--- a/src/translations/sk.po
+++ b/src/translations/sk.po
@@ -411,7 +411,7 @@ msgstr "Dĺžka bufferu"
 msgid "Buttons"
 msgstr "Tlačidlá"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -580,6 +580,23 @@ msgstr "nedá sa otvoriť výstupný súbor %1"
 msgid "Cover Manager"
 msgstr "Správca obalov"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Prelínať keď sa zmení skladba automaticky"
 
diff --git a/src/translations/sl.po b/src/translations/sl.po
index cd686d1ed..a01601381 100644
--- a/src/translations/sl.po
+++ b/src/translations/sl.po
@@ -410,7 +410,7 @@ msgstr "Trajanje medpomnilnika"
 msgid "Buttons"
 msgstr "Gumbi"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -582,6 +582,23 @@ msgstr "Izhodne datoteke %1 ni bilo mogoče odpreti"
 msgid "Cover Manager"
 msgstr "Upravljalnik ovitkov"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Postopni prehod med samodejno spremembo skladb"
 
diff --git a/src/translations/sr.po b/src/translations/sr.po
index 8da493f3f..723d14f08 100644
--- a/src/translations/sr.po
+++ b/src/translations/sr.po
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -564,6 +564,23 @@ msgstr "Не могу да отворим излазни фајл %1"
 msgid "Cover Manager"
 msgstr "Менаџер омота"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Претапање при аутоматској измени нумера"
 
diff --git a/src/translations/sv.po b/src/translations/sv.po
index 927264929..444e84507 100644
--- a/src/translations/sv.po
+++ b/src/translations/sv.po
@@ -413,7 +413,7 @@ msgstr "Längd på buffer"
 msgid "Buttons"
 msgstr "Knappar"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -586,6 +586,23 @@ msgstr "Kunde inte öppna utdatafilen %1"
 msgid "Cover Manager"
 msgstr "Omslagshanterare"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Korstona vid automatiskt byte av spår"
 
diff --git a/src/translations/tr.po b/src/translations/tr.po
index 8ebc0d848..b15605c22 100644
--- a/src/translations/tr.po
+++ b/src/translations/tr.po
@@ -410,7 +410,7 @@ msgstr "Önbellek süresi"
 msgid "Buttons"
 msgstr "Düğmeler"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -579,6 +579,23 @@ msgstr "%1 çıktı dosyası açılamadı"
 msgid "Cover Manager"
 msgstr "Kapak Yöneticisi"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Parça değiştirirken otomatik olarak çapraz geçiş yap"
 
diff --git a/src/translations/translations.pot b/src/translations/translations.pot
index 0e25ade1d..df140f9e1 100644
--- a/src/translations/translations.pot
+++ b/src/translations/translations.pot
@@ -393,7 +393,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -552,6 +552,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr ""
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/uk.po b/src/translations/uk.po
index 281bdc7a3..ba26d328b 100644
--- a/src/translations/uk.po
+++ b/src/translations/uk.po
@@ -412,7 +412,7 @@ msgstr "Розмір буферу"
 msgid "Buttons"
 msgstr "Кнопки"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -583,6 +583,23 @@ msgstr "Не вдалось відкрити вихідний файл %1"
 msgid "Cover Manager"
 msgstr "Менеджер обкладинок"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "Перехресне згасання під час автоматичної зміни доріжок"
 
diff --git a/src/translations/zh_CN.po b/src/translations/zh_CN.po
index e7c859949..344b1642f 100644
--- a/src/translations/zh_CN.po
+++ b/src/translations/zh_CN.po
@@ -405,7 +405,7 @@ msgstr ""
 msgid "Buttons"
 msgstr ""
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -564,6 +564,23 @@ msgstr "无法打开输出文件 %1"
 msgid "Cover Manager"
 msgstr "封面管理器"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr ""
 
diff --git a/src/translations/zh_TW.po b/src/translations/zh_TW.po
index a007e9c04..b31302dfb 100644
--- a/src/translations/zh_TW.po
+++ b/src/translations/zh_TW.po
@@ -407,7 +407,7 @@ msgstr ""
 msgid "Buttons"
 msgstr "按鈕"
 
-msgid "Change album cover"
+msgid "Change cover art"
 msgstr ""
 
 msgid "Change font size..."
@@ -566,6 +566,23 @@ msgstr ""
 msgid "Cover Manager"
 msgstr "封面管理員"
 
+msgid "Cover art from embedded image"
+msgstr ""
+
+#, qt-format
+msgid "Cover art loaded automatically from %1"
+msgstr ""
+
+msgid "Cover art manually unset"
+msgstr ""
+
+msgid "Cover art not set"
+msgstr ""
+
+#, qt-format
+msgid "Cover art set from %1"
+msgstr ""
+
 msgid "Cross-fade when changing tracks automatically"
 msgstr "當自動改變歌曲時交叉淡入淡出"
 
diff --git a/src/ui/edittagdialog.cpp b/src/ui/edittagdialog.cpp
index d12f5baf9..e0a105e4f 100644
--- a/src/ui/edittagdialog.cpp
+++ b/src/ui/edittagdialog.cpp
@@ -17,9 +17,13 @@
 
 #include "edittagdialog.h"
 #include "ui_edittagdialog.h"
+#include "core/albumcoverloader.h"
+#include "core/utilities.h"
 #include "library/library.h"
 #include "playlist/playlistdelegates.h"
 
+#include <QDateTime>
+#include <QLabel>
 #include <QtDebug>
 
 const char* EditTagDialog::kHintText = QT_TR_NOOP("(different across multiple songs)");
@@ -27,8 +31,15 @@ const char* EditTagDialog::kHintText = QT_TR_NOOP("(different across multiple so
 EditTagDialog::EditTagDialog(QWidget* parent)
   : QDialog(parent),
     ui_(new Ui_EditTagDialog),
+    cover_loader_(new BackgroundThreadImplementation<AlbumCoverLoader, AlbumCoverLoader>(this)),
+    cover_art_id_(0),
     ignore_edits_(false)
 {
+  cover_loader_->Start(true);
+  cover_loader_->Worker()->SetDefaultOutputImage(QImage(":nocover.png"));
+  connect(cover_loader_->Worker().get(), SIGNAL(ImageLoaded(quint64,QImage)),
+          SLOT(ArtLoaded(quint64,QImage)));
+
   ui_->setupUi(this);
   ui_->splitter->setSizes(QList<int>() << 200 << width() - 200);
 
@@ -209,11 +220,74 @@ void EditTagDialog::SelectionChanged() {
   if (sel.isEmpty())
     return;
 
+  // Set the editable fields
   ignore_edits_ = true;
   foreach (const FieldData& field, fields_) {
     InitFieldValue(field, sel);
   }
   ignore_edits_ = false;
+
+  // If we're editing multiple songs then we have to disable certain tabs
+  const bool multiple = sel.count() > 1;
+  ui_->tab_widget->setTabEnabled(ui_->tab_widget->indexOf(ui_->summary_tab), !multiple);
+  ui_->tab_widget->setTabEnabled(ui_->tab_widget->indexOf(ui_->statistics_tab), !multiple);
+
+  if (!multiple) {
+    const Song& song = data_[sel.first().row()].original_;
+    UpdateSummaryTab(song);
+    UpdateStatisticsTab(song);
+  }
+}
+
+static void SetText(QLabel* label, int value, const QString& suffix, const QString& def = QString()) {
+  label->setText(value <= 0 ? def : (QString::number(value) + " " + suffix));
+}
+
+void EditTagDialog::UpdateSummaryTab(const Song& song) {
+  cover_art_id_ = cover_loader_->Worker()->LoadImageAsync(song);
+
+  QString summary = "<b>" + Qt::escape(song.PrettyTitleWithArtist()) + "</b><br/>";
+
+  if (song.art_manual() == AlbumCoverLoader::kManuallyUnsetCover) {
+    summary += Qt::escape(tr("Cover art manually unset"));
+  } else if (!song.art_manual().isEmpty()) {
+    summary += Qt::escape(tr("Cover art set from %1").arg(song.art_manual()));
+  } else if (song.art_automatic() == AlbumCoverLoader::kEmbeddedCover) {
+    summary += Qt::escape(tr("Cover art from embedded image"));
+  } else if (!song.art_automatic().isEmpty()) {
+    summary += Qt::escape(tr("Cover art loaded automatically from %1").arg(song.art_manual()));
+  } else {
+    summary += Qt::escape(tr("Cover art not set"));
+  }
+
+  ui_->summary->setText(summary);
+
+  ui_->length->setText(Utilities::PrettyTime(song.length()));
+  SetText(ui_->bpm, song.bpm(), tr("bpm"));
+  SetText(ui_->samplerate, song.samplerate(), "Hz");
+  SetText(ui_->bitrate, song.bitrate(), tr("kbps"));
+  ui_->mtime->setText(QDateTime::fromTime_t(song.mtime()).toString(
+        QLocale::system().dateTimeFormat(QLocale::LongFormat)));
+  ui_->ctime->setText(QDateTime::fromTime_t(song.ctime()).toString(
+        QLocale::system().dateTimeFormat(QLocale::LongFormat)));
+  ui_->filesize->setText(Utilities::PrettySize(song.filesize()));
+}
+
+void EditTagDialog::UpdateStatisticsTab(const Song& song) {
+  ui_->playcount->setText(QString::number(qMax(0, song.playcount())));
+  ui_->skipcount->setText(QString::number(qMax(0, song.skipcount())));
+  ui_->score->setText(QString::number(qMax(0, song.score())));
+  ui_->rating->set_rating(song.rating());
+
+  ui_->lastplayed->setText(song.lastplayed() <= 0 ? tr("Never") :
+      QDateTime::fromTime_t(song.lastplayed()).toString(
+          QLocale::system().dateTimeFormat(QLocale::LongFormat)));
+}
+
+void EditTagDialog::ArtLoaded(quint64 id, const QImage& image) {
+  if (id == cover_art_id_) {
+    ui_->art->setPixmap(QPixmap::fromImage(image));
+  }
 }
 
 void EditTagDialog::FieldValueEdited() {
diff --git a/src/ui/edittagdialog.h b/src/ui/edittagdialog.h
index 66db3183e..26acad912 100644
--- a/src/ui/edittagdialog.h
+++ b/src/ui/edittagdialog.h
@@ -19,16 +19,18 @@
 #define EDITTAGDIALOG_H
 
 #include <QDialog>
-#include <QLabel>
 #include <QModelIndexList>
 
+#include "core/backgroundthread.h"
 #include "core/song.h"
 #include "widgets/lineedit.h"
 
+class AlbumCoverLoader;
 class LibraryBackend;
 class Ui_EditTagDialog;
 
 class QItemSelection;
+class QLabel;
 
 class EditTagDialog : public QDialog {
   Q_OBJECT
@@ -47,6 +49,8 @@ private slots:
   void FieldValueEdited();
   void ResetField();
 
+  void ArtLoaded(quint64 id, const QImage& image);
+
 private:
   struct Data {
     Data(const Song& song = Song()) : original_(song), current_(song) {}
@@ -78,9 +82,15 @@ private:
   void UpdateFieldValue(const FieldData& field, const QModelIndexList& sel);
   void ResetFieldValue(const FieldData& field, const QModelIndexList& sel);
 
+  void UpdateSummaryTab(const Song& song);
+  void UpdateStatisticsTab(const Song& song);
+
 private:
   Ui_EditTagDialog* ui_;
 
+  BackgroundThread<AlbumCoverLoader>* cover_loader_;
+  quint64 cover_art_id_;
+
   QList<Data> data_;
   QList<FieldData> fields_;
 
diff --git a/src/ui/edittagdialog.ui b/src/ui/edittagdialog.ui
index ca0ecd5b8..4971fdec4 100644
--- a/src/ui/edittagdialog.ui
+++ b/src/ui/edittagdialog.ui
@@ -28,72 +28,73 @@
        <enum>QAbstractItemView::ExtendedSelection</enum>
       </property>
      </widget>
-     <widget class="QTabWidget" name="tabWidget">
+     <widget class="QTabWidget" name="tab_widget">
       <property name="currentIndex">
-       <number>1</number>
+       <number>0</number>
       </property>
-      <widget class="QWidget" name="tab">
+      <widget class="QWidget" name="summary_tab">
        <attribute name="title">
         <string>Summary</string>
        </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
+       <layout class="QVBoxLayout" name="verticalLayout">
         <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
            <widget class="QLabel" name="art">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="minimumSize">
              <size>
-              <width>120</width>
-              <height>120</height>
+              <width>124</width>
+              <height>124</height>
              </size>
             </property>
-            <property name="maximumSize">
-             <size>
-              <width>120</width>
-              <height>120</height>
-             </size>
+            <property name="frameShape">
+             <enum>QFrame::StyledPanel</enum>
             </property>
             <property name="text">
              <string/>
             </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+            <property name="margin">
+             <number>2</number>
+            </property>
            </widget>
           </item>
           <item>
-           <layout class="QVBoxLayout" name="verticalLayout">
+           <layout class="QVBoxLayout" name="verticalLayout_2">
+            <property name="spacing">
+             <number>2</number>
+            </property>
             <item>
              <widget class="QLabel" name="summary">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <property name="text">
                <string/>
               </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="verticalSpacer">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
+              <property name="alignment">
+               <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
               </property>
-              <property name="sizeType">
-               <enum>QSizePolicy::Preferred</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>18</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-            <item>
-             <widget class="QLabel" name="summary_art">
-              <property name="text">
-               <string/>
+              <property name="wordWrap">
+               <bool>true</bool>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QToolButton" name="summary_art_button">
               <property name="text">
-               <string>Change album cover</string>
+               <string>Change cover art</string>
               </property>
               <property name="popupMode">
                <enum>QToolButton::InstantPopup</enum>
@@ -113,6 +114,9 @@
         </item>
         <item>
          <layout class="QFormLayout" name="formLayout">
+          <property name="horizontalSpacing">
+           <number>18</number>
+          </property>
           <item row="0" column="0">
            <widget class="QLabel" name="label_5">
             <property name="text">
@@ -122,6 +126,9 @@
           </item>
           <item row="0" column="1">
            <widget class="QLabel" name="length">
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
             <property name="textInteractionFlags">
              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
             </property>
@@ -136,6 +143,9 @@
           </item>
           <item row="1" column="1">
            <widget class="QLabel" name="bpm">
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
             <property name="textInteractionFlags">
              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
             </property>
@@ -150,6 +160,9 @@
           </item>
           <item row="2" column="1">
            <widget class="QLabel" name="bitrate">
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
             <property name="textInteractionFlags">
              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
             </property>
@@ -164,48 +177,60 @@
           </item>
           <item row="3" column="1">
            <widget class="QLabel" name="samplerate">
-            <property name="textInteractionFlags">
-             <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+            <property name="wordWrap">
+             <bool>true</bool>
             </property>
-           </widget>
-          </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="label_8">
-            <property name="text">
-             <string>Date modified</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1">
-           <widget class="QLabel" name="mtime">
             <property name="textInteractionFlags">
              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
             </property>
            </widget>
           </item>
           <item row="5" column="0">
-           <widget class="QLabel" name="label_9">
+           <widget class="QLabel" name="label_8">
             <property name="text">
-             <string>Date created</string>
+             <string>Date modified</string>
             </property>
            </widget>
           </item>
           <item row="5" column="1">
-           <widget class="QLabel" name="ctime">
+           <widget class="QLabel" name="mtime">
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
             <property name="textInteractionFlags">
              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
             </property>
            </widget>
           </item>
           <item row="6" column="0">
+           <widget class="QLabel" name="label_9">
+            <property name="text">
+             <string>Date created</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QLabel" name="ctime">
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+            <property name="textInteractionFlags">
+             <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
            <widget class="QLabel" name="label_10">
             <property name="text">
              <string>File size</string>
             </property>
            </widget>
           </item>
-          <item row="6" column="1">
+          <item row="4" column="1">
            <widget class="QLabel" name="filesize">
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
             <property name="textInteractionFlags">
              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
             </property>
@@ -228,7 +253,7 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="tab_2">
+      <widget class="QWidget" name="tags_tab">
        <attribute name="title">
         <string>Edit tags</string>
        </attribute>
@@ -444,13 +469,16 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="tab_3">
+      <widget class="QWidget" name="statistics_tab">
        <attribute name="title">
         <string>Statistics</string>
        </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout_5">
+       <layout class="QVBoxLayout" name="verticalLayout_4">
         <item>
-         <layout class="QFormLayout" name="formLayout_2">
+         <layout class="QGridLayout" name="gridLayout_2">
+          <property name="horizontalSpacing">
+           <number>18</number>
+          </property>
           <item row="0" column="0">
            <widget class="QLabel" name="label_18">
             <property name="text">
@@ -460,6 +488,9 @@
           </item>
           <item row="0" column="1">
            <widget class="QLabel" name="playcount">
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
             <property name="textInteractionFlags">
              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
             </property>
@@ -474,6 +505,9 @@
           </item>
           <item row="1" column="1">
            <widget class="QLabel" name="skipcount">
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
             <property name="textInteractionFlags">
              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
             </property>
@@ -488,35 +522,58 @@
           </item>
           <item row="2" column="1">
            <widget class="QLabel" name="lastplayed">
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
             <property name="textInteractionFlags">
              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
             </property>
            </widget>
           </item>
           <item row="3" column="0">
-           <widget class="QLabel" name="label_21">
-            <property name="text">
-             <string>Rating</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="RatingWidget" name="widget" native="true"/>
-          </item>
-          <item row="4" column="0">
            <widget class="QLabel" name="label_22">
             <property name="text">
              <string>Score</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
+          <item row="3" column="1">
            <widget class="QLabel" name="score">
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
             <property name="textInteractionFlags">
              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
             </property>
            </widget>
           </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="label_21">
+            <property name="text">
+             <string>Rating</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="RatingWidget" name="rating" native="true"/>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
          </layout>
         </item>
         <item>
diff --git a/src/widgets/ratingwidget.cpp b/src/widgets/ratingwidget.cpp
index 889735272..dc30a4276 100644
--- a/src/widgets/ratingwidget.cpp
+++ b/src/widgets/ratingwidget.cpp
@@ -96,13 +96,14 @@ RatingWidget::RatingWidget(QWidget* parent)
     rating_(0.0),
     hover_rating_(-1.0)
 {
-  setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
+  setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
   setMouseTracking(true);
 }
 
 QSize RatingWidget::sizeHint() const {
-  return QSize(RatingPainter::kStarSize * RatingPainter::kStarCount,
-               RatingPainter::kStarSize);
+  const int frame_width = 1 + style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
+  return QSize(RatingPainter::kStarSize * (RatingPainter::kStarCount+2) + frame_width*2,
+               RatingPainter::kStarSize + frame_width*2);
 }
 
 void RatingWidget::set_rating(float rating) {