diff --git a/web/gui/src/main/webapp/app/view/topo/topo.css b/web/gui/src/main/webapp/app/view/topo/topo.css
index 7333a8d..ef61966 100644
--- a/web/gui/src/main/webapp/app/view/topo/topo.css
+++ b/web/gui/src/main/webapp/app/view/topo/topo.css
@@ -275,7 +275,12 @@
 
 #ov-topo svg .node.device.fixed rect {
     stroke-width: 1.5;
-    stroke: #ccc;
+}
+.light #ov-topo svg .node.device.fixed rect {
+    stroke: #aaa;
+}
+.dark #ov-topo svg .node.device.fixed rect {
+    stroke: #555;
 }
 
 /* note: device is offline without the 'online' class */
diff --git a/web/gui/src/main/webapp/app/view/topo/topoForce.js b/web/gui/src/main/webapp/app/view/topo/topoForce.js
index fb6ca06..5268dc0 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoForce.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoForce.js
@@ -386,6 +386,7 @@
         black: '#000',
         paleblue: '#acf',
         offwhite: '#ddd',
+        darkgrey: '#444',
         midgrey: '#888',
         lightgrey: '#bbb',
         orange: '#f90'
@@ -394,8 +395,9 @@
     // note: these are the device icon colors without affinity
     var dColTheme = {
         light: {
+            rfill: dCol.offwhite,
             online: {
-                glyph: dCol.black,
+                glyph: dCol.darkgrey,
                 rect: dCol.paleblue
             },
             offline: {
@@ -403,15 +405,15 @@
                 rect: dCol.lightgrey
             }
         },
-        // TODO: theme
         dark: {
+            rfill: dCol.midgrey,
             online: {
-                glyph: dCol.black,
+                glyph: dCol.darkgrey,
                 rect: dCol.paleblue
             },
             offline: {
                 glyph: dCol.midgrey,
-                rect: dCol.lightgrey
+                rect: dCol.darkgrey
             }
         }
     };
@@ -434,7 +436,7 @@
             r = dCol.orange;
         } else if (tis.isVisible()) {
             g = o ? a : c.glyph;
-            r = o ? dCol.offwhite : a;
+            r = o ? c.rfill : a;
         } else {
             g = c.glyph;
             r = c.rect;