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 92727e305..facb394fb 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -51,12 +51,15 @@
         </Assign>
     </Interfaces>
     <Firewall order="3" cssClass="glyphicon glyphicon-fire">
-        <Aliases url="/firewall_aliases.php">
-            <AliasesEdit url="/firewall_aliases_edit.php*"/>
-            <IP url="/firewall_aliases.php?tab=ip"/>
-            <Ports url="/firewall_aliases.php?tab=port"/>
-            <URLs url="/firewall_aliases.php?tab=url"/>
-            <All url="/firewall_aliases.php?tab=all"/>
+        <Aliases cssClass="fa fa-list-alt">
+            <IP order="100" url="/firewall_aliases.php?tab=ip"/>
+            <Ports order="200"  url="/firewall_aliases.php?tab=port"/>
+            <URLs  order="300"  url="/firewall_aliases.php?tab=url"/>
+            <All order="400"  url="/firewall_aliases.php?tab=all">
+              <AliasesEdit url="/firewall_aliases_edit.php*"/>
+              <Import url="/firewall_aliases_import.php"/>
+              <none url="/firewall_aliases.php"/>
+            </All>
         </Aliases>
         <NAT url="/firewall_nat.php">
             <NatEdit url="/firewall_nat_edit.php*"/>
diff --git a/src/www/firewall_aliases.php b/src/www/firewall_aliases.php
index 590988da5..4078bf371 100644
--- a/src/www/firewall_aliases.php
+++ b/src/www/firewall_aliases.php
@@ -180,15 +180,7 @@ $( document ).ready(function() {
 <?php print_info_box_np(gettext("The alias list has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));?>
 <?php endif; ?>
         <section class="col-xs-12">
-<?php
-              $tab_array = array();
-              $tab_array[] = array(gettext("IP"),($selected_tab=="ip" ? true : ($selected_tab=="host" ? true : ($selected_tab == "network" ? true : false))), "/firewall_aliases.php?tab=ip");
-              $tab_array[] = array(gettext("Ports"), ($selected_tab=="port"? true : false), "/firewall_aliases.php?tab=port");
-              $tab_array[] = array(gettext("URLs"), ($selected_tab=="url"? true : false), "/firewall_aliases.php?tab=url");
-              $tab_array[] = array(gettext("All"), ($selected_tab=="all"? true : false), "/firewall_aliases.php?tab=all");
-              display_top_tabs($tab_array);
-?>
-          <div class="tab-content content-box col-xs-12">
+          <div class="content-box">
             <form action="firewall_aliases.php" method="post" name="iform" id="iform">
               <input type="hidden" name="tab" value="<?=$selected_tab;?>" />
               <input type="hidden" name="id" value="" id="delId"/>