diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml
index d1819de89..8a08c753d 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/Menu/Menu.xml
@@ -156,7 +156,7 @@
         <Aliases url="/ui/firewall/alias" cssClass="fa fa-list-alt fa-fw">
             <Edit url="/ui/firewall/alias/*" visibility="hidden"/>
         </Aliases>
-        <Categories url="/ui/firewall/category" cssClass="fa fa-list-alt fa-fw"/>
+        <Categories url="/ui/firewall/category" cssClass="fa fa-tags fa-fw"/>
         <Groups url="/interfaces_groups.php" cssClass="fa fa-sitemap fa-fw">
             <Edit url="/interfaces_groups_edit.php*" visibility="hidden"/>
         </Groups>
@@ -186,11 +186,11 @@
             <Advanced url="/system_advanced_firewall.php"/>
         </Settings>
         <Diagnostics order="500" cssClass="fa fa-medkit fa-fw">
-            <pfInfo order="30" url="/diag_pf_info.php" VisibleName="pfInfo"/>
-            <pfTop order="40" url="/diag_system_pftop.php" VisibleName="pfTop"/>
-            <pfTables order="50" url="/ui/firewall/alias_util/"/>
-            <StatesDump order="70" VisibleName="States Dump" url="/ui/diagnostics/firewall/states"/>
-            <StatesReset order="80" VisibleName="States Reset" url="/diag_resetstate.php"/>
+            <Aliases url="/ui/firewall/alias_util/"/>
+            <States url="/ui/diagnostics/firewall/states"/>
+            <StatesReset VisibleName="States Reset" url="/diag_resetstate.php"/>
+            <pfInfo url="/diag_pf_info.php"/>
+            <pfTop url="/diag_system_pftop.php"/>
         </Diagnostics>
         <LogFiles order="400" VisibleName="Log Files" cssClass="fa fa-eye fa-fw">
             <Live VisibleName="Live View" url="/ui/diagnostics/firewall/log"/>