diff --git a/includes/html/pages/apps/default.inc.php b/includes/html/pages/apps/default.inc.php
index 9dc9fd5c8c..d974a353a2 100644
--- a/includes/html/pages/apps/default.inc.php
+++ b/includes/html/pages/apps/default.inc.php
@@ -52,5 +52,3 @@ foreach ($apps as $app) {
     echo '</div>';
     echo '</div>';
 }//end foreach
-
-echo '</table>';
diff --git a/includes/html/pages/device/apps/certificate.inc.php b/includes/html/pages/device/apps/certificate.inc.php
index b0e4903c77..07a93b80a0 100644
--- a/includes/html/pages/device/apps/certificate.inc.php
+++ b/includes/html/pages/device/apps/certificate.inc.php
@@ -17,7 +17,7 @@ foreach ($domain_list as $label) {
     $cert_name = $label;
 
     if ($vars['cert_name'] == $cert_name) {
-        $label = sprintf('⚫ %s', $label);
+        $label = '<span class="pagemenu-selected">' . $label . '</span>';
     }
 
     array_push($cert_name_list, generate_link($label, $link_array, ['cert_name' => $cert_name]));
diff --git a/includes/html/pages/device/apps/chronyd.inc.php b/includes/html/pages/device/apps/chronyd.inc.php
index d5d05ddf4e..d6462179a8 100644
--- a/includes/html/pages/device/apps/chronyd.inc.php
+++ b/includes/html/pages/device/apps/chronyd.inc.php
@@ -19,7 +19,7 @@ while (isset($sources[$sources_ctr])) {
     $label = $source;
 
     if ($vars['source'] == $source) {
-        $label = '>>' . $source . '<<';
+        $label = '<span class="pagemenu-selected">' . $source . '</span>';
     }
 
     $sources_ctr++;
diff --git a/includes/html/pages/device/apps/docker.inc.php b/includes/html/pages/device/apps/docker.inc.php
index fdf242d25b..a431264ef3 100644
--- a/includes/html/pages/device/apps/docker.inc.php
+++ b/includes/html/pages/device/apps/docker.inc.php
@@ -17,7 +17,7 @@ foreach ($domain_list as $label) {
     $container = $label;
 
     if ($vars['container'] == $container) {
-        $label = sprintf('⚫ %s', $label);
+        $label = '<span class="pagemenu-selected">' . $label . '</span>';
     }
 
     array_push($containers_list, generate_link($label, $link_array, ['container' => $container]));
diff --git a/includes/html/pages/device/apps/mdadm.inc.php b/includes/html/pages/device/apps/mdadm.inc.php
index 91841d859f..dd82385f6e 100644
--- a/includes/html/pages/device/apps/mdadm.inc.php
+++ b/includes/html/pages/device/apps/mdadm.inc.php
@@ -17,7 +17,7 @@ foreach ($mdadm_arrays as $label) {
     $array = $label;
 
     if ($vars['array'] == $array) {
-        $label = sprintf('⚫ %s', $label);
+        $label = '<span class="pagemenu-selected">' . $label . '</span>';
     }
 
     array_push($array_list, generate_link($label, $link_array, ['array' => $array]));
diff --git a/includes/html/pages/device/apps/portactivity.inc.php b/includes/html/pages/device/apps/portactivity.inc.php
index 977100675b..958b9f3e9d 100644
--- a/includes/html/pages/device/apps/portactivity.inc.php
+++ b/includes/html/pages/device/apps/portactivity.inc.php
@@ -20,7 +20,7 @@ while (isset($ports[$ports_int])) {
     $label = $ports[$ports_int];
 
     if ($vars['port'] == $port) {
-        $label = '>>' . $port . '<<';
+        $label = '<span class="pagemenu-selected">' . $port . '</span>';
     }
 
     $ports_int++;
diff --git a/includes/html/pages/device/apps/postgres.inc.php b/includes/html/pages/device/apps/postgres.inc.php
index e009d6376d..f359e6a5bc 100644
--- a/includes/html/pages/device/apps/postgres.inc.php
+++ b/includes/html/pages/device/apps/postgres.inc.php
@@ -19,7 +19,7 @@ while (isset($databases[$db_int])) {
     $label = $db;
 
     if ($vars['database'] == $db) {
-        $label = '>>' . $db . '<<';
+        $label = '<span class="pagemenu-selected">' . $db . '</span>';
     }
 
     $db_int++;
diff --git a/includes/html/pages/device/apps/smart.inc.php b/includes/html/pages/device/apps/smart.inc.php
index 1dddca982c..67ce029c5b 100644
--- a/includes/html/pages/device/apps/smart.inc.php
+++ b/includes/html/pages/device/apps/smart.inc.php
@@ -17,7 +17,7 @@ foreach ($disks as $label) {
     $disk = $label;
 
     if ($vars['disk'] == $disk) {
-        $label = sprintf('⚫ %s', $label);
+        $label = '<span class="pagemenu-selected">' . $label . '</span>';
     }
 
     array_push($drives, generate_link($label, $link_array, ['disk'=>$disk]));
diff --git a/includes/html/pages/device/apps/zfs.inc.php b/includes/html/pages/device/apps/zfs.inc.php
index 5c2e9c40e4..03e6c5805a 100644
--- a/includes/html/pages/device/apps/zfs.inc.php
+++ b/includes/html/pages/device/apps/zfs.inc.php
@@ -19,7 +19,7 @@ while (isset($pools[$pool_int])) {
     $label = $pool;
 
     if ($vars['pool'] == $pool) {
-        $label = '>>' . $pool . '<<';
+        $label = '<span class="pagemenu-selected">' . $pool . '</span>';
     }
 
     $pool_int++;