Ticket #5471 another convert batch to font-awesome icons

20 files changed, 89 insertions, 89 deletions

diff --git a/src/usr/local/www/carp_status.php b/src/usr/local/www/carp_status.php
index abbf305..be09bd2 100644
--- a/src/usr/local/www/carp_status.php
+++ b/src/usr/local/www/carp_status.php
@@ -234,22 +234,22 @@ if ($carpcount == 0) {
 		$status = get_carp_interface_status("{$carp['interface']}_vip{$carp['vhid']}");
 
 		if($carp_enabled == false) {
-			$icon = 'remove-sign';
+			$icon = 'times-circle';
 			$status = "DISABLED";
 		} else {
 			if ($status == "MASTER") {
-				$icon = 'ok-sign';
+				$icon = 'check-circle';
 			} else if ($status == "BACKUP") {
-				$icon = 'ok-circle';
+				$icon = 'check-circle-o';
 			} else if ($status == "INIT") {
-				$icon = 'question-sign';
+				$icon = 'question-circle';
 			}
 		}
 ?>
 					<tr>
 						<td><?=convert_friendly_interface_to_friendly_descr($carp['interface'])?>@<?=$vhid?></td>
 						<td><?=$ipaddress?></td>
-						<td><i class="icon icon-<?=$icon?>"></i>&nbsp;<?=$status?></td>
+						<td><i class="fa fa-<?=$icon?>"></i>&nbsp;<?=$status?></td>
 					</tr>
 <?php }?>
 				</tbody>
diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php
index 96d20b7..f255b22 100755
--- a/src/usr/local/www/diag_dump_states.php
+++ b/src/usr/local/www/diag_dump_states.php
@@ -209,7 +209,7 @@ print $form;
 			<td><?= $state ?></td>
 
 			<td>
-				<a class="btn icon icon-remove" data-entry="<?=$srcip?>|<?=$dstip?>"
+				<a class="btn fa fa-times" data-entry="<?=$srcip?>|<?=$dstip?>"
 					title="<?=sprintf(gettext('Remove all state entries from %s to %s'), $srcip, $dstip);?>"></a>
 			</td>
 		</tr>
diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php
index df0c222..d685f5e 100644
--- a/src/usr/local/www/firewall_nat.php
+++ b/src/usr/local/www/firewall_nat.php
@@ -234,11 +234,11 @@ foreach ($a_nat as $natent):
 <?php
 	if ($natent['associated-rule-id'] == "pass"):
 ?>
-							<i class="icon-play" title="<?=gettext("All traffic matching this NAT entry is passed")?>"></i>
+							<i class="fa fa-play" title="<?=gettext("All traffic matching this NAT entry is passed")?>"></i>
 <?php
 	elseif (!empty($natent['associated-rule-id'])):
 ?>
-							<i class="icon-random" title="<?=gettext("Firewall rule ID ")?><?=htmlspecialchars($natent['associated-rule-id'])?> . <?=gettext('is managed by this rule')?>"></i>
+							<i class="fa fa-random" title="<?=gettext("Firewall rule ID ")?><?=htmlspecialchars($natent['associated-rule-id'])?> . <?=gettext('is managed by this rule')?>"></i>
 <?php
 	endif;
 ?>
@@ -272,7 +272,7 @@ foreach ($a_nat as $natent):
 <?php
 	if (isset($alias['src'])):
 ?>
-							<i class='icon icon-pencil'></i></a>
+							<i class='fa fa-pencil'></i></a>
 <?php
 	endif;
 ?>
@@ -289,7 +289,7 @@ foreach ($a_nat as $natent):
 <?php
 	if (isset($alias['srcport'])):
 ?>
-							<i class='icon icon-pencil'></i></a>
+							<i class='fa fa-pencil'></i></a>
 <?php
 	endif;
 ?>
@@ -307,7 +307,7 @@ foreach ($a_nat as $natent):
 <?php
 	if (isset($alias['dst'])):
 ?>
-							<i class='icon icon-pencil'></i></a>
+							<i class='fa fa-pencil'></i></a>
 <?php
 	endif;
 ?>
@@ -324,7 +324,7 @@ foreach ($a_nat as $natent):
 <?php
 	if (isset($alias['dstport'])):
 ?>
-							<i class='icon icon-pencil'></i></a>
+							<i class='fa fa-pencil'></i></a>
 <?php
 	endif;
 ?>
@@ -414,8 +414,8 @@ if (count($a_nat) > 0) {
 <div>
 	<dl class="dl-horizontal responsive">
 		<dt><?=gettext('Legend')?></dt>					<dd></dd>
-		<dt><i class="icon icon-play"></i></dt>			<dd><?=gettext('Pass')?></dd>
-		<dt><i class="icon icon-random"></i></dt>		<dd><?=gettext('Linked rule')?></dd>
+		<dt><i class="fa fa-play"></i></dt>			<dd><?=gettext('Pass')?></dd>
+		<dt><i class="fa fa-random"></i></dt>		<dd><?=gettext('Linked rule')?></dd>
 	</dl>
 </div>
 
diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php
index 0cfdf73..17599c8 100644
--- a/src/usr/local/www/firewall_nat_1to1.php
+++ b/src/usr/local/www/firewall_nat_1to1.php
@@ -207,7 +207,7 @@ display_top_tabs($tab_array);
 
 						<td>
 							<a href="?act=toggle&amp;id=<?=$i?>">
-								<i class="<?= ($iconfn == "pass") ? "icon-ok":"icon-remove"?>" title="<?=gettext("click to toggle enabled/disabled status")?>"></i>
+								<i class="<?= ($iconfn == "pass") ? "fa-check":"fa-times"?>" title="<?=gettext("click to toggle enabled/disabled status")?>"></i>
 							</a>
 						</td>
 						<td>
diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php
index ab7a1e3..2126e75 100644
--- a/src/usr/local/www/firewall_nat_out.php
+++ b/src/usr/local/www/firewall_nat_out.php
@@ -348,12 +348,12 @@ print($form);
 <?php
 				if ($mode == "disabled" || $mode == "automatic"):
 ?>
-							<i class="<?= ($iconfn == "pass") ? "icon-ok":"icon-remove"?>" title="<?=gettext("This rule is being ignored")?>"></i>
+							<i class="<?= ($iconfn == "pass") ? "fa-check":"fa-times"?>" title="<?=gettext("This rule is being ignored")?>"></i>
 <?php
 				else:
 ?>
 							<a href="?act=toggle&amp;id=<?=$i?>">
-								<i class="<?= ($iconfn == "pass") ? "icon-ok":"icon-remove"?>" title="<?=gettext("Click to toggle enabled/disabled status")?>"></i>
+								<i class="<?= ($iconfn == "pass") ? "fa-check":"fa-hidden"?>" title="<?=gettext("Click to toggle enabled/disabled status")?>"></i>
 							</a>
 
 <?php
@@ -380,7 +380,7 @@ print($form);
 <?php
 						if (isset($alias['src'])):
 ?>
-							<i class='icon icon-pencil'></i></a>
+							<i class='fa fa-pencil'></i></a>
 <?php
 	endif;
 ?>
@@ -403,7 +403,7 @@ print($form);
 <?php
 							if (isset($alias['srcport'])):
 ?>
-							<i class='icon icon-pencil'></i></a>
+							<i class='fa fa-pencil'></i></a>
 <?php
 							endif;
 						}
@@ -429,7 +429,7 @@ print($form);
 <?php
 							if (isset($alias['dst'])):
 ?>
-							<i class='icon icon-pencil'></i></a>
+							<i class='fa fa-pencil'></i></a>
 <?php
 							endif;
 						}
@@ -453,7 +453,7 @@ print($form);
 <?php
 							if (isset($alias['dstport'])):
 ?>
-							<i class='icon icon-pencil'></i></a>
+							<i class='fa fa-pencil'></i></a>
 <?php
 							endif;
 						}
@@ -567,7 +567,7 @@ if ($mode == "automatic" || $mode == "hybrid"):
 ?>
 					<tr>
 						<td>
-							<i class="icon-ok" title="<?=gettext("automatic outbound nat")?>"></i>
+							<i class="fa-check" title="<?=gettext("automatic outbound nat")?>"></i>
 						</td>
 						<td>
 							<?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($natent['interface'])); ?>
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index 468792d..51af1f3 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -291,7 +291,7 @@ display_top_tabs($tab_array);
 ?>
 					<tr id="antilockout">
 						<td></td>
-						<td title="<?=gettext("traffic is passed")?>"><i class="icon icon-ok"></i></td>
+						<td title="<?=gettext("traffic is passed")?>"><i class="fa fa-check"></i></td>
 						<td>*</td>
 						<td>*</td>
 						<td>*</td>
@@ -309,7 +309,7 @@ display_top_tabs($tab_array);
 <?php if (isset($config['interfaces'][$if]['blockpriv'])): ?>
 					<tr id="frrfc1918">
 						<td></td>
-						<td title="<?=gettext("traffic is blocked")?>"><i class="icon icon-remove"></i></td>
+						<td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times"></i></td>
 						<td>*</td>
 						<td><?=gettext("RFC 1918 networks");?></td>
 						<td>*</td>
@@ -327,7 +327,7 @@ display_top_tabs($tab_array);
 <?php if (isset($config['interfaces'][$if]['blockbogons'])): ?>
 					<tr id="frrfc1918">
 					<td></td>
-						<td title="<?=gettext("traffic is blocked")?>"><i class="icon icon-remove"></i></td>
+						<td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times"></i></td>
 						<td>*</td>
 						<td><?=gettext("Reserved/not assigned by IANA");?></td>
 						<td>*</td>
@@ -363,7 +363,7 @@ for ($i = 0; isset($a_filter[$i]); $i++):
 
 	<?php
 		if ($filterent['type'] == "block") {
-			$iconfn = "remove";
+			$iconfn = "times";
 			$title_text = gettext("traffic is blocked");
 		} else if ($filterent['type'] == "reject") {
 			$iconfn = "fire";
@@ -372,20 +372,20 @@ for ($i = 0; isset($a_filter[$i]); $i++):
 			$iconfn = "filter";
 			$title_text = gettext("traffic is matched");
 		} else {
-			$iconfn = "ok";
+			$iconfn = "check";
 			$title_text = gettext("traffic is passed");
 		}
 	?>
 						<td title="<?=$title_text?>">
 
-							<i class="icon icon-<?=$iconfn?>"></i>
+							<i class="fa fa-<?=$iconfn?>"></i>
 	<?php
 		$isadvset = firewall_check_for_advanced_options($filterent);
 		if ($isadvset)
 			print '<i class="fa fa-cog" title="'. gettext("advanced setting") .': '. $isadvset .'"></i>';
 
 		if (isset($filterent['log']))
-			print '<i class="icon icon-tasks" title="'. gettext("traffic is logged") .'"></i>';
+			print '<i class="fa fa-tasks" title="'. gettext("traffic is logged") .'"></i>';
 	?>
 						</td>
 	<?php
@@ -679,11 +679,11 @@ for ($i = 0; isset($a_filter[$i]); $i++):
 		<dl class="dl-horizontal responsive">
 		<!-- Legend -->
 			<dt><?=gettext('Legend')?></dt>				<dd></dd>
-			<dt><i class="icon icon-ok"></i></dt>		<dd><?=gettext("Pass");?></dd>
-			<dt><i class="icon icon-filter"></i></dt>	<dd><?=gettext("Match");?></dd>
-			<dt><i class="icon icon-remove"></i></dt>	<dd><?=gettext("Block");?></dd>
-			<dt><i class="icon icon-fire"></i></dt>		<dd><?=gettext("Reject");?></dd>
-			<dt><i class="icon icon-tasks"></i></dt>	<dd> <?=gettext("Log");?></dd>
+			<dt><i class="fa fa-check"></i></dt>		<dd><?=gettext("Pass");?></dd>
+			<dt><i class="fa fa-filter"></i></dt>	<dd><?=gettext("Match");?></dd>
+			<dt><i class="fa fa-times"></i></dt>	<dd><?=gettext("Block");?></dd>
+			<dt><i class="fa fa-fire"></i></dt>		<dd><?=gettext("Reject");?></dd>
+			<dt><i class="fa fa-tasks"></i></dt>	<dd> <?=gettext("Log");?></dd>
 			<dt><i class="fa fa-cog"></i></dt>		<dd> <?=gettext("Advanced filter");?></dd>
 		</dl>
 
diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php
index 9726856..59441ad 100644
--- a/src/usr/local/www/index.php
+++ b/src/usr/local/www/index.php
@@ -290,7 +290,7 @@ pfSense_handle_custom_code("/usr/local/pkg/dashboard/pre_dashboard");
 	<div class="panel-heading"><?=gettext("Available Widgets"); ?>
 		<span class="widget-heading-icon">
 			<a data-toggle="collapse" href="#widget-available .panel-body" name="widgets-available">
-				<i class="icon-white icon-plus-sign"></i>
+				<i class="fa fa-plus-cirle"></i>
 			</a>
 		</span>
 	</div>
@@ -301,7 +301,7 @@ pfSense_handle_custom_code("/usr/local/pkg/dashboard/pre_dashboard");
 foreach ($widgets as $widgetname => $widgetconfig):
 	if ($widgetconfig['display'] == 'none'):
 ?>
-		<div class="col-sm-3"><a href="#" name="btnadd-<?=$widgetname?>"><i class="icon icon-plus"></i> <?=$widgetconfig['name']?></a></div>
+		<div class="col-sm-3"><a href="#" name="btnadd-<?=$widgetname?>"><i class="fa fa-plus"></i> <?=$widgetconfig['name']?></a></div>
 	<?php endif; ?>
 <?php endforeach; ?>
 			</div>
@@ -364,16 +364,16 @@ foreach ($widgets as $widgetname => $widgetconfig)
 		<div class="panel panel-default" id="widget-<?=$widgetname?>">
 			<div class="panel-heading">
 				<?=$widgetconfig['name']?>
-				<span class="icons widget-heading-icon">
+				<span class="widget-heading-icon">
 					<a data-toggle="collapse" href="#widget-<?=$widgetname?> .panel-footer" class="config hidden">
-						<i class="icon-white icon-wrench"></i>
+						<i class="fa fa-wrench"></i>
 					</a>
 					<a data-toggle="collapse" href="#widget-<?=$widgetname?> .panel-body">
 						<!--  actual icon is determined in css based on state of body -->
-						<i class="icon-white icon-plus-sign"></i>
+						<i class="fa fa-plus-circle"></i>
 					</a>
 					<a data-toggle="close" href="#widget-<?=$widgetname?>">
-						<i class="icon-white icon-remove-sign"></i>
+						<i class="fa fa-times-circle"></i>
 					</a>
 				</span>
 			</div>
@@ -419,12 +419,12 @@ events.push(function() {
 		var body = $(el).parents('.panel').children('.panel-body')
 		var isOpen = body.hasClass('in');
 
-		$(el).children('i').toggleClass('icon-plus-sign', !isOpen);
-		$(el).children('i').toggleClass('icon-minus-sign', isOpen);
+		$(el).children('i').toggleClass('fa-plus-circle', !isOpen);
+		$(el).children('i').toggleClass('fa-minus-circle', isOpen);
 
 		body.on('shown.bs.collapse', function(){
-			$(el).children('i').toggleClass('icon-minus-sign', true);
-			$(el).children('i').toggleClass('icon-plus-sign', false);
+			$(el).children('i').toggleClass('fa-minus-circle', true);
+			$(el).children('i').toggleClass('fa-plus-circle', false);
 
 			if($(el).closest('a').attr('name') != 'widgets-available') {
 				updateWidgets();
@@ -432,8 +432,8 @@ events.push(function() {
 		});
 
 		body.on('hidden.bs.collapse', function(){
-			$(el).children('i').toggleClass('icon-minus-sign', false);
-			$(el).children('i').toggleClass('icon-plus-sign', true);
+			$(el).children('i').toggleClass('fa-minus-circle', false);
+			$(el).children('i').toggleClass('fa-plus-circle', true);
 
 			if($(el).closest('a').attr('name') != 'widgets-available') {
 				updateWidgets();
diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php
index c88bbee..fb035a9 100644
--- a/src/usr/local/www/pkg_mgr.php
+++ b/src/usr/local/www/pkg_mgr.php
@@ -143,7 +143,7 @@ if(!$pkg_info || !is_array($pkg_info)):?>
 	<div class="panel-heading"><?=gettext('Search')?>
 		<span class="icons pull-right">
 			<a data-toggle="collapse" href="#search-panel .panel-body" name="search-panel">
-				<i class="icon-white icon-plus-sign"></i>
+				<i class="fa fa-plus-circle"></i>
 			</a>
 		</span>
 	</div>
@@ -242,12 +242,12 @@ events.push(function(){
 		var body = $(el).parents('.panel').children('.panel-body')
 		var isOpen = body.hasClass('in');
 
-		$(el).children('i').toggleClass('icon-plus-sign', !isOpen);
-		$(el).children('i').toggleClass('icon-minus-sign', isOpen);
+		$(el).children('i').toggleClass('fa-plus-circle', !isOpen);
+		$(el).children('i').toggleClass('fa-minus-circle', isOpen);
 
 		body.on('shown.bs.collapse', function(){
-			$(el).children('i').toggleClass('icon-minus-sign', true);
-			$(el).children('i').toggleClass('icon-plus-sign', false);
+			$(el).children('i').toggleClass('fa-minus-circle', true);
+			$(el).children('i').toggleClass('fa-plus-circle', false);
 		});
 	});
 
diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php
index 9dff157..7c17e28 100644
--- a/src/usr/local/www/services_dhcp.php
+++ b/src/usr/local/www/services_dhcp.php
@@ -1308,7 +1308,7 @@ if (!is_numeric($pool) && !($act == "newpool")) {
 					<tr>
 						<td align="center" ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if)?>&amp;id=<?=$i?>';">
 							<?php if (isset($mapent['arp_table_static_entry'])): ?>
-								<i class="icon icon-ok"></i>
+								<i class="fa fa-check"></i>
 							<?php endif; ?>
 						</td>
 						<td ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if)?>&amp;id=<?=$i?>';">
diff --git a/src/usr/local/www/status_dhcp_leases.php b/src/usr/local/www/status_dhcp_leases.php
index 036da36..a57fca7 100644
--- a/src/usr/local/www/status_dhcp_leases.php
+++ b/src/usr/local/www/status_dhcp_leases.php
@@ -389,11 +389,11 @@ foreach ($leases as $data):
 		continue;
 
 	if ($data['act'] == 'active')
-		$icon = 'icon-ok-circle';
+		$icon = 'fa-check-circle-o';
 	elseif ($data['act'] == 'expired')
-		$icon = 'icon-ban-circle';
+		$icon = 'fa-ban';
 	else
-		$icon = 'icon-remove-circle';
+		$icon = 'fa-times-circle-o';
 
 	$lip = ip2ulong($data['ip']);
 
@@ -419,7 +419,7 @@ foreach ($leases as $data):
 	$mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]);
 ?>
 				<tr>
-					<td><i class="icon <?=$icon?>"></i></td>
+					<td><i class="fa <?=$icon?>"></i></td>
 					<td><?=$data['ip']?></td>
 					<td>
 						<?=$mac?>
diff --git a/src/usr/local/www/status_dhcpv6_leases.php b/src/usr/local/www/status_dhcpv6_leases.php
index 3520197..54b634e 100644
--- a/src/usr/local/www/status_dhcpv6_leases.php
+++ b/src/usr/local/www/status_dhcpv6_leases.php
@@ -462,11 +462,11 @@ foreach ($leases as $data):
 		continue;
 
 	if ($data['act'] == 'active')
-		$icon = 'icon-ok-circle';
+		$icon = 'fa-check-circle-o';
 	elseif ($data['act'] == 'expired')
-		$icon = 'icon-ban-circle';
+		$icon = 'fa-ban';
 	else
-		$icon = 'icon-remove-circle';
+		$icon = 'fa-times-circle-o';
 
 	if ($data['act'] == "static") {
 		foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) {
@@ -490,7 +490,7 @@ foreach ($leases as $data):
 	$mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]);
 ?>
 			<tr>
-				<td><i class="icon <?=$icon?>"></i></td>
+				<td><i class="fa <?=$icon?>"></i></td>
 				<td><?=$data['ip']?></td>
 				<td><?=$data['iaid']?></td>
 				<td><?=$data['duid']?></td>
@@ -548,11 +548,11 @@ foreach ($prefixes as $data):
 		continue;
 
 	if ($data['act'] == 'active')
-		$icon = 'icon-ok-circle';
+		$icon = 'fa-check-circle-o';
 	elseif ($data['act'] == 'expired')
-		$icon = 'icon-ban-circle';
+		$icon = 'fa-ban';
 	else
-		$icon = 'icon-remove-circle';
+		$icon = 'fa-times-circle-o';
 
 	if ($data['act'] == "static") {
 		foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) {
@@ -577,7 +577,7 @@ foreach ($prefixes as $data):
 	}
 ?>
 			<tr>
-				<td><i class="icon <?=$icon?>"></i></td>
+				<td><i class="fa <?=$icon?>"></i></td>
 				<td>
 					<?=$data['prefix']?>
 <? if ($mappings[$data['iaid'] . $data['duid']]): ?>
diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php
index 006bd17..38d7921 100644
--- a/src/usr/local/www/status_openvpn.php
+++ b/src/usr/local/www/status_openvpn.php
@@ -200,7 +200,7 @@ include("head.inc"); ?>
 							   onclick="killClient('<?php echo $server['mgmt']; ?>', '<?php echo $conn['remote_host']; ?>');" style="cursor:pointer;"
 							   id="<?php echo "i:{$server['mgmt']}:{$conn['remote_host']}"; ?>"
 							   title="<?php echo gettext("Kill client connection from") . " " . $conn['remote_host']; ?>">
-							<i class="icon icon-remove"></i>
+							<i class="fa fa-times"></i>
 							</a>
 						</td>
 					</tr>
diff --git a/src/usr/local/www/system_gateways.php b/src/usr/local/www/system_gateways.php
index 3192de2..a52a027 100644
--- a/src/usr/local/www/system_gateways.php
+++ b/src/usr/local/www/system_gateways.php
@@ -271,19 +271,19 @@ display_top_tabs($tab_array);
 <?php
 foreach ($a_gateways as $i => $gateway):
 	if (isset($gateway['inactive']))
-		$icon = 'icon-remove-circle';
+		$icon = 'fa-times-circle-o';
 	elseif (isset($gateway['disabled']))
-		$icon = 'icon-ban-circle';
+		$icon = 'fa-ban';
 	else
-		$icon = 'icon-ok-circle';
+		$icon = 'fa-check-circle-o';
 
 	if (isset($gateway['inactive']))
 		$title = gettext("This gateway is inactive because interface is missing");
 	else
 		$title = '';
 ?>
-	<tr<?=($icon != 'icon-ok-circle')? ' class="disabled"' : ''?>>
-		<td title="<?=$title?>"><i class="icon <?=$icon?>"></i></td>
+	<tr<?=($icon != 'fa-check-circle-o')? ' class="disabled"' : ''?>>
+		<td title="<?=$title?>"><i class="fa <?=$icon?>"></i></td>
 		<td>
 			<?=$gateway['name']?>
 <?php
diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php
index 66296fa..1f3f6d9 100644
--- a/src/usr/local/www/system_routes.php
+++ b/src/usr/local/www/system_routes.php
@@ -279,12 +279,12 @@ display_top_tabs($tab_array);
 <?php
 foreach ($a_routes as $i => $route):
 	if (isset($route['disabled']))
-		$icon = 'icon-ban-circle';
+		$icon = 'fa-ban';
 	else
-		$icon = 'icon-ok-circle';
+		$icon = 'fa-check-circle-o';
 ?>
-	<tr<?=($icon != 'icon-ok-circle')? ' class="disabled"' : ''?>>
-		<td><i class="icon <?=$icon?>"></i></td>
+	<tr<?=($icon != 'fa-check-circle-o')? ' class="disabled"' : ''?>>
+		<td><i class="fa <?=$icon?>"></i></td>
 		<td>
 			<?=strtolower($route['network'])?>
 		</td>
diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php
index 88a040d..5950fb4 100644
--- a/src/usr/local/www/system_usermanager.php
+++ b/src/usr/local/www/system_usermanager.php
@@ -499,7 +499,7 @@ foreach($a_user as $i => $userent):
 	else
 		$usrimg = 'user';
 ?>
-					<i class="icon icon-<?=$usrimg?>"></i>
+					<i class="fa fa-<?=$usrimg?>"></i>
 					<?=htmlspecialchars($userent['name'])?>
 				</td>
 				<td><?=htmlspecialchars($userent['descr'])?></td>
diff --git a/src/usr/local/www/widgets/widgets/ipsec.widget.php b/src/usr/local/www/widgets/widgets/ipsec.widget.php
index 74276d5..e0baa12 100644
--- a/src/usr/local/www/widgets/widgets/ipsec.widget.php
+++ b/src/usr/local/www/widgets/widgets/ipsec.widget.php
@@ -192,9 +192,9 @@ if (isset($config['ipsec']['phase2'])): ?>
 			<td><?php echo htmlspecialchars($ipsec['descr']);?></td>
 			<td>
 				<?php if ($ipsec['status'] == "true"): ?>
-					<i class="icon icon-chevron-up"></i>
+					<i class="fa fa-chevron-up"></i>
 				<?php else: ?>
-					<i class="icon icon-chevron-down"></i>
+					<i class="fa fa-chevron-down"></i>
 				<?php endif; ?>
 			</td>
 		</tr>
diff --git a/src/usr/local/www/widgets/widgets/log.widget.php b/src/usr/local/www/widgets/widgets/log.widget.php
index 5811ff0..35dd074 100644
--- a/src/usr/local/www/widgets/widgets/log.widget.php
+++ b/src/usr/local/www/widgets/widgets/log.widget.php
@@ -147,13 +147,13 @@ else
 		}
 
 		if ($filterent['act'] == "block")
-			$iconfn = "remove";
+			$iconfn = "times";
 		else if ($filterent['act'] == "reject")
 			$iconfn = "fire";
 		else if ($filterent['act'] == "match")
 			$iconfn = "filter";
 		else
-			$iconfn = "ok";
+			$iconfn = "check";
 
 		$rule = find_rule_by_number($filterent['rulenum'], $filterent['tracker'], $filterent['act']);
 
@@ -166,7 +166,7 @@ else
 			role="button" data-toggle="popover" data-trigger="hover"
 				data-title="Rule that triggered this action"
 				data-content="<?=htmlspecialchars($rule)?>"> <i
-					class="icon icon-<?=$iconfn?>"></i>
+					class="fa fa-<?=$iconfn?>"></i>
 			</a></td>
 			<td title="<?=htmlspecialchars($filterent['time'])?>"><?=substr(htmlspecialchars($filterent['time']),0,-3)?></td>
 			<td><?=htmlspecialchars($filterent['interface']);?></td>
@@ -302,4 +302,4 @@ function outputrule(req) {
 	alert(req.content);
 }
 
-</script>
\ No newline at end of file
+</script>
diff --git a/src/usr/local/www/widgets/widgets/openvpn.widget.php b/src/usr/local/www/widgets/widgets/openvpn.widget.php
index fae937a..b97c2e4 100644
--- a/src/usr/local/www/widgets/widgets/openvpn.widget.php
+++ b/src/usr/local/www/widgets/widgets/openvpn.widget.php
@@ -168,7 +168,7 @@ $clients = openvpn_get_active_clients();
 						<?=$conn['remote_host'];?>
 					</td>
 					<td>
-						<i class="icon icon-remove-sign" onclick="killClient('<?=$server['mgmt']; ?>', '<?=$conn['remote_host']; ?>');" style='cursor:pointer;'
+						<i class="fa fa-times-circle" onclick="killClient('<?=$server['mgmt']; ?>', '<?=$conn['remote_host']; ?>');" style='cursor:pointer;'
 							name='<?php echo "i:{$server['mgmt']}:{$conn['remote_host']}"; ?>'
 							title='Kill client connection from <?php echo $conn['remote_host']; ?>'>
 						</i>
@@ -215,10 +215,10 @@ $clients = openvpn_get_active_clients();
 					<?php
 					if ($sk_server['status'] == "up") {
 						/* tunnel is up */
-						echo '<i class="icon icon-arrow-up"></i>';
+						echo '<i class="fa fa-arrow-up"></i>';
 					} else {
 						/* tunnel is down */
-						echo '<i class="icon icon-arrow-down"></i>';
+						echo '<i class="fa fa-arrow-down"></i>';
 					}
 ?>
 					</td>
@@ -265,10 +265,10 @@ $clients = openvpn_get_active_clients();
 				<?php
 				if ($client['status'] == "up") {
 					/* tunnel is up */
-					echo '<i class="icon icon-arrow-up"></i>';
+					echo '<i class="fa fa-arrow-up"></i>';
 				} else {
 					/* tunnel is down */
-					echo '<i class="icon icon-arrow-down"></i>';
+					echo '<i class="fa fa-arrow-down"></i>';
 				}
 
 ?>
diff --git a/src/usr/local/www/widgets/widgets/services_status.widget.php b/src/usr/local/www/widgets/widgets/services_status.widget.php
index ab74aa0..d942c10 100644
--- a/src/usr/local/www/widgets/widgets/services_status.widget.php
+++ b/src/usr/local/www/widgets/widgets/services_status.widget.php
@@ -100,7 +100,7 @@ if (count($services) > 0) {
 		$service_desc = explode(".",$service['description']);
 ?>
 		<tr>
-			<td><i class="icon icon-<?=get_service_status($service)? 'ok' : 'remove'?>-sign"></i></td>
+			<td><i class="fa fa-<?=get_service_status($service)? 'check' : 'times'?>-circle"></i></td>
 			<td><?=$service['name']?></td>
 			<td><?=$service_desc[0]?></td>
 			<td><?=get_service_control_GET_links($service)?></td>
@@ -134,4 +134,4 @@ if (count($services) > 0) {
 			<button type="submit" class="btn btn-default">Save</button>
 		</div>
 	</div>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/usr/local/www/widgets/widgets/smart_status.widget.php b/src/usr/local/www/widgets/widgets/smart_status.widget.php
index 5c61e12..5140487 100644
--- a/src/usr/local/www/widgets/widgets/smart_status.widget.php
+++ b/src/usr/local/www/widgets/widgets/smart_status.widget.php
@@ -98,7 +98,7 @@ if (count($devs) > 0)  {
 		}
 ?>
 		<tr>
-			<td><i class="icon icon-<?=$icon?>-sign"></i></td>
+			<td><i class="fa fa-<?=$icon?>-circle"></i></td>
 			<td><?=$dev?></td>
 			<td><?=$dev_ident?></td>
 			<td><?=ucfirst($dev_state)?></td>