diff --git a/public/css/grocy_night_mode.css b/public/css/grocy_night_mode.css
index 819efd8a..b5bd8d58 100644
--- a/public/css/grocy_night_mode.css
+++ b/public/css/grocy_night_mode.css
@@ -7,6 +7,15 @@ body.night-mode {
 	filter: invert(0.9) hue-rotate(176deg);
 }
 
+.navbar-light .navbar-toggler {
+    color: rgba(255, 255, 255, .5);
+    border-color: rgba(255, 255, 255,.1);
+}
+
+.night-mode .navbar-light .navbar-toggler-icon {
+	background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.5%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
+}
+
 .night-mode .table-info,
 .night-mode .table-info > td,
 .night-mode .table-info > th,
@@ -42,16 +51,20 @@ body.night-mode {
 	border-color: #1ed1ee !important;
 }
 
+.night-mode .btn-outline-info:hover {
+	color: #e1e1e1 !important;
+}
+
 .night-mode .btn-info {
 	color: #c1c1c1;
-	background-color: #07373f;
-	border-color: #07373f;
+	background-color: #0c5f6e;
+	border-color: #0c5f6e;
 }
 
 .night-mode .btn-warning {
 	color: #c1c1c1;
-	background-color: #473604;
-	border-color: #473604;
+	background-color: #a9810a;
+	border-color: #a9810a;
 }
 
 .night-mode .btn-danger {
@@ -107,15 +120,15 @@ body.night-mode {
 }
 
 .night-mode .bg-warning {
-	background-color: #473604!important;
+	background-color: #473604 !important;
 }
 
 .night-mode .bg-info {
-	background-color: #07373f!important;
+	background-color: #07373f !important;
 }
 
 .night-mode .bg-danger {
-	background-color: #471116!important;
+	background-color: #471116 !important;
 }
 
 .night-mode .form-control:focus {
@@ -129,6 +142,16 @@ body.night-mode {
 	background-color: #333131;
 }
 
+.night-mode .custom-select {
+	color: #c1c1c1;
+	background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23c1c1c1' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right .75rem center/8px 10px;
+}
+
+.night-mode .custom-select:valid,
+.night-mode .custom-select:invalid {
+	background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3e%3cpath fill='%23c1c1c1' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right .75rem center/8px 10px;
+}
+
 .night-mode .dropdown-item:focus,
 .night-mode .dropdown-item:hover {
 	color: #16181b;
@@ -136,7 +159,7 @@ body.night-mode {
 }
 
 .night-mode .dropdown-item {
-	color: #7c7b6f;
+	color: #c1c1c1;
 	background-color: #333131;
 }
 
@@ -209,7 +232,7 @@ body.night-mode {
 .night-mode .navbar-sidenav > li:hover,
 .night-mode .sidenav-second-level > li:hover,
 .night-mode .navbar-nav .dropdown-item:hover {
-	box-shadow: inset 5px 0 0 #112a3f !important;
+	box-shadow: inset 5px 0 0 #92bee2 !important;
 	background-color: #383838 !important;
 	color: #c1c1c1 !important;
 }
@@ -217,7 +240,7 @@ body.night-mode {
 .night-mode .navbar-sidenav > li > a:focus,
 .night-mode .sidenav-second-level > li > a:focus,
 .night-mode .navbar-nav .dropdown-item:focus {
-	box-shadow: inset 5px 0 0 #350a0f !important;
+	box-shadow: inset 5px 0 0 #ff7585 !important;
 	background-color: #383838 !important;
 	color: #c1c1c1 !important;
 }
@@ -266,14 +289,32 @@ body.night-mode {
 	background-color: #4c4e50;
 }
 
+.night-mode .warning-message {
+	background-color: #7c5e10;
+	color: #d1d1d1;
+}
+
 .night-mode .secondary-message {
-	border-top-color: #4c4e50;
+	background-color: #4e575f;
+	color: #d1d1d1;
+}
+
+.night-mode .error-message {
+	background-color: #780a0a;
+	color: #d1d1d1;
 }
 
 .night-mode .normal-message {
-	border-top-color: #07373f;
+	background-color: #2d3a8c;
+	color: #d1d1d1;
 }
 
 .night-mode .text-muted {
 	color: #8f9ba5 !important;
 }
+
+.night-mode .qr-code {
+	background-color: #eee;
+	padding: min(1.5vw, 20px);
+	border-radius: 10px;
+}
diff --git a/public/js/extensions.js b/public/js/extensions.js
index e559f9c8..0900a786 100644
--- a/public/js/extensions.js
+++ b/public/js/extensions.js
@@ -202,6 +202,7 @@ function QrCodeImgHtml(text)
 		includetext: false
 	});
 	img.src = dummyCanvas.toDataURL("image/png");
+	img.classList.add("qr-code");
 
 	return img.outerHTML;
 }