Merge pull request #2027 from heper/sed_inline_css

53 files changed, 75 insertions, 68 deletions

diff --git a/src/usr/local/www/bootstrap/css/pfSense.css b/src/usr/local/www/bootstrap/css/pfSense.css
index 9c520c4..07a54ea 100644
--- a/src/usr/local/www/bootstrap/css/pfSense.css
+++ b/src/usr/local/www/bootstrap/css/pfSense.css
@@ -318,4 +318,11 @@ form .btn + .btn {
 .icon-pointer
 {
 	cursor: pointer;
-}
\ No newline at end of file
+}
+
+.icon-embed-btn
+{
+	font-size: 15px;
+	vertical-align: middle;
+	margin-right: 6px;
+}
diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php
index 8a71e98..badabd7 100644
--- a/src/usr/local/www/firewall_aliases.php
+++ b/src/usr/local/www/firewall_aliases.php
@@ -279,11 +279,11 @@ display_top_tabs($tab_array);
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="firewall_aliases_edit.php?tab=<?=$tab?>" role="button" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add");?>
 	</a>
 	<a href="firewall_aliases_import.php" role="button" class="btn btn-default btn-sm">
-		<i class="fa fa-download" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-download icon-embed-btn"></i>
 		<?=gettext("Import");?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php
index f1b96a4..bdd61e5 100644
--- a/src/usr/local/www/firewall_nat.php
+++ b/src/usr/local/www/firewall_nat.php
@@ -369,15 +369,15 @@ endforeach;
 
 	<nav class="action-buttons" style="margin-top: 10px;">
 		<a href="firewall_nat_edit.php?after=-1" class="btn btn-sm btn-success" title="<?=gettext('Add new rule')?>">
-			<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-plus icon-embed-btn"></i>
 			<?=gettext('Add')?>
 		</a>
 		<button name="del_x" type="submit" class="btn btn-danger btn-sm">
-			<i class="fa fa-trash" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-trash icon-embed-btn"></i>
 			<?=gettext("Delete"); ?>
 		</button>
 		<button type="submit" id="order-store" name="order-store" class="btn btn-primary btn-sm" disabled="disabled">
-			<i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-save icon-embed-btn"></i>
 			<?=gettext("Save")?>
 		</button>
 	</nav>
diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php
index 44a981d..b1f6185 100644
--- a/src/usr/local/www/firewall_nat_1to1.php
+++ b/src/usr/local/www/firewall_nat_1to1.php
@@ -262,15 +262,15 @@ display_top_tabs($tab_array);
 
 	<nav class="action-buttons" style="margin-top: 10px;">
 		<a href="firewall_nat_1to1_edit.php?after=-1" class="btn btn-sm btn-success" title="<?=gettext('Add new mapping')?>">
-			<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-plus icon-embed-btn"></i>
 			<?=gettext('Add')?>
 		</a>
 		<button name="del_x" type="submit" class="btn btn-danger btn-sm" value="<?=gettext("Delete selected rule"); ?>">
-			<i class="fa fa-trash" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-trash icon-embed-btn"></i>
 			<?=gettext("Delete"); ?>
 		</button>
 		<button type="submit" id="order-store" name="order-store" class="btn btn-primary btn-sm" value="Save changes" disabled="disabled">
-			<i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-save icon-embed-btn"></i>
 			<?=gettext("Save")?>
 		</button>
 	</nav>
diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php
index 6407988..f7bed09 100644
--- a/src/usr/local/www/firewall_nat_npt.php
+++ b/src/usr/local/www/firewall_nat_npt.php
@@ -177,11 +177,11 @@ endforeach;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="firewall_nat_npt_edit.php" class="btn btn-sm btn-success">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 	<button type="submit" id="order-store" class="btn btn-primary btn-sm" value="store changes" disabled="disabled">
-		<i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-save icon-embed-btn"></i>
 		<?=gettext("Save")?>
 	</button>
 </nav>
diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php
index a25a211..b020513 100644
--- a/src/usr/local/www/firewall_nat_out.php
+++ b/src/usr/local/www/firewall_nat_out.php
@@ -516,15 +516,15 @@ print($form);
 
 	<nav class="action-buttons" style="margin-top: 10px;">
 		<a href="firewall_nat_out_edit.php" class="btn btn-sm btn-success" title="<?=gettext('Add new mapping')?>">
-			<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-plus icon-embed-btn"></i>
 			<?=gettext('Add')?>
 		</a>
 		<button name="del_x" type="submit" class="btn btn-danger btn-sm" value="<?=gettext("Delete selected map"); ?>">
-			<i class="fa fa-trash" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-trash icon-embed-btn"></i>
 			<?=gettext("Delete"); ?>
 		</button>
 		<button type="submit" id="order-store" class="btn btn-primary btn-sm" value="Save changes" disabled="disabled" name="order-store">
-			<i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-save icon-embed-btn"></i>
 			<?=gettext("Save")?>
 		</button>
 	</nav>
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index a16afc0..0fced94 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -653,15 +653,15 @@ for ($i = 0; isset($a_filter[$i]); $i++):
 
 	<nav class="action-buttons" style="margin-top: 10px;">
 		<a href="firewall_rules_edit.php?if=<?=htmlspecialchars($if);?>" role="button" class="btn btn-sm btn-success">
-			<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-plus icon-embed-btn"></i>
 			<?=gettext("Add");?>
 		</a>
 		<button name="del_x" type="submit" class="btn btn-danger btn-sm" value="<?=gettext("Delete selected rules"); ?>">
-			<i class="fa fa-trash" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-trash icon-embed-btn"></i>
 			<?=gettext("Delete"); ?>
 		</button>
 		<button type="submit" id="order-store" name="order-store" class="btn btn-sm btn-primary" value="store changes" disabled="disabled">
-			<i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-save icon-embed-btn"></i>
 			<?=gettext("Save")?>
 		</button>
 	</nav>
diff --git a/src/usr/local/www/firewall_schedule.php b/src/usr/local/www/firewall_schedule.php
index 85a1d9d..85348f0 100644
--- a/src/usr/local/www/firewall_schedule.php
+++ b/src/usr/local/www/firewall_schedule.php
@@ -273,7 +273,7 @@ endforeach;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="firewall_schedule_edit.php" class="btn btn-sm btn-success">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php
index b5d4479..d046068 100644
--- a/src/usr/local/www/firewall_virtual_ip.php
+++ b/src/usr/local/www/firewall_virtual_ip.php
@@ -357,7 +357,7 @@ endforeach;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="firewall_virtual_ip_edit.php" class="btn btn-sm btn-success">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext('Add')?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/interfaces_bridge.php b/src/usr/local/www/interfaces_bridge.php
index 7369320..04daa24 100644
--- a/src/usr/local/www/interfaces_bridge.php
+++ b/src/usr/local/www/interfaces_bridge.php
@@ -185,7 +185,7 @@ foreach ($a_bridges as $bridge) {
 
 	<nav class="action-buttons" style="margin-top: 10px;">
 		<a href="interfaces_bridge_edit.php" class="btn btn-success btn-sm">
-			<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-plus icon-embed-btn"></i>
 			<?=gettext("Add")?>
 		</a>
 	</nav>
diff --git a/src/usr/local/www/interfaces_gif.php b/src/usr/local/www/interfaces_gif.php
index e6c8aea..3e487b8 100644
--- a/src/usr/local/www/interfaces_gif.php
+++ b/src/usr/local/www/interfaces_gif.php
@@ -160,7 +160,7 @@ display_top_tabs($tab_array);
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="interfaces_gif_edit.php" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/interfaces_gre.php b/src/usr/local/www/interfaces_gre.php
index 0c164f4..0e12d8f 100644
--- a/src/usr/local/www/interfaces_gre.php
+++ b/src/usr/local/www/interfaces_gre.php
@@ -159,7 +159,7 @@ display_top_tabs($tab_array);
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="interfaces_gre_edit.php" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/interfaces_groups.php b/src/usr/local/www/interfaces_groups.php
index 4d7c78e..d071408 100644
--- a/src/usr/local/www/interfaces_groups.php
+++ b/src/usr/local/www/interfaces_groups.php
@@ -154,7 +154,7 @@ display_top_tabs($tab_array);
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a class="btn btn-success btn-sm" href="interfaces_groups_edit.php" role="button">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add");?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/interfaces_lagg.php b/src/usr/local/www/interfaces_lagg.php
index 706fbc9..710fe84 100644
--- a/src/usr/local/www/interfaces_lagg.php
+++ b/src/usr/local/www/interfaces_lagg.php
@@ -173,7 +173,7 @@ foreach ($a_laggs as $lagg) {
 
 	 <nav class="action-buttons" style="margin-top: 10px;">
 		<a href="interfaces_lagg_edit.php" class="btn btn-success btn-sm">
-			<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-plus icon-embed-btn"></i>
 			<?=gettext("Add")?>
 		</a>
 	</nav>
diff --git a/src/usr/local/www/interfaces_ppps.php b/src/usr/local/www/interfaces_ppps.php
index 97f5a55..50418c3 100644
--- a/src/usr/local/www/interfaces_ppps.php
+++ b/src/usr/local/www/interfaces_ppps.php
@@ -168,7 +168,7 @@ foreach ($a_ppps as $id => $ppp) {
 
 	<nav class="action-buttons" style="margin-top: 10px;">
 		<a href="interfaces_ppps_edit.php" class="btn btn-success btn-sm">
-	   		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+	   		<i class="fa fa-plus icon-embed-btn"></i>
 	   		<?=gettext("Add")?>
 	   	</a>
 	</nav>
diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php
index cda3123..22e1cc0 100644
--- a/src/usr/local/www/interfaces_qinq.php
+++ b/src/usr/local/www/interfaces_qinq.php
@@ -178,7 +178,7 @@ endforeach;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="interfaces_qinq_edit.php" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php
index ac65ede..8850b11 100644
--- a/src/usr/local/www/interfaces_vlan.php
+++ b/src/usr/local/www/interfaces_vlan.php
@@ -164,7 +164,7 @@ display_top_tabs($tab_array);
 		</table>
 		<nav class="action-buttons" style="margin-top: 10px;">
 			<a class="btn btn-success btn-sm" role="button" href="interfaces_vlan_edit.php">
-				<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+				<i class="fa fa-plus icon-embed-btn"></i>
 				<?=gettext('Add'); ?>
 			</a>
 		</nav>
diff --git a/src/usr/local/www/interfaces_wireless.php b/src/usr/local/www/interfaces_wireless.php
index 9a1f321..f2052fc 100644
--- a/src/usr/local/www/interfaces_wireless.php
+++ b/src/usr/local/www/interfaces_wireless.php
@@ -169,7 +169,7 @@ foreach ($a_clones as $clone) {
 
 	<nav class="action-buttons" style="margin-top: 10px;">
 		<a href="interfaces_wireless_edit.php" class="btn btn-success btn-sm">
-			<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-plus icon-embed-btn"></i>
 			<?=gettext("Add")?></a>
 	</nav>
 </div>
diff --git a/src/usr/local/www/load_balancer_monitor.php b/src/usr/local/www/load_balancer_monitor.php
index ad3f411..abf4b67 100644
--- a/src/usr/local/www/load_balancer_monitor.php
+++ b/src/usr/local/www/load_balancer_monitor.php
@@ -177,7 +177,7 @@ foreach($a_monitor as $monitor) {
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="load_balancer_monitor_edit.php" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext('Add')?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/load_balancer_pool.php b/src/usr/local/www/load_balancer_pool.php
index 364a7e3..d2db474 100644
--- a/src/usr/local/www/load_balancer_pool.php
+++ b/src/usr/local/www/load_balancer_pool.php
@@ -212,7 +212,7 @@ foreach($a_pool as $pool) {
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="load_balancer_pool_edit.php" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext('Add')?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/load_balancer_virtual_server.php b/src/usr/local/www/load_balancer_virtual_server.php
index 358290e..f86a6d6 100644
--- a/src/usr/local/www/load_balancer_virtual_server.php
+++ b/src/usr/local/www/load_balancer_virtual_server.php
@@ -202,7 +202,7 @@ if(!empty($a_vs)) {
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="load_balancer_virtual_server_edit.php" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/services_captiveportal_filemanager.php b/src/usr/local/www/services_captiveportal_filemanager.php
index 16fae8c..693e2f1 100644
--- a/src/usr/local/www/services_captiveportal_filemanager.php
+++ b/src/usr/local/www/services_captiveportal_filemanager.php
@@ -263,7 +263,7 @@ endif;
 	   <nav class="action-buttons" style="margin-top: 10px;">
 <?php if (!$_GET['act'] == 'add'): ?>
 			<a href="services_captiveportal_filemanager.php?zone=<?=$cpzone?>&amp;act=add" class="btn btn-success">
-		   		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		   		<i class="fa fa-plus icon-embed-btn"></i>
 		   		<?=gettext("Add")?>
 		   	</a>
 <?php endif; ?>
diff --git a/src/usr/local/www/services_captiveportal_hostname.php b/src/usr/local/www/services_captiveportal_hostname.php
index 3b3fd53..f67a066 100644
--- a/src/usr/local/www/services_captiveportal_hostname.php
+++ b/src/usr/local/www/services_captiveportal_hostname.php
@@ -191,7 +191,7 @@ endif;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="services_captiveportal_hostname_edit.php?zone=<?=$cpzone?>&amp;act=add" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/services_captiveportal_ip.php b/src/usr/local/www/services_captiveportal_ip.php
index 0374240..0d4d81a 100644
--- a/src/usr/local/www/services_captiveportal_ip.php
+++ b/src/usr/local/www/services_captiveportal_ip.php
@@ -187,7 +187,7 @@ endif;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="services_captiveportal_ip_edit.php?zone=<?=$cpzone?>&amp;act=add" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/services_captiveportal_mac.php b/src/usr/local/www/services_captiveportal_mac.php
index a2b88d6..d787500 100644
--- a/src/usr/local/www/services_captiveportal_mac.php
+++ b/src/usr/local/www/services_captiveportal_mac.php
@@ -247,7 +247,7 @@ endif;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="services_captiveportal_mac_edit.php?zone=<?=$cpzone?>&amp;act=add" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php
index e267291..0bec274 100644
--- a/src/usr/local/www/services_captiveportal_vouchers.php
+++ b/src/usr/local/www/services_captiveportal_vouchers.php
@@ -493,7 +493,7 @@ endforeach;
 if ($pconfig['enable']) : ?>
 	<nav class="action-buttons" style="margin-top: 10px;">
 		<a href="services_captiveportal_vouchers_edit.php?zone=<?=$cpzone?>" class="btn btn-success">
-			<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-plus icon-embed-btn"></i>
 			<?=gettext("Add")?>
 		</a>
 	</nav>
diff --git a/src/usr/local/www/services_captiveportal_zones.php b/src/usr/local/www/services_captiveportal_zones.php
index edb3d37..b799c07 100644
--- a/src/usr/local/www/services_captiveportal_zones.php
+++ b/src/usr/local/www/services_captiveportal_zones.php
@@ -150,7 +150,7 @@ if (is_subsystem_dirty('captiveportal'))
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="services_captiveportal_zones_edit.php" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext('Add')?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php
index cccb201..4354321 100644
--- a/src/usr/local/www/services_dhcp.php
+++ b/src/usr/local/www/services_dhcp.php
@@ -1328,7 +1328,7 @@ if (!is_numeric($pool) && !($act == "newpool")) {
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="services_dhcp_edit.php?if=<?=htmlspecialchars($if)?>" class="btn btn-sm btn-success">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php
index 70b7036..ee972c1 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -942,7 +942,7 @@ endif;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="services_dhcpv6_edit.php?if=<?=$if?>" class="btn btn-sm btn-success"/>
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/services_dnsmasq.php b/src/usr/local/www/services_dnsmasq.php
index fc5e5e6..6083c35 100644
--- a/src/usr/local/www/services_dnsmasq.php
+++ b/src/usr/local/www/services_dnsmasq.php
@@ -394,7 +394,7 @@ endforeach;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="services_dnsmasq_edit.php" class="btn btn-sm btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext('Add')?>
 	</a>
 </nav>
@@ -446,7 +446,7 @@ endforeach;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="services_dnsmasq_domainoverride_edit.php" class="btn btn-sm btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext('Add')?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/services_dyndns.php b/src/usr/local/www/services_dyndns.php
index 544dbcf..3e4d30a 100644
--- a/src/usr/local/www/services_dyndns.php
+++ b/src/usr/local/www/services_dyndns.php
@@ -229,7 +229,7 @@ foreach ($a_dyndns as $dyndns):
 
 <nav class="action-buttons">
 	<a href="services_dyndns_edit.php" class="btn btn-sm btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext('Add')?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/services_igmpproxy.php b/src/usr/local/www/services_igmpproxy.php
index 5bc0bfe..38c29d8 100644
--- a/src/usr/local/www/services_igmpproxy.php
+++ b/src/usr/local/www/services_igmpproxy.php
@@ -164,11 +164,11 @@ endforeach;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<button id="submit" name="submit" type="submit" class="btn btn-primary btn-sm" value="<?=gettext("Save")?>">
-		<i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-save icon-embed-btn"></i>
 		<?=gettext("Save")?>
 	</button>
 	<a href="services_igmpproxy_edit.php" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext('Add')?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/services_rfc2136.php b/src/usr/local/www/services_rfc2136.php
index 4cc5bcc..155f15e 100644
--- a/src/usr/local/www/services_rfc2136.php
+++ b/src/usr/local/www/services_rfc2136.php
@@ -193,7 +193,7 @@ endforeach; ?>
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="services_rfc2136_edit.php" class="btn btn-sm btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext('Add')?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php
index 00b2c97..056aed9 100644
--- a/src/usr/local/www/services_unbound.php
+++ b/src/usr/local/www/services_unbound.php
@@ -483,7 +483,7 @@ endforeach;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="services_unbound_host_edit.php" class="btn btn-sm btn-success">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext('Add')?>
 	</a>
 </nav>
@@ -532,7 +532,7 @@ endforeach;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="services_unbound_domainoverride_edit.php" class="btn btn-sm btn-success">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext('Add')?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php
index dcf48c0..15faeaf 100644
--- a/src/usr/local/www/services_unbound_acls.php
+++ b/src/usr/local/www/services_unbound_acls.php
@@ -350,7 +350,7 @@ else // NOT 'edit' or 'add'
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="services_unbound_acls.php?act=new" class="btn btn-sm btn-success">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/status_lb_pool.php b/src/usr/local/www/status_lb_pool.php
index 2779b66..ab8c988 100644
--- a/src/usr/local/www/status_lb_pool.php
+++ b/src/usr/local/www/status_lb_pool.php
@@ -250,12 +250,12 @@ if($rowsprinted > 0) {
 ?>
 			<nav class="action-buttons">
 				<button name="Submit" type="submit" class="btn btn-primary btn-sm" value="<?= gettext("Save"); ?>" >
-					<i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+					<i class="fa fa-save icon-embed-btn"></i>
 					<?=gettext("Save")?>
 				</button>
 
 				<button name="Reset" type="reset"  class="btn btn-danger btn-sm" value="<?= gettext("Reset"); ?>">
-					<i class="fa fa-undo" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+					<i class="fa fa-undo icon-embed-btn"></i>
 					<?=gettext("Reset")?>
 				</button>
 			</nav>
diff --git a/src/usr/local/www/status_upnp.php b/src/usr/local/www/status_upnp.php
index c92c2d5..31a9255 100644
--- a/src/usr/local/www/status_upnp.php
+++ b/src/usr/local/www/status_upnp.php
@@ -150,7 +150,7 @@ foreach ($rdr_entries as $rdr_entry) {
 	<form action="status_upnp.php" method="post">
 		<nav class="action-buttons" style="margin-top: 10px;">
 			<button class="btn btn-danger btn-sm" type="submit" name="clear" id="clear" value="<?=gettext("Clear all sessions")?>">
-				<i class="fa fa-trash" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+				<i class="fa fa-trash icon-embed-btn"></i>
 				<?=gettext("Clear all sessions")?>
 			</button>
 		</nav>
diff --git a/src/usr/local/www/status_wireless.php b/src/usr/local/www/status_wireless.php
index 6591945..d8f91eb 100644
--- a/src/usr/local/www/status_wireless.php
+++ b/src/usr/local/www/status_wireless.php
@@ -238,7 +238,7 @@ display_top_tabs($tab_array);
 	<nav class="action-buttons" style="margin-top: 10px;">
 		<input type="hidden" name="if" id="if" value="<?=htmlspecialchars($if)?>" />
 		<button type="submit" class="btn btn-success" name="rescanwifi" id="rescanwifi" value="Rescan">
-			<i class="fa fa-undo" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-undo icon-embed-btn"></i>
 			<?=gettext("Rescan")?>
 		</button>
 	</nav>
diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php
index 9947853..6c14689 100644
--- a/src/usr/local/www/system_authservers.php
+++ b/src/usr/local/www/system_authservers.php
@@ -430,7 +430,7 @@ if (!($act == "new" || $act == "edit" || $input_errors))
 
 	<nav class="action-buttons" style="margin-top: 10px;">
 		<a href="?act=new" class="btn btn-success btn-sm">
-			<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-plus icon-embed-btn"></i>
 			<?=gettext("Add")?>
 		</a>
 	</nav>
diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php
index b9520b0..cb7a525 100644
--- a/src/usr/local/www/system_camanager.php
+++ b/src/usr/local/www/system_camanager.php
@@ -458,7 +458,7 @@ foreach ($a_ca as $i => $ca):
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="?act=new" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php
index 35b3d66..10791e3 100644
--- a/src/usr/local/www/system_certmanager.php
+++ b/src/usr/local/www/system_certmanager.php
@@ -684,7 +684,7 @@ foreach($a_cert as $i => $cert):
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="?act=new" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/system_gateway_groups.php b/src/usr/local/www/system_gateway_groups.php
index 3e54eb0..fa15c8c 100644
--- a/src/usr/local/www/system_gateway_groups.php
+++ b/src/usr/local/www/system_gateway_groups.php
@@ -198,7 +198,7 @@ endforeach;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="system_gateway_groups_edit.php" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext('Add')?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/system_gateways.php b/src/usr/local/www/system_gateways.php
index 1c799d3..0f38e66 100644
--- a/src/usr/local/www/system_gateways.php
+++ b/src/usr/local/www/system_gateways.php
@@ -329,7 +329,7 @@ foreach ($a_gateways as $i => $gateway):
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="system_gateways_edit.php" role="button" class="btn btn-success">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add");?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php
index f8de594..22e3e04 100644
--- a/src/usr/local/www/system_groupmanager.php
+++ b/src/usr/local/www/system_groupmanager.php
@@ -318,7 +318,7 @@ if (!($_GET['act'] == "new" || $_GET['act'] == "edit"))
 
 	<nav class="action-buttons" style="margin-top: 10px;">
 		<a href="?act=new" class="btn btn-success btn-sm">
-			<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+			<i class="fa fa-plus icon-embed-btn"></i>
 			<?=gettext("Add")?>
 		</a>
 	</nav>
diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php
index a2e62d7..55f94b7 100644
--- a/src/usr/local/www/system_routes.php
+++ b/src/usr/local/www/system_routes.php
@@ -318,7 +318,7 @@ foreach ($a_routes as $i => $route):
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="system_routes_edit.php" role="button" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php
index e0eae0d..5d62d1a 100644
--- a/src/usr/local/www/system_usermanager.php
+++ b/src/usr/local/www/system_usermanager.php
@@ -516,7 +516,7 @@ foreach($a_user as $i => $userent):
 </div>
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="?act=new" class="btn btn-success">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php
index 9a6dc25..539263d 100644
--- a/src/usr/local/www/vpn_ipsec.php
+++ b/src/usr/local/www/vpn_ipsec.php
@@ -570,12 +570,12 @@ display_top_tabs($tab_array);
 */
 ?>
 	<a href="vpn_ipsec_phase1.php" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add P1")?>
 	</a>
 <?php if ($i !== 0): ?>
 	<button type="submit" name="del" class="btn btn-danger btn-sm" value="<?=gettext("Delete selected P1s")?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected phase1 entries?")?>')">
-		<i class="fa fa-trash" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-trash icon-embed-btn"></i>
 		<?=gettext("Delete P1s")?>
 	</button>
 <?php endif; ?>
diff --git a/src/usr/local/www/vpn_ipsec_keys.php b/src/usr/local/www/vpn_ipsec_keys.php
index b83ff46..99b208a 100644
--- a/src/usr/local/www/vpn_ipsec_keys.php
+++ b/src/usr/local/www/vpn_ipsec_keys.php
@@ -190,7 +190,7 @@ if (is_subsystem_dirty('ipsec'))
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a class="btn btn-success btn-sm" href="vpn_ipsec_keys_edit.php">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/vpn_l2tp_users.php b/src/usr/local/www/vpn_l2tp_users.php
index b53a2f0..0c9033b 100644
--- a/src/usr/local/www/vpn_l2tp_users.php
+++ b/src/usr/local/www/vpn_l2tp_users.php
@@ -147,7 +147,7 @@ if (is_subsystem_dirty('l2tpusers'))
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a class="btn btn-success btn-sm" href="vpn_l2tp_users_edit.php">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php
index 0a28f73..24eb848 100644
--- a/src/usr/local/www/vpn_openvpn_client.php
+++ b/src/usr/local/www/vpn_openvpn_client.php
@@ -857,7 +857,7 @@ else:
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="vpn_openvpn_client.php?act=new" class="btn btn-sm btn-success">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php
index 3427583..2121fef 100644
--- a/src/usr/local/www/vpn_openvpn_csc.php
+++ b/src/usr/local/www/vpn_openvpn_csc.php
@@ -652,7 +652,7 @@ else :  // Not an 'add' or an 'edit'. Just the table of Override CSCs
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="vpn_openvpn_csc.php?act=new" class="btn btn-success btn-sm">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext('Add')?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php
index a0a4837..13b471c 100644
--- a/src/usr/local/www/vpn_openvpn_server.php
+++ b/src/usr/local/www/vpn_openvpn_server.php
@@ -1323,7 +1323,7 @@ else:
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="vpn_openvpn_server.php?act=new" class="btn btn-sm btn-success btn-sm">
-	<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+	<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>
diff --git a/src/usr/local/www/vpn_pppoe.php b/src/usr/local/www/vpn_pppoe.php
index 8095bb6..ec0e821 100644
--- a/src/usr/local/www/vpn_pppoe.php
+++ b/src/usr/local/www/vpn_pppoe.php
@@ -171,7 +171,7 @@ endforeach;
 
 <nav class="action-buttons" style="margin-top: 10px;">
 	<a href="vpn_pppoe_edit.php" class="btn btn-success">
-		<i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+		<i class="fa fa-plus icon-embed-btn"></i>
 		<?=gettext("Add")?>
 	</a>
 </nav>