diff --git a/favicon.ico b/favicon.ico
deleted file mode 100644
index e69de29b..00000000
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 563dbea3..62113868 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1792,7 +1792,7 @@ $lng['panel']['listing_empty'] = 'Keine Einträge gefunden';
 $lng['admin']['configfiles']['finishnote'] = 'Parameter Datei erfolgreich erstellt. Folgende Befehle müssen als root ausgeführt werden:';
 $lng['admin']['configfiles']['description'] = 'System-Dienste konfigurieren';
 $lng['admin']['configfiles']['skipconfig'] = 'Nicht (erneut) konfigurieren';
-$lng['admin']['configfiles']['recommendednote'] = 'Empfohlene/benötigte Dienste ahand der aktuellen Systemeinstellungen';
+$lng['admin']['configfiles']['recommendednote'] = 'Empfohlene/benötigte Dienste anhand der aktuellen Systemeinstellungen';
 $lng['admin']['configfiles']['selectrecommended'] = 'Empfohlene wählen';
 $lng['update']['description'] = 'Aktualisierung der froxlor Datenbank';
 $lng['admin']['smtpsettings'] = 'SMTP Einstellungen';
diff --git a/templates/Froxlor/base.html.twig b/templates/Froxlor/base.html.twig
index 61019559..0422aa3a 100644
--- a/templates/Froxlor/base.html.twig
+++ b/templates/Froxlor/base.html.twig
@@ -6,6 +6,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 	<meta name="robots" content="noindex, nofollow, noarchive"/>
 	<meta name="googlebot" content="nosnippet"/>
+	<link rel="icon" type="image/x-icon" href="{{ basehref|default('') }}templates/Froxlor/assets/img/icon.png">
 
 	<!-- CSS -->
 	{% if theme_css is empty %}
diff --git a/templates/Froxlor/src/js/components/newsfeed.js b/templates/Froxlor/src/js/components/newsfeed.js
index f9c060c4..8e4fb8c2 100644
--- a/templates/Froxlor/src/js/components/newsfeed.js
+++ b/templates/Froxlor/src/js/components/newsfeed.js
@@ -17,7 +17,7 @@ $(document).ready(function () {
 			},
 			error: function (request, status, error) {
 				console.log(request, status, error)
-				$("#newsfeeditems").html('<div class="alert alert-warning" role="alert">Error loading newsfeed</div>');
+				$("#newsfeeditems").html('<div class="list-group-item text-center"><span class="badge bg-warning" role="alert">Error loading newsfeed</span></div>');
 			}
 		});
 	}
diff --git a/templates/Froxlor/src/js/components/updatecheck.js b/templates/Froxlor/src/js/components/updatecheck.js
index d21e9b4d..e5da6103 100644
--- a/templates/Froxlor/src/js/components/updatecheck.js
+++ b/templates/Froxlor/src/js/components/updatecheck.js
@@ -12,7 +12,7 @@ $(document).ready(function () {
 			error: function (request, status, error) {
 				console.log(request, status, error)
 				let message = 'Can\'t check version';
-				$("#updatecheck").html('<a class="nav-link disabled text-warning" data-bs-toggle="tooltip" data-bs-placement="left" title="' + message + '"><i class="fa fa-exclamation-triangle"></i> <span class="d-md-none d-xl-inline">' + message + '</span></a>');
+				$("#updatecheck").html('<span class="text-decoration-none badge bg-warning mt-2 me-2" data-bs-toggle="tooltip" data-bs-placement="left" title="' + message + '"><i class="fa fa-exclamation-triangle"></i> <span class="d-md-none d-xl-inline">' + message + '</span></span>');
 			}
 		});
 	}
diff --git a/templates/Froxlor/user/form-note.html.twig b/templates/Froxlor/user/form-note.html.twig
index 9941b731..16ab045c 100644
--- a/templates/Froxlor/user/form-note.html.twig
+++ b/templates/Froxlor/user/form-note.html.twig
@@ -2,7 +2,7 @@
 
 {% block content %}
 	{% if alert_msg is defined and alert_msg is not empty %}
-		<div class="row mb-2">
+		<div class="mb-4">
 			{% include 'Froxlor/misc/alertbox.html.twig' %}
 		</div>
 	{% endif %}