diff --git a/lib/forcegraph/draw.js b/lib/forcegraph/draw.js
index edda42d..29e5e9a 100644
--- a/lib/forcegraph/draw.js
+++ b/lib/forcegraph/draw.js
@@ -53,10 +53,11 @@ define(['helper'], function (helper) {
 
     drawHighlightNode(d);
 
-    ctx.moveTo(d.x + 3, d.y);
-
     if (d.o.is_online) {
       ctx.arc(d.x, d.y, 8, 0, 2 * Math.PI);
+      if (d.o.is_gateway) {
+        ctx.rect(d.x - 9, d.y - 9, 18, 18);
+      }
       ctx.fillStyle = config.forceGraph.nodeColor;
     } else {
       ctx.arc(d.x, d.y, 6, 0, 2 * Math.PI);