diff --git a/public/styles/style.css b/public/styles/style.css
index dc912e08..f5c8436b 100644
--- a/public/styles/style.css
+++ b/public/styles/style.css
@@ -3048,7 +3048,6 @@ a {
 .tagSpan {
     background-color: lightgray;
     padding: 3px;
-    margin-right: 4px;
     border-radius: 5px;
 }
 
diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars
index 0dab7a59..31a6d0cc 100644
--- a/views/default-mobile.handlebars
+++ b/views/default-mobile.handlebars
@@ -664,6 +664,16 @@
             height: 28px;
             width: 28px;
         }
+
+        .tagSpan {
+            background-color: lightgray;
+            padding: 3px;
+            border-radius: 5px;
+        }
+
+        .night .tagSpan {
+            color: black;
+        }
     </style>
 </head>
 <body id="body" onload="if (typeof(startup) !== 'undefined') startup();" style="overflow-y:hidden;margin:0;padding:0;border:0;font-size:13px;font-family:\'Trebuchet MS\', Arial, Helvetica, sans-serif">
@@ -3633,7 +3643,7 @@
 
                 // Node tags
                 var groupingTags = '<i>' + "None" + '</i>';
-                if (node.tags != null) { groupingTags = ''; for (var i in node.tags) { groupingTags += '<span style="background-color:lightgray;padding:3px;border-radius:5px">' + EscapeHtml(node.tags[i]) + '</span> '; } }
+                if (node.tags != null) { groupingTags = ''; for (var i in node.tags) { groupingTags += '<span class=tagSpan>' + EscapeHtml(node.tags[i]) + '</span> '; } }
                 if ((meshrights & 4) != 0) {
                     x += addDeviceAttribute("Tags", '<span onclick=showEditNodeValueDialog(3) style=cursor:pointer;color:black>' + groupingTags + '</span>');
                 } else {
diff --git a/views/default.handlebars b/views/default.handlebars
index 2427197f..b5919666 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -4713,7 +4713,7 @@
                     var groupingTags = '';
                     if (node.tags != null) { 
                         for (var i in node.tags) {
-                            groupingTags += '<span style="background-color:lightgray;padding:3px;border-radius:5px">' + EscapeHtml(node.tags[i]) + '</span> ';
+                            groupingTags += '<span class=tagSpan>' + EscapeHtml(node.tags[i]) + '</span> ';
                         }
                     }
                     r += '<span style=line-height:20px>' + groupingTags + '</span>';
@@ -7399,7 +7399,7 @@
 
                 // Node tags
                 var groupingTags = '<i>' + "None" + '</i>';
-                if (node.tags != null) { groupingTags = ''; for (var i in node.tags) { groupingTags += '<span style="background-color:lightgray;padding:3px;border-radius:5px">' + EscapeHtml(node.tags[i]) + '</span> '; } }
+                if (node.tags != null) { groupingTags = ''; for (var i in node.tags) { groupingTags += '<span class=tagSpan>' + EscapeHtml(node.tags[i]) + '</span> '; } }
                 if ((meshrights & 4) != 0) {
                     x += addDeviceAttribute("Tags", '<span onclick=showEditNodeValueDialog(3) style=line-height:26px;cursor:pointer>' + groupingTags + ' <img class=hoverButton src="images/link5.png" width=10 height=10 /></span>');
                 } else {
