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 578f0b453..81e82bbe2 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -5,11 +5,17 @@
         <Logout VisibleName="Logout" url="/index.php?logout"/>
     </User>
     <System order="1" VisibleName="System" cssClass="glyphicon glyphicon-dashboard">
-        <Certificates url="/system_certmanager.php">
-            <Certificates url="/system_certmanager.php*"/>
-            <CertificateAuthority VisibleName="Certificate Authority" url="/system_camanager.php*"/>
-            <CertificationRevocation VisibleName="Certification Revocation" url="/system_crlmanager.php*"/>
-        </Certificates>
+        <CertificateManager VisibleName="Certificate Manager" cssClass="fa fa-certificate">
+            <Certificates url="/system_certmanager.php">
+                <workAround url="/system_certmanager.php*"/>
+            </Certificates>
+            <Authorities url="/system_camanager.php">
+                <workAround url="/system_camanager.php*"/>
+            </Authorities>
+            <Revocation url="/system_crlmanager.php">
+                <workAround url="/system_crlmanager.php*"/>
+            </Revocation>
+        </CertificateManager>
         <ConfigManager VisibleName="Config Manager" cssClass="fa fa-history">
             <History url="/diag_confbak.php">
                 <none url="/diag_confbak.php*"/>
diff --git a/src/www/system_camanager.php b/src/www/system_camanager.php
index 715331f7b..891e9d6d0 100644
--- a/src/www/system_camanager.php
+++ b/src/www/system_camanager.php
@@ -470,9 +470,6 @@ function method_change() {
             ?>
 
             <section class="col-xs-12">
-
-                <? include('system_certificates_tabs.inc'); ?>
-
                 <div class="content-box tab-content table-responsive" style="overflow: auto;">
 
 				<?php if ($act == "new" || $act == "edit" || $act == gettext("Save") || isset($input_errors)) :
diff --git a/src/www/system_certificates_tabs.inc b/src/www/system_certificates_tabs.inc
deleted file mode 100644
index ca98e0039..000000000
--- a/src/www/system_certificates_tabs.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$active_tab = isset($active_tab) ? $active_tab : $_SERVER['PHP_SELF'];
-
-$tab_array = array();
-$tab_array[] = array(gettext("Certificates"), $active_tab == "/system_certmanager.php", "system_certmanager.php");
-$tab_array[] = array(gettext("Certificate Authority"), $active_tab == "/system_camanager.php", "system_camanager.php");
-$tab_array[] = array(gettext("Certificate Revocation"), $active_tab == "/system_crlmanager.php", "system_crlmanager.php");
-
-display_top_tabs($tab_array);
diff --git a/src/www/system_certmanager.php b/src/www/system_certmanager.php
index 508b546b2..67d92cab7 100644
--- a/src/www/system_certmanager.php
+++ b/src/www/system_certmanager.php
@@ -665,9 +665,6 @@ endif; ?>
             }
             ?>
             <section class="col-xs-12">
-
-                <?php include('system_certificates_tabs.inc'); ?>
-
                 <div class="content-box tab-content table-responsive">
 
 					<?php if ($act == "new" || ((isset($_POST['save']) && $_POST['save'] == gettext("Save")) && $input_errors)) :
diff --git a/src/www/system_crlmanager.php b/src/www/system_crlmanager.php
index b170c3f14..764b17e4d 100644
--- a/src/www/system_crlmanager.php
+++ b/src/www/system_crlmanager.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2010 Jim Pingle
@@ -357,9 +358,6 @@ include("head.inc");
             }
             ?>
             <section class="col-xs-12">
-
-                <? include('system_certificates_tabs.inc'); ?>
-
                 <div class="content-box tab-content">
 
 				<?php if ($act == "new" || $act == gettext("Save") || (isset($input_errors) && count($input_errors)) ) :