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 6935b2893..eaffe48f5 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -220,8 +220,11 @@
         </PPPoEServer>
         <Proxy VisibleName="Proxy Server" url="/ui/proxy/"/>
         <SNMP VisibleName="SNMP" url="/services_snmp.php"/>
-        <UPnP VisibleName="Universal Plug and Play" url="/services_upnp.php">
-            <UPnPEdit url="/services_upnp.php?*"/>
+        <UPnP VisibleName="Universal Plug and Play" cssClass="fa fa-plug">
+            <Settings url="/services_upnp.php">
+                <Edit url="/services_upnp.php?*"/>
+            </Settings>
+            <Status url="/status_upnp.php"/>
         </UPnP>
         <WoL VisibleName="Wake on LAN" url="/services_wol.php">
             <WoLEdit url="/services_wol_edit.php*"/>
@@ -316,7 +319,6 @@
         <TrafficGraphs VisibleName="Traffic Graphs" url="/status_graph.php">
             <TrafficGraphsDetails url="/status_graph.php?*"/>
         </TrafficGraphs>
-        <UPnP VisibleName="Universal Plug and Play" url="/status_upnp.php"/>
     </Status>
     <Help order="8" cssClass="glyphicon glyphicon-question-sign">
         <AboutThisPage VisibleName="About this Page" url="/help.php" IsExternal="Y"/>
diff --git a/src/pkg/miniupnpd.xml b/src/pkg/miniupnpd.xml
index 0eb4db482..2737f9191 100644
--- a/src/pkg/miniupnpd.xml
+++ b/src/pkg/miniupnpd.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <packagegui>
-	<title>Services: Universal Plug and Play</title>
+	<title>Services: Universal Plug and Play: Settings</title>
 	<name>miniupnpd</name>
 	<version>20100712</version>
 	<service>
diff --git a/src/www/status_upnp.php b/src/www/status_upnp.php
index 3e300ddd5..209083307 100644
--- a/src/www/status_upnp.php
+++ b/src/www/status_upnp.php
@@ -43,7 +43,7 @@ exec("/sbin/pfctl -aminiupnpd -sn", $rdr_entries, $pf_ret);
 $now = time();
 $year = date("Y");
 
-$pgtitle = array(gettext('Status'), gettext('Universal Plug and Play'));
+$pgtitle = array(gettext('Services'), gettext('Universal Plug and Play'), gettext('Status'));
 $shortcut_section = "upnp";
 include("head.inc");
 ?>