diff --git a/templates/Froxlor/form/yesnoquestion.html.twig b/templates/Froxlor/form/yesnoquestion.html.twig
index aad3ba12..22036cec 100644
--- a/templates/Froxlor/form/yesnoquestion.html.twig
+++ b/templates/Froxlor/form/yesnoquestion.html.twig
@@ -17,8 +17,7 @@
 					<input type="hidden" name="delete_userfiles" value="0"/>
 				{% endif %}
 			{% endif %}
-			<hr>
-			<p class="mb-0">
+			<p>
 				<input type="hidden" name="send" value="send"/>
 				{% for id,field in url_params %}
 					<input type="hidden" name="{{ id }}" value="{{ field }}"/>
diff --git a/templates/Froxlor/misc/alertbox.html.twig b/templates/Froxlor/misc/alertbox.html.twig
index c435cd5c..4415484e 100644
--- a/templates/Froxlor/misc/alertbox.html.twig
+++ b/templates/Froxlor/misc/alertbox.html.twig
@@ -1,4 +1,4 @@
-<div class="alert alert-{{ type|default("info") }} fade show pb-1" role="alert">
+<div class="alert alert-{{ type|default("info") }} fade show" role="alert">
 	{% if heading is defined and heading is not empty %}
 		<h4 class="alert-heading">
 			{{ heading }}
@@ -14,7 +14,7 @@
 		</p>
 	{% endif %}
 	{% if redirect_link %}
-		<p class="mt-1 pb-3">
+		<p>
 			<a href="{{ redirect_link|raw }}" class="btn btn-{{ btntype }}">
 				{% if type == 'danger' %}
 					{{ lng('panel.back') }}
diff --git a/templates/Froxlor/src/scss/components/_alert.scss b/templates/Froxlor/src/scss/components/_alert.scss
new file mode 100644
index 00000000..2f6cd84a
--- /dev/null
+++ b/templates/Froxlor/src/scss/components/_alert.scss
@@ -0,0 +1,7 @@
+.alert {
+	@extend .shadow-sm;
+
+	p:last-of-type {
+		margin-bottom: 0;
+	}
+}
diff --git a/templates/Froxlor/src/scss/main.scss b/templates/Froxlor/src/scss/main.scss
index d5808a08..62352edf 100644
--- a/templates/Froxlor/src/scss/main.scss
+++ b/templates/Froxlor/src/scss/main.scss
@@ -7,6 +7,7 @@
 
 // Theme
 @import "global";
+@import "components/alert";
 @import "components/card";
 @import "components/dropdown";
 @import "components/footer";