Fix inconsistent spacing in buttons (#3467)

* Fix alignment of Configure Server panel headings

* Fix inconsistent spacing in buttons

web/css/src/themes/default.css

@@ -1844,7 +1844,9 @@
 
 .button {
 	cursor: pointer;
-	display: inline-block;
+	display: flex;
+	align-items: center;
+	justify-content: center;
 	line-height: 21px;
 	font-size: 0.85rem;
 	font-weight: 500;
@@ -2101,6 +2103,10 @@
 		top: 0;
 		right: 15px;
 	}
+
+	& .fas {
+		min-width: 20px;
+	}
 }
 
 .collapse-content {

web/css/src/utilities.css

@@ -77,10 +77,6 @@
 	margin-right: 10px !important;
 }
 
-.u-mr15 {
-	margin-right: 15px !important;
-}
-
 .u-mb5 {
 	margin-bottom: 5px !important;
 }

web/templates/pages/edit_server.php

@@ -3,24 +3,20 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<a href="/list/server/" class="button button-secondary" id="btn-back">
-				<i class="fas fa-arrow-left icon-blue"></i>
-				<?= _("Back") ?>
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
 			</a>
 			<a href="/list/ip/" class="button button-secondary">
-				<i class="fas fa-ethernet icon-blue"></i>
-				<?= _("IP") ?>
+				<i class="fas fa-ethernet icon-blue"></i><?= _("IP") ?>
 			</a>
 			<?php if (isset($_SESSION["FIREWALL_SYSTEM"]) && !empty($_SESSION["FIREWALL_SYSTEM"])) { ?>
 				<a href="/list/firewall/" class="button button-secondary">
-					<i class="fas fa-shield-halved icon-red"></i>
-					<?= _("Firewall") ?>
+					<i class="fas fa-shield-halved icon-red"></i><?= _("Firewall") ?>
 				</a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-buttons">
 			<button type="submit" class="button" form="vstobjects">
-				<i class="fas fa-floppy-disk icon-purple"></i>
-				<?= _("Save") ?>
+				<i class="fas fa-floppy-disk icon-purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>
@@ -60,8 +56,7 @@
 			<!-- Basic options section -->
 			<details class="collapse u-mb10">
 				<summary class="collapse-header">
-					<i class="fas fa-gear u-mr15"></i>
-					<?= _("Basic options") ?>
+					<i class="fas fa-gear u-mr10"></i><?= _("Basic options") ?>
 				</summary>
 				<div class="collapse-content">
 					<div class="u-mb10">
@@ -139,8 +134,7 @@
 			<!-- Updates section -->
 			<details class="collapse u-mb10">
 				<summary class="collapse-header">
-					<i class="fas fa-code-branch u-mr15"></i>
-					<?= _("Updates") ?>
+					<i class="fas fa-code-branch u-mr10"></i><?= _("Updates") ?>
 				</summary>
 				<div class="collapse-content">
 					<p class="u-mb10">
@@ -219,8 +213,7 @@
 			<!-- Web Server section -->
 			<details class="collapse u-mb10">
 				<summary class="collapse-header">
-					<i class="fas fa-earth-americas u-mr15"></i>
-					<?= _("Web Server") ?>
+					<i class="fas fa-earth-americas u-mr10"></i><?= _("Web Server") ?>
 				</summary>
 				<div class="collapse-content">
 					<?php if (!empty($_SESSION["PROXY_SYSTEM"])) { ?>
@@ -327,8 +320,7 @@
 			<?php if (!empty($_SESSION["DNS_SYSTEM"])) { ?>
 				<details class="collapse u-mb10">
 					<summary class="collapse-header">
-						<i class="fas fa-book-atlas u-mr15"></i>
-						<?= _("DNS Server") ?>
+						<i class="fas fa-book-atlas u-mr10"></i><?= _("DNS Server") ?>
 					</summary>
 					<div class="collapse-content">
 						<p>
@@ -373,8 +365,7 @@
 			<?php if (!empty($_SESSION["MAIL_SYSTEM"])) { ?>
 				<details class="collapse u-mb10">
 					<summary class="collapse-header">
-						<i class="fas fa-envelopes-bulk u-mr15"></i>
-						<?= _("Mail Server") ?>
+						<i class="fas fa-envelopes-bulk u-mr10"></i><?= _("Mail Server") ?>
 					</summary>
 					<div class="collapse-content">
 						<p>
@@ -498,8 +489,7 @@
 			<?php if (!empty($_SESSION["DB_SYSTEM"])) { ?>
 				<details class="collapse u-mb10">
 					<summary class="collapse-header">
-						<i class="fas fa-database u-mr15"></i>
-						<?= _("Databases") ?>
+						<i class="fas fa-database u-mr10"></i><?= _("Databases") ?>
 					</summary>
 					<div class="collapse-content">
 						<div class="u-mb10">
@@ -664,8 +654,7 @@
 			<!-- Backups section -->
 			<details class="collapse u-mb10">
 				<summary class="collapse-header">
-					<i class="fas fa-arrow-rotate-left u-mr15"></i>
-					<?= _("Backups") ?>
+					<i class="fas fa-arrow-rotate-left u-mr10"></i><?= _("Backups") ?>
 				</summary>
 				<div class="collapse-content">
 					<div class="u-mb10">
@@ -923,8 +912,7 @@
 			<!-- SSL tab -->
 			<details class="collapse u-mb10">
 				<summary class="collapse-header">
-					<i class="fas fa-lock u-mr15"></i>
-					<?= _("SSL") ?>
+					<i class="fas fa-lock u-mr10"></i><?= _("SSL") ?>
 				</summary>
 				<div class="collapse-content">
 					<div class="u-mb20">
@@ -995,8 +983,7 @@
 			<!-- Security tab -->
 			<details class="collapse u-mb10">
 				<summary class="collapse-header">
-					<i class="fas fa-key u-mr15"></i>
-					<?= _("Security") ?>
+					<i class="fas fa-key u-mr10"></i><?= _("Security") ?>
 				</summary>
 				<div class="collapse-content">
 					<h2 x-on:click="showSystemOptions = !showSystemOptions" class="section-title">
@@ -1326,8 +1313,7 @@
 			<!-- Plugins tab -->
 			<details class="collapse u-mb10">
 				<summary class="collapse-header">
-					<i class="fas fa-puzzle-piece u-mr15"></i>
-					<?= _("Hestia Control Panel Plugins") ?>
+					<i class="fas fa-puzzle-piece u-mr10"></i><?= _("Hestia Control Panel Plugins") ?>
 				</summary>
 				<div class="collapse-content">
 					<div class="u-mb10">

web/templates/pages/edit_server_nginx.php

@@ -6,7 +6,7 @@
 				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
 			</a>
 			<a href="/edit/server/php/" class="button button-secondary">
-				<i class="fas fa-pencil icon-orange"></i> <?= _("Configure") ?> PHP
+				<i class="fas fa-pencil icon-orange"></i><?= _("Configure") ?> PHP
 			</a>
 		</div>
 		<div class="toolbar-buttons">

web/templates/pages/edit_web.php

@@ -12,7 +12,7 @@
 			</a>
 			<?php if ($_SESSION["PLUGIN_APP_INSTALLER"] !== "false") { ?>
 				<a href="/add/webapp/?domain=<?= htmlentities($v_domain) ?>" class="button button-secondary">
-					<i class="fas fa-magic icon-blue"></i> <?= _("Quick Install App") ?>
+					<i class="fas fa-magic icon-blue"></i><?= _("Quick Install App") ?>
 				</a>
 			<?php } ?>
 			<button type="submit" class="button" form="vstobjects">

web/templates/pages/list_access_keys.php

@@ -2,8 +2,12 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/edit/user/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
-			<a href="/add/access-key/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus icon-green"></i><?= _("Add Access Key") ?></a>
+			<a class="button button-secondary" id="btn-back" href="/edit/user/">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
+			<a href="/add/access-key/" class="button button-secondary" id="btn-create">
+				<i class="fas fa-circle-plus icon-green"></i><?= _("Add Access Key") ?>
+			</a>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">

web/templates/pages/list_backup_exclusions.php

@@ -2,8 +2,12 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/backup/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
-			<a href="/edit/backup/exclusions/" class="button button-secondary"><i class="fas fa-pencil icon-orange"></i><?= _("Editing Backup Exclusions") ?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/backup/">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
+			<a href="/edit/backup/exclusions/" class="button button-secondary">
+				<i class="fas fa-pencil icon-orange"></i><?= _("Editing Backup Exclusions") ?>
+			</a>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-search">

web/templates/pages/list_dns_rec.php

@@ -2,10 +2,16 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/dns/">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
 			<?php if ($read_only !== "true") { ?>
-				<a href="/add/dns/?domain=<?= htmlentities($_GET["domain"]) ?>" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus icon-green"></i> <?= _("Add Record") ?></a>
-				<a href="/edit/dns/?domain=<?= htmlentities($_GET["domain"]) ?>" class="button button-secondary" id="btn-create"><i class="fas fa-pencil icon-blue"></i> <?= _("Editing DNS Domain") ?></a>
+				<a href="/add/dns/?domain=<?= htmlentities($_GET["domain"]) ?>" class="button button-secondary" id="btn-create">
+					<i class="fas fa-circle-plus icon-green"></i><?= _("Add Record") ?>
+				</a>
+				<a href="/edit/dns/?domain=<?= htmlentities($_GET["domain"]) ?>" class="button button-secondary" id="btn-create">
+					<i class="fas fa-pencil icon-blue"></i><?= _("Editing DNS Domain") ?>
+				</a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-right">

web/templates/pages/list_firewall.php

@@ -2,11 +2,19 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/edit/server/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
-			<a href="/add/firewall/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus icon-green"></i><?= _("Add Rule") ?></a>
+			<a class="button button-secondary" id="btn-back" href="/edit/server/">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
+			<a href="/add/firewall/" class="button button-secondary" id="btn-create">
+				<i class="fas fa-circle-plus icon-green"></i><?= _("Add Rule") ?>
+			</a>
 			<?php if (!empty($_SESSION["FIREWALL_EXTENSION"])): ?>
-				<a class="button button-secondary" href="/list/firewall/banlist/"><i class="fas fa-eye icon-red"></i><?= _("list fail2ban") ?></a>
-				<a class="button button-secondary" href="/list/firewall/ipset/"><i class="fas fa-list icon-blue"></i><?= _("list ipset") ?></a>
+				<a class="button button-secondary" href="/list/firewall/banlist/">
+					<i class="fas fa-eye icon-red"></i><?= _("list fail2ban") ?>
+				</a>
+				<a class="button button-secondary" href="/list/firewall/ipset/">
+					<i class="fas fa-list icon-blue"></i><?= _("list ipset") ?>
+				</a>
 			<?php endif; ?>
 		</div>
 		<div class="toolbar-right">

web/templates/pages/list_firewall_banlist.php

@@ -2,8 +2,12 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
-			<a href="/add/firewall/banlist/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus icon-green"></i><?= _("Ban IP Address") ?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/firewall/">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
+			<a href="/add/firewall/banlist/" class="button button-secondary" id="btn-create">
+				<i class="fas fa-circle-plus icon-green"></i><?= _("Ban IP Address") ?>
+			</a>
 		</div>
 		<div class="toolbar-right">
 			<form x-data x-bind="BulkEdit" action="/bulk/firewall/banlist/" method="post">

web/templates/pages/list_firewall_ipset.php

@@ -2,8 +2,12 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
-			<a href="/add/firewall/ipset/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus icon-green"></i><?= _("Add IP list") ?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/firewall/">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
+			<a href="/add/firewall/ipset/" class="button button-secondary" id="btn-create">
+				<i class="fas fa-circle-plus icon-green"></i><?= _("Add IP list") ?>
+			</a>
 		</div>
 		<div class="toolbar-right">
 			<form x-data x-bind="BulkEdit" action="/bulk/firewall/ipset/" method="post">

web/templates/pages/list_ip.php

@@ -2,8 +2,12 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/edit/server/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
-			<a href="/add/ip/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus icon-green"></i><?= _("Add IP") ?></a>
+			<a class="button button-secondary" id="btn-back" href="/edit/server/">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
+			<a href="/add/ip/" class="button button-secondary" id="btn-create">
+				<i class="fas fa-circle-plus icon-green"></i><?= _("Add IP") ?>
+			</a>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">

web/templates/pages/list_key.php

@@ -2,12 +2,18 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/edit/user/?token=<?= $_SESSION["token"] ?>"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
-						<?php if ($_SESSION["userContext"] === "admin" && isset($_GET["user"]) && $_GET["user"] !== "admin") { ?>
-						<a href="/add/key/?user=<?= htmlentities($_GET["user"]) ?>" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus icon-green"></i><?= _("Add SSH Key") ?></a>
-						<?php } else { ?>
-			<a href="/add/key/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus icon-green"></i><?= _("Add SSH Key") ?></a>
-						<?php } ?>
+			<a class="button button-secondary" id="btn-back" href="/edit/user/?token=<?= $_SESSION["token"] ?>">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
+			<?php if ($_SESSION["userContext"] === "admin" && isset($_GET["user"]) && $_GET["user"] !== "admin") { ?>
+				<a href="/add/key/?user=<?= htmlentities($_GET["user"]) ?>" class="button button-secondary" id="btn-create">
+					<i class="fas fa-circle-plus icon-green"></i><?= _("Add SSH Key") ?>
+				</a>
+			<?php } else { ?>
+				<a href="/add/key/" class="button button-secondary" id="btn-create">
+					<i class="fas fa-circle-plus icon-green"></i><?= _("Add SSH Key") ?>
+				</a>
+			<?php } ?>
 		</div>
 	</div>
 </div>

web/templates/pages/list_log.php

@@ -3,28 +3,42 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<?php if ($_SESSION["userContext"] === "admin" && $_SESSION["look"] === "admin") { ?>
-				<a href="/list/user/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
+				<a href="/list/user/" class="button button-secondary" id="btn-back">
+					<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+				</a>
 			<?php } elseif ($_SESSION["userContext"] === "admin" && htmlentities($_GET["user"]) === "system") { ?>
-				<a href="/list/server/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
+				<a href="/list/server/" class="button button-secondary" id="btn-back">
+					<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+				</a>
 			<?php } else { ?>
 				<?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user'])) && ($_GET['user'] !== 'admin')) { ?>
-					<a href="/edit/user/?user=<?=htmlentities($_GET['user']); ?>&token=<?=$_SESSION['token']?>" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
+					<a href="/edit/user/?user=<?=htmlentities($_GET['user']); ?>&token=<?=$_SESSION['token']?>" class="button button-secondary" id="btn-back">
+						<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+					</a>
 				<?php } else { ?>
-					<a href="/edit/user/?token=<?= $_SESSION["token"] ?>" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
+					<a href="/edit/user/?token=<?= $_SESSION["token"] ?>" class="button button-secondary" id="btn-back">
+						<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+					</a>
 				<?php } ?>
 			<?php } ?>
 			<?php if ($_SESSION['DEMO_MODE'] != "yes"){
 			if (($_SESSION['userContext'] === 'admin') && (htmlentities($_GET['user']) !== 'admin')) { ?>
 				<?php if (($_SESSION['userContext'] === 'admin') && ($_GET['user'] != '') && (htmlentities($_GET['user']) !== 'admin')) { ?>
 					<?php if (htmlentities($_GET['user']) !== 'system') {?>
-						<a href="/list/log/auth/?user=<?=htmlentities($_GET['user']); ?>&token=<?=$_SESSION['token']?>" class="button button-secondary" id="btn-back" title="<?= _("Login history") ?>"><i class="fas fa-binoculars icon-green"></i><?= _("Login history") ?></a>
+						<a href="/list/log/auth/?user=<?=htmlentities($_GET['user']); ?>&token=<?=$_SESSION['token']?>" class="button button-secondary" id="btn-back" title="<?= _("Login history") ?>">
+							<i class="fas fa-binoculars icon-green"></i><?= _("Login history") ?>
+						</a>
 					<?php } ?>
 				<?php } else { ?>
-					<a href="/list/log/auth/" class="button button-secondary" id="btn-back" title="<?= _("Login history") ?>"><i class="fas fa-binoculars icon-green"></i><?= _("Login history") ?></a>
+					<a href="/list/log/auth/" class="button button-secondary" id="btn-back" title="<?= _("Login history") ?>">
+						<i class="fas fa-binoculars icon-green"></i><?= _("Login history") ?>
+					</a>
 				<?php } ?>
 			<?php } ?>
 			<?php if ($_SESSION["userContext"] === "user") { ?>
-				<a href="/list/log/auth/" class="button button-secondary" id="btn-back" title="<?= _("Login history") ?>"><i class="fas fa-binoculars icon-green"></i><?= _("Login history") ?></a>
+				<a href="/list/log/auth/" class="button button-secondary" id="btn-back" title="<?= _("Login history") ?>">
+					<i class="fas fa-binoculars icon-green"></i><?= _("Login history") ?>
+				</a>
 			<?php }
 			} ?>
 		</div>

web/templates/pages/list_log_auth.php

@@ -3,9 +3,13 @@
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
 			<?php if ($_SESSION["userContext"] === "admin" && isset($_GET["user"]) && htmlentities($_GET["user"]) !== "admin") { ?>
-				<a href="/list/log/?user=<?= htmlentities($_GET["user"]) ?>&token=<?= $_SESSION["token"] ?>" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
+				<a href="/list/log/?user=<?= htmlentities($_GET["user"]) ?>&token=<?= $_SESSION["token"] ?>" class="button button-secondary" id="btn-back">
+					<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+				</a>
 			<?php } else { ?>
-				<a href="/list/log/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
+				<a href="/list/log/" class="button button-secondary" id="btn-back">
+					<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+				</a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-buttons">

web/templates/pages/list_mail_acc.php

@@ -8,10 +8,16 @@ if (!empty($_SESSION["WEBMAIL_ALIAS"])) {
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/mail/">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
 			<?php if ($read_only !== "true") { ?>
-				<a href="/add/mail/?domain=<?= htmlentities($_GET["domain"]) ?>" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus icon-green"></i><?= _("Add Mail Account") ?></a>
-				<a href="/edit/mail/?domain=<?= htmlentities($_GET["domain"]) ?>" class="button button-secondary" id="btn-create"><i class="fas fa-pencil icon-blue"></i><?= _("Editing Mail Domain") ?></a>
+				<a href="/add/mail/?domain=<?= htmlentities($_GET["domain"]) ?>" class="button button-secondary" id="btn-create">
+					<i class="fas fa-circle-plus icon-green"></i><?= _("Add Mail Account") ?>
+				</a>
+				<a href="/edit/mail/?domain=<?= htmlentities($_GET["domain"]) ?>" class="button button-secondary" id="btn-create">
+					<i class="fas fa-pencil icon-blue"></i><?= _("Editing Mail Domain") ?>
+				</a>
 			<?php } ?>
 		</div>
 		<div class="toolbar-right">

web/templates/pages/list_mail_dns.php

@@ -7,10 +7,11 @@ if (!empty($_SESSION["WEBMAIL_ALIAS"])) {
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
-		</div>
-		<div class="toolbar-right">
+			<a class="button button-secondary" id="btn-back" href="/list/mail/">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
 		</div>
+		<div class="toolbar-right"></div>
 	</div>
 </div>
 

web/templates/pages/list_packages.php

@@ -2,8 +2,12 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
-			<a href="/add/package/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus icon-green"></i><?= _("Add Package") ?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/user/">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
+			<a href="/add/package/" class="button button-secondary" id="btn-create">
+				<i class="fas fa-circle-plus icon-green"></i><?= _("Add Package") ?>
+			</a>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">

web/templates/pages/list_rrd.php

@@ -2,8 +2,12 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
-			<a href="/list/server/?cpu" class="button button-secondary"><i class="fas fa-chart-pie icon-green"></i><?= _("show: CPU / MEM / NET / DISK") ?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/server/">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
+			<a href="/list/server/?cpu" class="button button-secondary">
+				<i class="fas fa-chart-pie icon-green"></i><?= _("show: CPU / MEM / NET / DISK") ?>
+			</a>
 		</div>
 		<div class="toolbar-right">
 			<a class="toolbar-link<?php if ((empty($period)) || ($period == 'daily')) echo " selected" ?>" href="?period=daily"><?= _("Daily") ?></a>

web/templates/pages/list_search.php

@@ -2,8 +2,12 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a href="javascript:window.history.back();" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
-			<a href="javascript:location.reload();" class="button button-secondary"><i class="fas fa-arrows-rotate icon-green"></i> <?= _("Refresh") ?></a>
+			<a href="javascript:window.history.back();" class="button button-secondary" id="btn-back">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
+			<a href="javascript:location.reload();" class="button button-secondary">
+				<i class="fas fa-arrows-rotate icon-green"></i><?= _("Refresh") ?>
+			</a>
 		</div>
 		<div class="toolbar-right">
 			<div class="toolbar-sorting">

web/templates/pages/list_server_preview.php

@@ -2,9 +2,9 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a href="/edit/server/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
-		</div>
-		<div class="toolbar-buttons">
+			<a href="/edit/server/" class="button button-secondary" id="btn-back">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
 		</div>
 	</div>
 </div>

web/templates/pages/list_updates.php

@@ -2,7 +2,9 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
+			<a class="button button-secondary" id="btn-back" href="/list/server/">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
+			</a>
 			<?php
 				if($autoupdate == 'Enabled') {
 					$btn_url = '/delete/cron/autoupdate/?token='.$_SESSION['token'].'';
@@ -14,7 +16,9 @@
 					$btn_label = _('Enable automatic updates');
 				}
 			?>
-			<a class="button button-secondary" href="<?=$btn_url;?>"><i class="fas <?=$btn_icon;?>"></i><?=$btn_label;?></a>
+			<a class="button button-secondary" href="<?=$btn_url;?>">
+				<i class="fas <?=$btn_icon;?>"></i><?= $btn_label; ?>
+			</a>
 		</div>
 	</div>
 </div>

web/templates/pages/list_webapps.php

@@ -6,8 +6,6 @@
 				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
 			</a>
 		</div>
-		<div class="toolbar-buttons">
-		</div>
 	</div>
 </div>
 <!-- End toolbar -->

web/templates/pages/setup_webapp.php

@@ -2,19 +2,13 @@
 <div class="toolbar">
 	<div class="toolbar-inner">
 		<div class="toolbar-buttons">
-			<a
-				class="button button-secondary"
-				id="btn-back"
-				href="/add/webapp/?domain=<?= htmlentities($v_domain) ?>"
-			>
-				<i class="fas fa-arrow-left icon-blue"></i>
-				<?= _("Back") ?>
+			<a class="button button-secondary" id="btn-back" href="/add/webapp/?domain=<?= htmlentities($v_domain) ?>">
+				<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
 			</a>
 		</div>
 		<div class="toolbar-buttons">
 			<button type="submit" class="button" form="vstobjects">
-				<i class="fas fa-floppy-disk icon-purple"></i>
-				<?= _("Save") ?>
+				<i class="fas fa-floppy-disk icon-purple"></i><?= _("Save") ?>
 			</button>
 		</div>
 	</div>