diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
index cb11b0389..7b3ce994d 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php
@@ -214,7 +214,8 @@ class ControllerBase extends ControllerRoot
             $menu->appendItem('Interfaces', $key, array(
                 'url' => '/interfaces.php?if='. $key,
                 'order' => ($ordid++),
-                'visiblename' => $node->descr ? $node->descr : strtoupper($key)
+                'visiblename' => $node->descr ? $node->descr : strtoupper($key),
+                'cssclass' => 'fa fa-sitemap',
             ));
         }
         unset($ifarr);
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index 76b76d584..d79058ffb 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -278,7 +278,7 @@
         </WoL>
     </Services>
     <VPN order="4" cssClass="glyphicon glyphicon-lock">
-        <IPsec cssClass="fa fa-road">
+        <IPsec cssClass="glyphicon glyphicon-lock">
             <Tunnels order="10" VisibleName="Tunnel Settings" url="/vpn_ipsec.php">
                 <Phase1 url="/vpn_ipsec_phase1.php*"/>
                 <Phase2 url="/vpn_ipsec_phase2.php*"/>
@@ -296,13 +296,13 @@
             <SPD order="80" VisibleName="Security Policy Database" url="/diag_ipsec_spd.php"/>
             <Log order="90" VisibleName="Log File" url="/diag_logs_ipsec.php"/>
         </IPsec>
-        <L2TP cssClass="fa fa-road">
+        <L2TP cssClass="glyphicon glyphicon-lock">
             <Settings order="10" url="/vpn_l2tp.php"/>
             <Users order="20"  url="/vpn_l2tp_users.php">
                 <Edit url="/vpn_l2tp_users_edit.php*"/>
             </Users>
         </L2TP>
-        <OpenVPN cssClass="fa fa-road">
+        <OpenVPN cssClass="glyphicon glyphicon-lock">
             <Server order="10" VisibleName="Server Settings" url="/vpn_openvpn_server.php">
                 <Edit url="/vpn_openvpn_server.php?*"/>
             </Server>
diff --git a/src/www/diag_routes.php b/src/www/diag_routes.php
index dc16b9702..d64885413 100644
--- a/src/www/diag_routes.php
+++ b/src/www/diag_routes.php
@@ -121,8 +121,9 @@ include('head.inc');
 				j++;
 			}
 			// The 'Expire' field might be blank
-			if (j == (elements - 1))
+			if (j == (elements - 2)) {
 				tmp += '<td class="listr">&nbsp;<\/td>' + "\n";
+			}
 			tmp += '<\/tr>' + "\n";
 			if (i == 0)
 				thead += tmp;
@@ -156,22 +157,18 @@ include('head.inc');
 
 				<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
 
-                <div class="content-box">
-
-                    <header class="content-box-head container-fluid">
-				        <h3><?=gettext("Routing tables"); ?></h3>
-				    </header>
-
-				    <div class="content-box-main">
-
+                <div class="tab-content content-box col-xs-12">
 						<form action="<?=$_SERVER['REQUEST_URI'];?>" method="post" name="iform" id="iform">
 					    <div class="table-responsive">
 				        <table class="table table-striped __nomb">
-					        <tbody>
+				<tr>
+				        <td colspan="2" valign="top" class="listtopic"><strong><?= gettext('Routing tables') ?></strong></td>
+				</tr>
 						        <tr>
 						          <td><?=gettext("Name resolution");?></td>
 						          <td><input type="checkbox" class="formfld" id="resolve" name="resolve" value="yes" <?php if ($_POST['resolve'] == 'yes') echo "checked=\"checked\""; ?> />&nbsp;<?=gettext("Enable");?>
-										<p class="text-muted"><em><small><?=gettext("Enable this to attempt to resolve names when displaying the tables.");?></small></em></p>
+										<p class="text-muted"><em><small><?=gettext("Enable this to attempt to resolve names when displaying the tables.");?><br/>
+										  <?= gettext('Note:') ?> <?=gettext("By enabling name resolution, the query should take a bit longer. You can stop it at any time by clicking the Stop button in your browser.");?></small></em></p>
 									  </td>
 						        </tr>
 						        <tr>
@@ -197,16 +194,12 @@ include('head.inc');
 						          <td>&nbsp;</td>
 						          <td>
 							          <input type="button" class="btn btn-primary" name="update" onclick="update_all_routes();" value="<?=gettext("Update"); ?>" />
-										  <p class="text-muted"><em><small><span class="text-danger"><strong><?=gettext("Note:")?></strong></span> <?=gettext("By enabling name resolution, the query should take a bit longer. You can stop it at any time by clicking the Stop button in your browser.");?></small></em></p>
 							      </td>
 						        </tr>
-					        </tbody>
 					    </table>
 					    </div>
 					    </form>
 				    </div>
-
-				</div>
 			</section>
 
 			<section class="col-xs-12">
diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc
index 3d53ab1c5..582b45ad3 100644
--- a/src/www/fbegin.inc
+++ b/src/www/fbegin.inc
@@ -81,7 +81,8 @@ foreach ($ifarr as $key => $node) {
     $menu->appendItem('Interfaces', $key, array(
         'url' => '/interfaces.php?if=' . $key,
         'order' => ($ordid++),
-        'visiblename' => $node->descr ? $node->descr : strtoupper($key)
+        'visiblename' => $node->descr ? $node->descr : strtoupper($key),
+        'cssclass' => 'fa fa-sitemap',
     ));
 }
 unset($ifarr);
diff --git a/src/www/system_routes.php b/src/www/system_routes.php
index 501441686..33026b655 100644
--- a/src/www/system_routes.php
+++ b/src/www/system_routes.php
@@ -228,8 +228,6 @@ endif; ?>
 
 					<div class="tab-content content-box col-xs-12">
 
-				    <div class="container-fluid">
-
 	                        <form action="system_routes.php" method="post" name="iform" id="iform">
 
 
@@ -384,13 +382,14 @@ endforeach; ?>
 											</table>
 										</td>
 									</tr>
+									<tr><td colspan="7">
+	                        <?= gettext('Note:') ?>
+				<?=gettext("Do not enter static routes for networks assigned on any interface of this firewall.  Static routes are only used for networks reachable via a different router, and not reachable via your default gateway.");?>
+									</td></tr>
 								</table>
 	                        </div>
-	                        <p><b><?=gettext("Note:");
-?></b>  <?=gettext("Do not enter static routes for networks assigned on any interface of this firewall.  Static routes are only used for networks reachable via a different router, and not reachable via your default gateway.");?></p>
 
 	                        </form>
-				    </div>
 					</div>
 			    </section>
 			</div>