diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties
index 9ed925a1..ba8a6b18 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties
@@ -58,7 +58,7 @@ top.help=\u041E\u0442\u043D\u043E\u0441\u043D\u043E
 top.search=\u0422\u044A\u0440\u0441\u0435\u043D\u0435
 top.upgrade=\u041D\u0430\u043B\u0438\u0447\u043D\u0430 \u0435 \u043D\u043E\u0432\u0430 \u0432\u0435\u0440\u0441\u0438\u044F. \u0421\u0432\u0430\u043B\u0438 {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/'')">\u0442\u0443\u043A</a>.
 top.missing=\u041D\u044F\u043C\u0430 \u043D\u0430\u043B\u0438\u0447\u043D\u0438 \u043F\u0430\u043F\u043A\u0438 \u0441 \u043C\u0443\u0437\u0438\u043A\u0430. \u041C\u043E\u043B\u044F \u043F\u0440\u043E\u043C\u0435\u043D\u0435\u0442\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438\u0442\u0435.
-top.logout=\u0418\u0437\u043B\u0435\u0437 {0}
+top.logout=\u0418\u0437\u043B\u0435\u0437
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;\u0438\u0437\u043F\u044A\u043B\u043D\u0438\u0442\u0435\u043B\u0438<br>{1}&nbsp;\u0430\u043B\u0431\u0443\u043C\u0438<br>{2}&nbsp;\u043F\u0435\u0441\u043D\u0438<br>{3} (&#126; {4} \u0447\u0430\u0441\u0430)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties
index 945e9a8c..2e576b56 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties
@@ -58,7 +58,7 @@ top.help=Ajuda
 top.search=Buscar
 top.upgrade=Una nova versi\u00F3 est\u00E0 disponible. Descarregar {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')">aqu\u00ED</a>.
 top.missing=No s'ha trobat cap directori. Si us plau, canvi\u00EF la configuraci\u00F3.
-top.logout=Desconnectar {0}
+top.logout=Desconnectar
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artistes<br>{1}&nbsp;\u00E0lbums<br>{2}&nbsp;can\u00E7ons<br>{3}<br>{4}&nbsp;hores
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties
index 6de9f347..ad67ad9e 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties
@@ -58,7 +58,7 @@ top.help=N\u00E1pov\u011Bda
 top.search=Hledat
 top.upgrade=Je dostupn\u00E1 nov\u00E1 verze. St\u00E1hnout {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/'')">zde</a>.
 top.missing=Nebyly nalezeny \u017E\u00E1dn\u00E9 slo\u017Eky m\u00E9di\u00ED. Zm\u011B\u0148te nastaven\u00ED.
-top.logout=Odhl\u00E1sit u\u017Eivatele {0}
+top.logout=Odhl\u00E1sit u\u017Eivatele
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;interpret\u016F<br>{1}&nbsp;alb<br>{2}&nbsp;skladeb<br>{3}<br>{4}&nbsp; hodin
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties
index 52c45cfb..79eb0bba 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties
@@ -58,7 +58,7 @@ top.help=Hj\u00E6lp
 top.search=S\u00F8g
 top.upgrade=En ny version er tilg\u00E6ngelig. Download {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')"> her</a>.
 top.missing=Ingen medie mapper fundet. Skal du \u00E6ndre indstillingerne.
-top.logout=Log ud {0}
+top.logout=Log ud
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artister<br>{1}&nbsp;albums<br>{2}&nbsp;sange<br>{3} (&#126; {4} timer)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties
index d453886d..c4862350 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties
@@ -58,7 +58,7 @@ top.help=Hilfe
 top.search=Suchen
 top.upgrade=Eine neue Version ist erh\u00E4ltlich. Download {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/download/'')">hier</a>.
 top.missing=Keine Musikordner gefunden. Bitte die Einstellungen \u00FCberpr\u00FCfen.
-top.logout=Ausloggen {0}
+top.logout=Ausloggen
 
 left.scanning=Durchsuche Medien Ordner
 left.statistics={0}&nbsp;K\u00FCnstler<br>{1}&nbsp;Alben<br>{2}&nbsp;Songs<br>{3} (&#126; {4} Stunden)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties
index 9ff93f87..c8098ec0 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties
@@ -58,7 +58,7 @@ top.help=\u03A0\u03B5\u03C1\u03AF
 top.search=\u0391\u03BD\u03B1\u03B6\u03AE\u03C4\u03B7\u03C3\u03B7
 top.upgrade=\u039C\u03AF\u03B1 \u03BA\u03B1\u03B9\u03BD\u03BF\u03CD\u03C1\u03B9\u03B1 \u03AD\u03BA\u03B4\u03BF\u03C3\u03B7 \u03B5\u03AF\u03BD\u03B1\u03B9 \u03B4\u03B9\u03B1\u03B8\u03AD\u03C3\u03B9\u03BC\u03B7. Download {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')">\u03B5\u03B4\u03CE</a>.
 top.missing=\u0394\u03B5\u03BD \u03B2\u03C1\u03AD\u03B8\u03B7\u03BA\u03B1\u03BD \u03C6\u03AC\u03BA\u03B5\u03BB\u03BF\u03B9 \u03BC\u03B5 \u03BC\u03BF\u03C5\u03C3\u03B9\u03BA\u03AC \u03B1\u03C1\u03C7\u03B5\u03AF\u03B1. \u03A0\u03B1\u03C1\u03B1\u03BA\u03B1\u03BB\u03CE \u03B1\u03BB\u03BB\u03AC\u03BE\u03C4\u03B5 \u03C4\u03B9\u03C2 \u03C1\u03C5\u03B8\u03BC\u03AF\u03C3\u03B5\u03B9\u03C2 \u03C3\u03B1\u03C2.
-top.logout=\u0391\u03C0\u03BF\u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7 {0}
+top.logout=\u0391\u03C0\u03BF\u03C3\u03CD\u03BD\u03B4\u03B5\u03C3\u03B7
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp; \u039A\u03B1\u03BB\u03BB\u03B9\u03C4\u03AD\u03C7\u03BD\u03B5\u03C2 <br>{1}&nbsp; \u03A3\u03C5\u03BB\u03BB\u03BF\u03B3\u03AD\u03C2 <br>{2}&nbsp; \u03A4\u03C1\u03B1\u03B3\u03BF\u03CD\u03B4\u03B9\u03B1 <br>{3} (&#126; {4} \u03CE\u03C1\u03B5\u03C2)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties
index c358059d..4cc325d4 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties
@@ -58,7 +58,7 @@ top.help=About
 top.search=Search
 top.upgrade=New version available. Download {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/download/'')">here</a>.
 top.missing=No media folders found. Please change the settings.
-top.logout=Log out {0}
+top.logout=Log out
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artists<br>{1}&nbsp;albums<br>{2}&nbsp;songs<br>{3}<br>{4}&nbsp;hours
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties
index 521de069..9dbc97fc 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties
@@ -58,7 +58,7 @@ top.help=About
 top.search=Search
 top.upgrade=New version available. Download {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/download/'')">here</a>.
 top.missing=No media folders found. Please change the settings.
-top.logout=Log out {0}
+top.logout=Log out
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artists<br>{1}&nbsp;albums<br>{2}&nbsp;songs<br>{3}<br>{4}&nbsp;hours
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties
index 329c2af1..5ec0e53d 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties
@@ -58,7 +58,7 @@ top.help=Ayuda
 top.search=Buscar
 top.upgrade=Una nueva versi&oacute;n est&aacute; disponible. Descargar {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/'')">aqu&iacute;</a>.
 top.missing=No se encuentra ninguna carpeta de medios. Por favor, cambie la configuraci&oacute;n.
-top.logout=Desconectar {0}
+top.logout=Desconectar
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artistas<br>{1}&nbsp;albumes<br>{2}&nbsp;canciones<br>{3} (&#126; {4} horas)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties
index e1a1c01b..9d22ef66 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties
@@ -58,7 +58,7 @@ top.help=Info
 top.search=Otsi
 top.upgrade=Uuem versioon on saadaval. Lae alla {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')">siit</a>.
 top.missing=Meediakauste ei leitud. Palun muuda seadeid.
-top.logout=Logi v\u00e4lja {0}
+top.logout=Logi v\u00e4lja
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;esitajat<br>{1}&nbsp;albumit<br>{2}&nbsp;lugu<br>{3}<br>{4}&nbsp;tundi
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties
index 43265ad3..a9da09e1 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties
@@ -58,7 +58,7 @@ top.help=Tuki
 top.search=Etsi
 top.upgrade=Uusi ohjelmaversio on saatavilla. Lataa {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')">t\u00E4st\u00E4</a>.
 top.missing=Musiikkikansioita ei l\u00F6ydy. Tarkista asetukset.
-top.logout=Kirjaa ulos {0}
+top.logout=Kirjaa ulos
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artistia<br>{1}&nbsp;albumia<br>{2}&nbsp;kappaletta<br>{3} (&#126; {4} tuntia)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties
index c0bc1042..d894311a 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties
@@ -58,7 +58,7 @@ top.help=Hj\u00E1lp
 top.search=Leita
 top.upgrade=N\u00FDrri \u00DAtg\u00E1fa er tilb\u00FAin. S\u00E6kja {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')">H\u00E9r</a>.
 top.missing=Engar T\u00F3nlistarskr\u00E1r Fundust. Vinsamlegast Breyttu Stillingunum.
-top.logout=\u00DAtskr\u00E1 {0}
+top.logout=\u00DAtskr\u00E1
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artists<br>{1}&nbsp;albums<br>{2}&nbsp;songs<br>{3} (&#126; {4} hours)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties
index 7241aa6a..d0b207c0 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties
@@ -58,7 +58,7 @@ top.help=Riguardo a
 top.search=Cerca
 top.upgrade=E' disponibile una nuova versione. Puoi scaricarla {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/'')">qui</a>.
 top.missing=Non \u00E8 stata trovata nessuna cartella media. Per favore verifica le impostazioni.
-top.logout=Esci {0}
+top.logout=Esci
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artisti<br>{1}&nbsp;album<br>{2}&nbsp;canzoni<br>{3}<br>{4}&nbsp;ore
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties
index c2f27b1a..161540a1 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties
@@ -58,7 +58,7 @@ top.help=\u30D8\u30EB\u30D7
 top.search=\u691C\u7D22
 top.upgrade=\u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u30EA\u30EA\u30FC\u30B9\u3055\u308C\u3066\u3044\u307E\u3059\u3002{0} {1} \u3092<a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')">\u3053\u3053</a>\u304B\u3089\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 top.missing=\u97F3\u697D\u30D5\u30A9\u30EB\u30C0\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u8A2D\u5B9A\u3092\u898B\u76F4\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-top.logout={0} \u3092\u30ED\u30B0\u30A2\u30A6\u30C8\u3059\u308B
+top.logout=\u3092\u30ED\u30B0\u30A2\u30A6\u30C8\u3059\u308B
 
 left.scanning=Scanning media folders\u2026
 left.statistics=\u30A2\u30FC\u30C6\u30A3\u30B9\u30C8\u6570&nbsp;{0}<br>\u30A2\u30EB\u30D0\u30E0\u6570&nbsp;{1}<br>\u66F2\u76EE\u6570&nbsp;{2}<br>{3} (&#126; {4} \u6642\u9593)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties
index 492c3adf..84b93db9 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties
@@ -58,7 +58,7 @@ top.help=About
 top.search=\uAC80\uC0C9
 top.upgrade=<b>\uC54C\uB9BC!</b> \uC0C8\uB85C\uC6B4 \uBC84\uC804\uC744 \uC0AC\uC6A9\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.<br>\uB2E4\uC6B4\uB85C\uB4DC {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/'')">\uC5EC\uAE30</a>.
 top.missing=\uC9C0\uC815\uB41C \uC74C\uC545 \uC800\uC7A5\uC18C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. \uC124\uC815\uC744 \uD655\uC778\uD574\uC8FC\uC138\uC694.
-top.logout={0} \uB85C\uADF8\uC544\uC6C3
+top.logout=\uB85C\uADF8\uC544\uC6C3
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;\uC544\uD2F0\uC2A4\uD2B8<br>{1}&nbsp;\uC568\uBC94<br>{2}&nbsp;\uB178\uB798<br>{3}<br>{4}&nbsp;\uC2DC\uAC04
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties
index 9a3e1a5e..d32b8a5b 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties
@@ -58,7 +58,7 @@ top.help=\u041F\u043E\u043C\u043E\u0448
 top.search=\u0411\u0430\u0440\u0430\u0458
 top.upgrade=\u041D\u043E\u0432\u0430 \u0432\u0435\u0440\u0437\u0438\u0458\u0430 \u0435 \u0434\u043E\u0441\u0442\u0430\u043F\u043D\u0430. \u0421\u0438\u043C\u043D\u0438 \u0433\u043E {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')">here</a>.
 top.missing=\u041D\u0435 \u0435 \u043F\u0440\u043E\u043D\u0430\u0458\u0434\u0435\u043D \u0444\u043E\u043B\u0434\u0435\u0440 \u0441\u043E \u043C\u0443\u0437\u0438\u043A\u0430. \u0412\u0435 \u043C\u043E\u043B\u0438\u043C\u0435 \u043F\u0440\u043E\u043C\u0435\u043D\u0435\u0442\u0435 \u0433\u0438 \u043F\u043E\u0434\u0435\u0441\u0443\u0432\u0430\u045A\u0430\u0442\u0430.
-top.logout=Log out {0}
+top.logout=Log out
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;\u0430\u0440\u0442\u0438\u0441\u0442\u0438<br>{1}&nbsp;\u0430\u043B\u0431\u0443\u043C\u0438<br>{2}&nbsp;\u043F\u0435\u0441\u043D\u0438<br>\u0412\u043A\u0443\u043F\u043D\u043E {3} (&#126; {4} \u0441\u0430\u0430\u0442\u0438)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties
index d890af9a..bb924df7 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties
@@ -58,7 +58,7 @@ top.help=Over
 top.search=Zoeken
 top.upgrade=Er is een nieuwe versie beschikbaar. Download {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/download/'')">hier</a>.
 top.missing=Geen mediamappen aangetroffen; wijzig de instellingen.
-top.logout={0} uitloggen
+top.logout=Uitloggen
 
 left.scanning=Bezig met scannen van mediamappen\u2026
 left.statistics={0}&nbsp;artiesten<br>{1}&nbsp;albums<br>{2}&nbsp;nummers<br>{3}<br>{4}&nbsp;uur
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties
index 2dbfda47..06c745f2 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties
@@ -58,7 +58,7 @@ top.help=Om
 top.search=S\u00F8k
 top.upgrade=Det finst ei oppdatert utg\u00E5ve. Last ned {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')">her</a>.
 top.missing=Fann ingen musikk-mapper. Endra innstillingane.
-top.logout=Logg ut {0}
+top.logout=Logg ut
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artistar<br>{1}&nbsp;album<br>{2}&nbsp;songar<br>{3} (&#126; {4} timar)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties
index d82f277a..2af7100a 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties
@@ -58,7 +58,7 @@ top.help=Om
 top.search=S\u00F8k
 top.upgrade=Det finnes en oppdatert versjon. Last ned {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')">her</a>.
 top.missing=Fant ingen musikk-mapper. Endre innstillingene.
-top.logout=Logg ut {0}
+top.logout=Logg ut
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artister<br>{1}&nbsp;album<br>{2}&nbsp;sanger<br>{3} (&#126; {4} timer)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties
index 85df3fd6..0597915e 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties
@@ -58,7 +58,7 @@ top.help=Pomoc
 top.search=Szukaj
 top.upgrade=Dost\u0119pna jest nowa wersja. Pobierz {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')">tutaj</a>.
 top.missing=Brak folder\u00F3w medi\u00F3w. Prosz\u0119 zmieni\u0107 ustawienia.
-top.logout=Wyloguj {0}
+top.logout=Wyloguj
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;wykonawc\u00F3w<br>{1}&nbsp;album\u00F3w<br>{2}&nbsp;utwor\u00F3w<br>{3} (&#126; {4} godzin)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties
index 93f9ae58..4b122c3f 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties
@@ -58,7 +58,7 @@ top.help=Acerca
 top.search=Pesquisar
 top.upgrade=Uma nova vers\u00E3o est\u00E1 dispon\u00EDvel. Descarregar {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')">aqui</a>.
 top.missing=N\u00E3o se encontra nenhuma pasta. Por favor mude as configura\u00E7\u00F5es.
-top.logout=Terminar sess\u00E3o {0}
+top.logout=Terminar sess\u00E3o
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;Artistas<br>{1}&nbsp;Albuns<br>{2}&nbsp;M\u00FAsicas<br>{3} (&#126; {4} horas)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_BR.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_BR.properties
index c3b369db..669645fe 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_BR.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_BR.properties
@@ -58,7 +58,7 @@ top.help=About
 top.search=Search
 top.upgrade=New version available. Download {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/download/'')">here</a>.
 top.missing=No media folders found. Please change the settings.
-top.logout=Log out {0}
+top.logout=Log out
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artists<br>{1}&nbsp;albums<br>{2}&nbsp;songs<br>{3}<br>{4}&nbsp;hours
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_PT.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_PT.properties
index c3b369db..669645fe 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_PT.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt_PT.properties
@@ -58,7 +58,7 @@ top.help=About
 top.search=Search
 top.upgrade=New version available. Download {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/download/'')">here</a>.
 top.missing=No media folders found. Please change the settings.
-top.logout=Log out {0}
+top.logout=Log out
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artists<br>{1}&nbsp;albums<br>{2}&nbsp;songs<br>{3}<br>{4}&nbsp;hours
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties
index 817928f2..11a91805 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties
@@ -58,7 +58,7 @@ top.help=\u041E \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0435
 top.search=\u041F\u043E\u0438\u0441\u043A
 top.upgrade=\u041D\u043E\u0432\u0430\u044F \u0432\u0435\u0440\u0441\u0438\u044F \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0430 \u0421\u043A\u0430\u0447\u0430\u0442\u044C {0} {1} \n<a href="#" onclick="window.open(''https://airsonic.github.io/download/'')">\u0442\u0443\u0442</a>.
 top.missing=\u041D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u043E \u043F\u0430\u043F\u043E\u043A \u0441 \u043C\u0443\u043B\u044C\u0442\u0438\u043C\u0435\u0434\u0438\u0430. \u041F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438.
-top.logout=\u0412\u044B\u0439\u0442\u0438 {0}
+top.logout=\u0412\u044B\u0439\u0442\u0438
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;\u0410\u0440\u0442\u0438\u0441\u0442\u043E\u0432<br>{1}&nbsp;\u0410\u043B\u044C\u0431\u043E\u043C\u043E\u0432<br>{2}&nbsp;\u041F\u0435\u0441\u0435\u043D<br>{3} (&#126; {4} \u0447\u0430\u0441\u043E\u0432)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties
index 85f65ba2..a15db32e 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties
@@ -58,7 +58,7 @@ top.help=O Airsonicu
 top.search=Iskanje
 top.upgrade=Na voljo je nova razli\u010Dica. Prenesite {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')">tukaj</a>.
 top.missing=Ne najdem imenikov z glasbo. Prosimo, popravite nastavitve.
-top.logout=Odjava: {0}
+top.logout=Odjava
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;izvajalcev<br>{1}&nbsp;albumov<br>{2}&nbsp;skladb<br>{3}<br>{4}&nbsp;ur
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties
index ccf849c8..9326873a 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties
@@ -58,7 +58,7 @@ top.help=Hj\u00E4lp
 top.search=S\u00F6k
 top.upgrade=En ny verson \u00E4r tillg\u00E4nglig. Ladda ner Airsonic {0} <a href\="\#" onclick\="window.open('''https://airsonic.github.io/''')">h\u00E4r</a>.
 top.missing=Ingen musikmapp \u00E4r funnen. V\u00E4nligen \u00E4ndra inst\u00E4llningar.
-top.logout=Logga ut {0}
+top.logout=Logga ut
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artister<br>{1}&nbsp;album<br>{2}&nbsp;melodier<br>{3} (&#126; {4} timmar)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_uk.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_uk.properties
index 3c86e053..32b4f8c1 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_uk.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_uk.properties
@@ -58,7 +58,7 @@ top.help=Про
 top.search=Пошук
 top.upgrade=New version available. Download {0} {1} <a href="#" onclick="window.open(''https://airsonic.github.io/download/'')">here</a>.
 top.missing=No media folders found. Please change the settings.
-top.logout=Log out {0}
+top.logout=Log out
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;artists<br>{1}&nbsp;albums<br>{2}&nbsp;songs<br>{3}<br>{4}&nbsp;hours
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties
index 1834dd1c..c39a3ee1 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties
@@ -58,7 +58,7 @@ top.help=\u5173\u4E8E
 top.search=\u67E5\u627E
 top.upgrade=\u6709\u65B0\u7248\u672C\u63D0\u4F9B. \u4E0B\u8F7D {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')"></a>.
 top.missing=\u627E\u4E0D\u5230\u5A92\u4F53\u6587\u4EF6\u5939\uFF0C\u8BF7\u91CD\u65B0\u8BBE\u7F6E.
-top.logout=\u6CE8\u9500{0}
+top.logout=\u6CE8\u9500
 
 left.scanning=Scanning media folders\u2026
 left.statistics=\u603B\u8BA1\u6709 {0}&nbsp;\u4F4D\u827A\u672F\u5BB6<br>{1}&nbsp;\u5F20\u4E13\u8F91<br>{2}&nbsp;\u9996\u6B4C\u66F2<br>{3} (\u7EA6 {4} \u5C0F\u65F6)
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties
index 094a4b29..5c71da91 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties
@@ -58,7 +58,7 @@ top.help=\u95DC\u65BC
 top.search=\u641C\u5C0B
 top.upgrade=\u6709\u65B0\u7248\u672C\u63D0\u4F9B. \u4E0B\u8F09 {0} {1} <a href\="\#" onclick\="window.open(''https://airsonic.github.io/'')">\u9019\u88E1</a>\u3002
 top.missing=\u627E\u4E0D\u5230\u97F3\u6A02\u8CC7\u6599\u593E\uFF0C\u8ACB\u91CD\u65B0\u8A2D\u5B9A\u3002
-top.logout=\u767B\u51FA {0}
+top.logout=\u767B\u51FA
 
 left.scanning=Scanning media folders\u2026
 left.statistics={0}&nbsp;\u4F4D\u4F5C\u8005<br>{1}&nbsp;\u5F35\u5C08\u8F2F<br>{2}&nbsp;\u9996\u6B4C\u66F2<br>{3}<br>{4}&nbsp;\u5C0F\u6642
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties
index de14281c..358fdd50 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties
@@ -57,6 +57,7 @@ statusSmallImage = icons/default_dark/status_small.png
 undoImage = icons/default_dark/undo.svg
 upImage = icons/default_dark/up.png
 uploadImage = icons/default_dark/upload.png
+userImage = icons/default_dark/user.svg
 viewAsGridImage = icons/default_dark/view_as_grid.png
 viewAsListImage = icons/default_dark/view_as_list.png
 volumeImage = icons/default_dark/volume.png
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/theme/default_light.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/default_light.properties
index d42e4059..50a135a2 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/theme/default_light.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/theme/default_light.properties
@@ -57,6 +57,7 @@ statusSmallImage = icons/default_light/status.svg
 undoImage = icons/default_light/undo.svg
 upImage = icons/default_light/up.svg
 uploadImage = icons/default_light/upload.svg
+userImage = icons/default_light/user.svg
 viewAsGridImage = icons/default_light/view_as_grid.svg
 viewAsListImage = icons/default_light/view_as_list.svg
 volumeImage = icons/default_light/volume.svg
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp
index 36553d45..427f5960 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp
@@ -132,27 +132,33 @@
         </td>
 
         <td style="padding-left:15pt;padding-right:5pt;vertical-align: middle;width: 100%;text-align: center">
-            <a href="<c:url value="/logout"/>" target="_top">
-                <c:choose>
-                    <c:when test="${model.showAvatar}">
-                        <sub:url value="avatar.view" var="avatarUrl">
-                            <sub:param name="username" value="${model.user.username}"/>
-                        </sub:url>
-                        <div style="padding-bottom: 4px">
-                            <c:if test="${model.user.settingsRole}"><a href="personalSettings.view" target="main"></c:if>
-                            <img src="${avatarUrl}" alt="" width="30" height="30">
-                            <c:if test="${model.user.settingsRole}"></a></c:if>
-                        </div>
-                    </c:when>
-                    <c:otherwise>
-                        <img src="<spring:theme code="logoutImage"/>" alt="logout" height="24">
-                    </c:otherwise>
-                </c:choose>
+            <c:if test="${model.user.settingsRole}"><a href="personalSettings.view" target="main"></c:if>
+            <c:choose>
+                <c:when test="${model.showAvatar}">
+                    <sub:url value="avatar.view" var="avatarUrl">
+                        <sub:param name="username" value="${model.user.username}"/>
+                    </sub:url>
+                    <div style="padding-bottom: 4px">
+                        <img src="${avatarUrl}" alt="User" width="30" height="30">
+                    </div>
+                </c:when>
+                <c:otherwise>
+                    <img src="<spring:theme code="userImage"/>" alt="User" height="24">
+                </c:otherwise>
+            </c:choose>
+
+            <div class="detail">
+                <c:out value="${model.user.username}" escapeXml="true"/>
+            </div>
+            <c:if test="${model.user.settingsRole}"></a></c:if>
+        </td>
 
+        <td style="padding-left:15pt;padding-right:5pt;vertical-align: right;width: 100%;text-align: center">
+            <a href="<c:url value="/logout"/>" target="_top">
+                <img src="<spring:theme code="logoutImage"/>" alt="logout" height="24">
                 <div class="detail">
-                    <fmt:message key="top.logout" var="logout"><br/>
-                        <fmt:param value="${model.user.username}"/></fmt:message>
-                    ${fn:escapeXml(logout)}
+                    <fmt:message key="top.logout" var="logout"></fmt:message>
+                    <c:out value="${logout}"/>
                 </div>
             </a>
         </td>
diff --git a/airsonic-main/src/main/webapp/icons/default_dark/user.svg b/airsonic-main/src/main/webapp/icons/default_dark/user.svg
new file mode 100644
index 00000000..059a6d8d
--- /dev/null
+++ b/airsonic-main/src/main/webapp/icons/default_dark/user.svg
@@ -0,0 +1,14 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="#ffffff"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2" />
+  <circle cx="12" cy="7" r="4" />
+</svg>
diff --git a/airsonic-main/src/main/webapp/icons/default_light/user.svg b/airsonic-main/src/main/webapp/icons/default_light/user.svg
new file mode 100644
index 00000000..66932f56
--- /dev/null
+++ b/airsonic-main/src/main/webapp/icons/default_light/user.svg
@@ -0,0 +1,14 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="#696969"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2" />
+  <circle cx="12" cy="7" r="4" />
+</svg>