diff --git a/admin_domains.php b/admin_domains.php
index c105e6c6..f9ab0249 100644
--- a/admin_domains.php
+++ b/admin_domains.php
@@ -73,7 +73,7 @@ if ($page == 'domains' || $page == 'overview') {
 				'href' => $linker->getLink(['section' => 'domains', 'page' => $page, 'action' => 'import']),
 				'label' => lng('domains.domain_import'),
 				'icon' => 'fa-solid fa-file-import',
-				'class' => 'btn-secondary'
+				'class' => 'btn-outline-secondary'
 			];
 		}
 
diff --git a/lib/formfields/admin/messages/formfield.messages_add.php b/lib/formfields/admin/messages/formfield.messages_add.php
index 228b9fd7..e3dbda35 100644
--- a/lib/formfields/admin/messages/formfield.messages_add.php
+++ b/lib/formfields/admin/messages/formfield.messages_add.php
@@ -49,6 +49,11 @@ return [
 					]
 				]
 			]
+		],
+		'buttons' => [
+			[
+				'label' => lng('admin.message')
+			]
 		]
 	]
 ];
diff --git a/lib/formfields/admin/settings/formfield.settings_import.php b/lib/formfields/admin/settings/formfield.settings_import.php
index ac8997d4..3a6938bc 100644
--- a/lib/formfields/admin/settings/formfield.settings_import.php
+++ b/lib/formfields/admin/settings/formfield.settings_import.php
@@ -31,7 +31,7 @@ return [
 			'section_a' => [
 				'fields' => [
 					'import_file' => [
-						'label' => 'Chose file for import',
+						'label' => lng('admin.settings_importfile'),
 						'type' => 'file',
 						'mandatory' => true
 					]
diff --git a/lib/formfields/admin/settings/formfield.settings_mailtest.php b/lib/formfields/admin/settings/formfield.settings_mailtest.php
index 15b9f9e0..9652f864 100644
--- a/lib/formfields/admin/settings/formfield.settings_mailtest.php
+++ b/lib/formfields/admin/settings/formfield.settings_mailtest.php
@@ -68,6 +68,11 @@ return [
 					]
 				]
 			]
+		],
+		'buttons' => [
+			[
+				'label' => lng('admin.smtptestsend')
+			]
 		]
 	]
 ];
diff --git a/lng/de.lng.php b/lng/de.lng.php
index ec4075ac..8cc4bafc 100644
--- a/lng/de.lng.php
+++ b/lng/de.lng.php
@@ -463,6 +463,7 @@ return [
 		'smtpsettings' => 'SMTP Einstellungen',
 		'smtptestaddr' => 'Test-Email senden an',
 		'smtptestnote' => 'Bitte beachten: Die untenstehenden Werte reflektieren die aktuellen Einstellungen und können auch nur dort angepasst werden (siehe Link in der oberen rechten Ecke)',
+		'smtptestsend' => 'Test-Email senden',
 		'mysqlserver' => [
 			'caption' => 'Beschreibung',
 			'user' => 'Privilegierter Benutzer',
@@ -479,6 +480,7 @@ return [
 			'ssl_cert_file' => 'Dateipfad zur SSL certificate authority',
 			'verify_ca' => 'Aktiviere SSL Zertifikats-Verifikation',
 		],
+		'settings_importfile' => 'Wähle Import-Datei',
 	],
 	'apikeys' => [
 		'no_api_keys' => 'Keine API Keys gefunden',
@@ -1198,6 +1200,10 @@ Vielen Dank, Ihr Administrator',
 		'mandatoryfield' => 'Pflichtfeld',
 		'select_all' => 'Alle auswählen',
 		'unselect_all' => 'Alle abwählen',
+		'searchtablecolumnsmodal' => [
+			'title' => 'Feld-Suche',
+			'description' => 'Wähle das zu durchsuchende Feld aus'
+		],
 	],
 	'phpfpm' => [
 		'vhost_httpuser' => 'Lokaler Benutzer für PHP-FPM (Froxlor-Vhost)',
diff --git a/lng/en.lng.php b/lng/en.lng.php
index 60810149..fcadc540 100644
--- a/lng/en.lng.php
+++ b/lng/en.lng.php
@@ -470,6 +470,7 @@ return [
 		'smtpsettings' => 'SMTP settings',
 		'smtptestaddr' => 'Send test-mail to',
 		'smtptestnote' => 'Note that the values below reflect your current settings and can only be adjusted there (see link in top right corner)',
+		'smtptestsend' => 'Send test-mail',
 		'mysqlserver' => [
 			'mysqlserver' => 'MySQL Server',
 			'dbserver' => 'Server #',
@@ -490,6 +491,7 @@ return [
 			'ssl_cert_file' => 'The file path to the SSL certificate authority',
 			'verify_ca' => 'Enable verification of the server SSL certificate',
 		],
+		'settings_importfile' => 'Chose import file',
 	],
 	'apcuinfo' => [
 		'clearcache' => 'Clear APCu cache',
@@ -1308,6 +1310,10 @@ Yours sincerely, your administrator',
 		'mandatoryfield' => 'Field is mandatory',
 		'select_all' => 'Select all',
 		'unselect_all' => 'Unselect all',
+		'searchtablecolumnsmodal' => [
+			'title' => 'Search in fields',
+			'description' => 'Select the field you want to search in'
+		],
 	],
 	'phpfpm' => [
 		'vhost_httpuser' => 'Local user to use for PHP-FPM (Froxlor vHost)',
diff --git a/templates/Froxlor/settings/apcuinfo.html.twig b/templates/Froxlor/settings/apcuinfo.html.twig
index be16cd14..93abf680 100644
--- a/templates/Froxlor/settings/apcuinfo.html.twig
+++ b/templates/Froxlor/settings/apcuinfo.html.twig
@@ -22,7 +22,7 @@
 					<h5 class="card-title">{{ lng('apcuinfo.memnote') }}</h5>
 					<div class="progress position-relative">
 						<div class="progress-bar bg-success" role="progressbar" style="width: {{ apcuinfo.mem_used_percentage }}%" aria-valuenow="{{ apcuinfo.mem_used }}" aria-valuemin="0" aria-valuemax="{{ apcuinfo.mem_avail }}"></div>
-						<small class="justify-content-center d-flex position-absolute w-100">{{ apcuinfo.mem_used_percentage }}%</small>
+						<small class="justify-content-center d-flex position-absolute w-100 text-dark">{{ apcuinfo.mem_used_percentage }}%</small>
 					</div>
 				</div>
 				<ul class="list-group list-group-flush">
@@ -48,7 +48,7 @@
 					<div class="progress position-relative">
 						<div class="progress-bar bg-success" role="progressbar" style="width: {{ apcuinfo.num_hits_percentage }}%" aria-valuenow="{{ apcuinfo.num_hits }}" aria-valuemin="0" aria-valuemax="{{ apcuinfo.num_hits_and_misses }}"></div>
 						<div class="progress-bar bg-danger" role="progressbar" style="width: {{ 100 - apcuinfo.num_misses_percentage }}%" aria-valuenow="{{ apcuinfo.num_misses }}" aria-valuemin="0" aria-valuemax="{{ apcuinfo.num_hits_and_misses }}"></div>
-						<small class="justify-content-center d-flex position-absolute w-100">{{ apcuinfo.num_hits_percentage }}%</small>
+						<small class="justify-content-center d-flex position-absolute w-100 text-dark">{{ apcuinfo.num_hits_percentage }}%</small>
 					</div>
 				</div>
 				<ul class="list-group list-group-flush">
@@ -98,7 +98,7 @@
 				{% if apcuinfo.fragmentation is iterable %}
 					<div class="progress position-relative">
 						<div class="progress-bar bg-success" role="progressbar" style="width: {{ apcuinfo.fragmentation.used_percentage }}%" aria-valuenow="{{ apcuinfo.fragmentation.used_bytes }}" aria-valuemin="0" aria-valuemax="{{ apcuinfo.fragmentation.total_bytes }}"></div>
-						<small class="justify-content-center d-flex position-absolute w-100">{{ apcuinfo.fragmentation.used_percentage }}%</small>
+						<small class="justify-content-center d-flex position-absolute w-100 text-dark">{{ apcuinfo.fragmentation.used_percentage }}%</small>
 					</div>
 					<ul class="list-group list-group-flush">
 						<li class="list-group-item d-flex justify-content-between align-items-center">
diff --git a/templates/Froxlor/settings/opcacheinfo.html.twig b/templates/Froxlor/settings/opcacheinfo.html.twig
index 04e65ea4..ae52bc52 100644
--- a/templates/Froxlor/settings/opcacheinfo.html.twig
+++ b/templates/Froxlor/settings/opcacheinfo.html.twig
@@ -22,7 +22,7 @@
 					<h5 class="card-title">{{ lng('opcacheinfo.memusage') }}</h5>
 					<div class="progress position-relative">
 						<div class="progress-bar bg-success" role="progressbar" style="width: {{ opcacheinfo.overview.used_memory_percentage }}%" aria-valuenow="{{ opcacheinfo.overview.used_memory }}" aria-valuemin="0" aria-valuemax="{{ opcacheinfo.overview.total_memory }}"></div>
-						<small class="justify-content-center d-flex position-absolute w-100">{{ opcacheinfo.overview.used_memory_percentage }}%</small>
+						<small class="justify-content-center d-flex position-absolute w-100 text-dark">{{ opcacheinfo.overview.used_memory_percentage }}%</small>
 					</div>
 				</div>
 				<ul class="list-group list-group-flush">
@@ -52,7 +52,7 @@
 					<div class="progress position-relative">
 						<div class="progress-bar bg-success" role="progressbar" style="width: {{ opcacheinfo.overview.hit_rate_percentage }}%" aria-valuenow="{{ opcacheinfo.overview.hits }}" aria-valuemin="0" aria-valuemax="{{ opcacheinfo.overview.hits + opcacheinfo.overview.misses }}"></div>
 						<div class="progress-bar bg-danger" role="progressbar" style="width: {{ 100 - opcacheinfo.overview.hit_rate_percentage }}%" aria-valuenow="{{ opcacheinfo.overview.misses }}" aria-valuemin="0" aria-valuemax="{{ opcacheinfo.overview.hits + opcacheinfo.overview.misses }}"></div>
-						<small class="justify-content-center d-flex position-absolute w-100">{{ opcacheinfo.overview.hit_rate_percentage }}%</small>
+						<small class="justify-content-center d-flex position-absolute w-100 text-dark">{{ opcacheinfo.overview.hit_rate_percentage }}%</small>
 					</div>
 				</div>
 				<ul class="list-group list-group-flush">
@@ -81,7 +81,7 @@
 					<h5 class="card-title">{{ lng('opcacheinfo.usedkey') }}</h5>
 					<div class="progress position-relative">
 						<div class="progress-bar bg-success" role="progressbar" style="width: {{ opcacheinfo.overview.used_key_percentage }}%" aria-valuenow="{{ opcacheinfo.overview.num_cached_keys }}" aria-valuemin="0" aria-valuemax="{{ opcacheinfo.overview.max_cached_keys }}"></div>
-						<small class="justify-content-center d-flex position-absolute w-100">{{ opcacheinfo.overview.used_key_percentage }}%</small>
+						<small class="justify-content-center d-flex position-absolute w-100 text-dark">{{ opcacheinfo.overview.used_key_percentage }}%</small>
 					</div>
 				</div>
 				<ul class="list-group list-group-flush">
diff --git a/templates/Froxlor/settings/phpinfo.html.twig b/templates/Froxlor/settings/phpinfo.html.twig
index 56801ba1..980afaca 100644
--- a/templates/Froxlor/settings/phpinfo.html.twig
+++ b/templates/Froxlor/settings/phpinfo.html.twig
@@ -9,7 +9,7 @@
 
 {% block content %}
 	<div class="card table-responsive">
-		<table class="table table-borderless table-striped align-middle mb-0 px-3">
+		<table class="table table-borderless table-striped align-middle mb-0 px-3" id="phpinfotable">
 			<tbody>
 				{% for name,section in phpinfo %}
 					{% if name|lower == 'phpinfo' %}
diff --git a/templates/Froxlor/sidebar.html.twig b/templates/Froxlor/sidebar.html.twig
index a6105bd4..255ebc9c 100644
--- a/templates/Froxlor/sidebar.html.twig
+++ b/templates/Froxlor/sidebar.html.twig
@@ -2,7 +2,7 @@
 	<ul class="nav d-flex flex-fill flex-column py-3">
 		{% for idx,mitems in nav_entries %}
 			{% if mitems.items is not empty %}
-				<li class="nav-item {% if mitems.active == 1 %}active{% endif %}" {% if mitems.active == 1 %}aria-current="page"{% endif %}>
+				<li class="nav-item" {% if mitems.active == 1 %}aria-current="page"{% endif %}>
 					<a class="nav-link text-light {% if mitems.active == 0 %}collapsed{% endif %}" href="#sub{{ idx }}" data-bs-toggle="collapse" data-bs-target="#sub{{ idx }}">
 						{% if mitems.icon is not empty %}
 							<i class="{{ mitems.icon }}"></i>
@@ -12,15 +12,15 @@
 					<div class="collapse {% if mitems.active == 1 %}show{% endif %}" id="sub{{ idx }}" aria-expanded="{% if mitems.active == 1 %}true{% else %}false{% endif %}">
 						<ul class="flex-column ps-3 nav">
 							{% for item in mitems.items %}
-								<li class="nav-item {% if item.active == 1 %}active{% endif %}" {% if item.active == 1 %}aria-current="page"{% endif %}>
-									<a class="nav-link text-light {% if item.active == 1 %}fw-bold{% endif %}" href="{{ item.url|raw }}">{{ item.label|raw }}</a>
+								<li class="nav-item" {% if item.active == 1 %}aria-current="page"{% endif %}>
+									<a class="nav-link text-light {% if item.active == 1 %}active fw-bold{% endif %}" href="{{ item.url|raw }}">{{ item.label|raw }}</a>
 								</li>
 							{% endfor %}
 						</ul>
 					</div>
 				</li>
 			{% else %}
-				<li class="nav-item {% if mitems.active == 1 %}active{% endif %}" {% if mitems.active == 1 %}aria-current="page"{% endif %}>
+				<li class="nav-item" {% if mitems.active == 1 %}aria-current="page"{% endif %}>
 					<a class="nav-link text-light {% if mitems.active == 1 %}active{% endif %}" href="{% if mitems.url is not empty %}{{ mitems.url|raw }}{% else %}#{% endif %}" {% if mitems.target is not empty %} target="{{ mitems.target }}" {% endif %}>
 						{% if mitems.icon is not empty %}
 							<i class="{{ mitems.icon }}"></i>
diff --git a/templates/Froxlor/src/scss/_global.scss b/templates/Froxlor/src/scss/_global.scss
index 4e313357..6875a1fb 100644
--- a/templates/Froxlor/src/scss/_global.scss
+++ b/templates/Froxlor/src/scss/_global.scss
@@ -67,3 +67,12 @@
 .field-image-preview {
 	max-height: 5em;
 }
+
+#phpinfotable {
+	table-layout: fixed;
+	word-wrap: break-word;
+}
+
+a {
+	text-decoration: none;
+}
diff --git a/templates/Froxlor/src/scss/dark.scss b/templates/Froxlor/src/scss/dark.scss
index 552bf4df..93be3330 100644
--- a/templates/Froxlor/src/scss/dark.scss
+++ b/templates/Froxlor/src/scss/dark.scss
@@ -29,23 +29,22 @@
     border-top: 1px solid var(--bs-body-bg)!important;
 }
 
-.form-select, .form-control,
+.form-select,
+.form-control,
+.form-control:focus,
 section h3,
 section h3 + span,
 section h5 {
 	color: $dark-bg;
 }
 
+.card-title,
 .page-header {
 	color: $light;
 }
 
-.form-control:focus {
-	color: $dark-bg;
-}
-.form-control[readonly]:focus {
-	color: $white;
-}
+
+.form-control[readonly]:focus,
 .form-control-plaintext {
 	color: $white;
 }
diff --git a/templates/Froxlor/src/scss/variables/_dark.scss b/templates/Froxlor/src/scss/variables/_dark.scss
index 2688a238..c19fdab5 100644
--- a/templates/Froxlor/src/scss/variables/_dark.scss
+++ b/templates/Froxlor/src/scss/variables/_dark.scss
@@ -9,7 +9,6 @@ $card-bg: lighten($body-bg, 10);
 
 $navbar-bg: $dark-bg;
 
-$light: lighten($dark-bg, 15);
 $list-group-bg: lighten($dark-bg, 10);
 $list-group-color: $body-color;
 
@@ -17,3 +16,5 @@ $nav-link-color: $body-color;
 
 $white: #e9ecef;
 $light: #f8f9fa;
+
+$link-color: $froxlor-blue-light;
diff --git a/templates/Froxlor/src/scss/variables/_main.scss b/templates/Froxlor/src/scss/variables/_main.scss
index bc7b8bd3..404125e6 100644
--- a/templates/Froxlor/src/scss/variables/_main.scss
+++ b/templates/Froxlor/src/scss/variables/_main.scss
@@ -36,7 +36,7 @@ $body-color: $light-font-color;
 // $border-radius: 0.5rem;
 
 // Links
-$links: $froxlor-blue-dark;
+$link-color: $froxlor-blue-dark;
 
 // Navbar
 $navbar-bg: #ffffff;
diff --git a/templates/Froxlor/user/index.html.twig b/templates/Froxlor/user/index.html.twig
index 1a67277d..41d1eb22 100644
--- a/templates/Froxlor/user/index.html.twig
+++ b/templates/Froxlor/user/index.html.twig
@@ -52,7 +52,7 @@
 				{# system infos #}
 				<div class="card mb-3">
 					<div class="card-header">
-						<i class="fa-solid fa-gears"></i>
+						<i class="fa-solid fa-gears me-1"></i>
 						{{ lng('admin.systemdetails') }}
 					</div>
 					<ul class="list-group list-group-flush">
@@ -125,7 +125,7 @@
 				{# account info #}
 				<div class="card mb-3">
 					<div class="card-header">
-						<i class="fa-solid fa-user"></i>
+						<i class="fa-solid fa-user me-1"></i>
 						{{ lng('index.accountdetails') }}
 					</div>
 					<ul class="list-group list-group-flush">
@@ -188,7 +188,7 @@
 				{# customer details #}
 				<div class="card">
 					<div class="card-header">
-						<i class="fa-solid fa-id-card"></i>
+						<i class="fa-solid fa-id-card me-1"></i>
 						{{ lng('index.customerdetails') }}
 					</div>
 					<ul class="list-group list-group-flush">
@@ -250,7 +250,7 @@
 				{# froxlor-details #}
 				<div class="card mb-3">
 					<div class="card-header">
-						<i class="fa-solid fa-wrench"></i>
+						<i class="fa-solid fa-wrench me-1"></i>
 						{{ lng('admin.froxlordetails') }}
 					</div>
 					<ul class="list-group list-group-flush">
@@ -281,7 +281,7 @@
 
 			<div id="newsfeed" class="card">
 				<div class="card-header">
-					<i class="fa-solid fa-info-circle"></i>
+					<i class="fa-solid fa-info-circle me-1"></i>
 					Froxlor Newsfeed
 				</div>
 				<div class="list-group list-group-flush" id="newsfeeditems">
diff --git a/templates/Froxlor/user/traffic.html.twig b/templates/Froxlor/user/traffic.html.twig
index 20c09db0..2087f5cc 100644
--- a/templates/Froxlor/user/traffic.html.twig
+++ b/templates/Froxlor/user/traffic.html.twig
@@ -34,7 +34,7 @@
 		</select>
 	</div>
 
-	<div class="row row-cols-2 g-0 bg-white rounded shadow-sm mb-4">
+	<div class="row row-cols-1 row-cols-md-2 g-0 bg-white rounded shadow-sm mb-4">
 		<div class="col p-3 border-end">
 			<canvas id="trafficsummary" style="max-height:30vh;"></canvas>
 		</div>
@@ -44,7 +44,7 @@
 	</div>
 
 	<!-- Overview for given range -->
-	<div class="row row-cols-4 g-0 bg-white rounded shadow-sm mb-4">
+	<div class="row row-cols-2 row-cols-md-4 g-0 bg-white rounded shadow-sm mb-4">
 		<div class="col p-3 border-end">
 			<h3>{{ metrics.total|formatBytes }}</h3>
 			<span>Total</span>