diff --git a/web/gui/src/main/webapp/app/view/device/device.css b/web/gui/src/main/webapp/app/view/device/device.css
index e0e9cf5..8d8a582 100644
--- a/web/gui/src/main/webapp/app/view/device/device.css
+++ b/web/gui/src/main/webapp/app/view/device/device.css
@@ -23,7 +23,20 @@
 }
 
 #ov-device div.ctrl-btns {
-    width: 240px;
+}
+
+.light #ov-device .current-view use {
+    fill: white;
+}
+.dark #ov-device .current-view use {
+    fill: #304860;
+}
+
+.light #ov-device .current-view rect {
+    fill: deepskyblue;
+}
+.dark #ov-device .current-view rect {
+    fill: #eee;
 }
 
 /* More in generic panel.css */
diff --git a/web/gui/src/main/webapp/app/view/device/device.html b/web/gui/src/main/webapp/app/view/device/device.html
index 63a04db..c2b9e98 100644
--- a/web/gui/src/main/webapp/app/view/device/device.html
+++ b/web/gui/src/main/webapp/app/view/device/device.html
@@ -9,6 +9,9 @@
                  ng-click="toggleRefresh()"></div>
             <div class="separator"></div>
 
+            <div ng-class="{'current-view': !!selId}"
+                 icon icon-id="query" icon-size="36"></div>
+
             <div ng-class="{active: !!selId}"
                  icon icon-id="flowTable" icon-size="36"
                  tooltip tt-msg="flowTip"
diff --git a/web/gui/src/main/webapp/app/view/flow/flow.css b/web/gui/src/main/webapp/app/view/flow/flow.css
index 4aa9621..3022622 100644
--- a/web/gui/src/main/webapp/app/view/flow/flow.css
+++ b/web/gui/src/main/webapp/app/view/flow/flow.css
@@ -23,7 +23,6 @@
 }
 
 #ov-flow div.ctrl-btns {
-    width: 240px;
 }
 
 .light #ov-flow .current-view use {
diff --git a/web/gui/src/main/webapp/app/view/flow/flow.html b/web/gui/src/main/webapp/app/view/flow/flow.html
index 5fce98c..df95439 100644
--- a/web/gui/src/main/webapp/app/view/flow/flow.html
+++ b/web/gui/src/main/webapp/app/view/flow/flow.html
@@ -13,6 +13,11 @@
 
             <div class="separator"></div>
 
+            <div class="active"
+                 icon icon-id="query" icon-size="36"
+                 tooltip tt-msg="deviceTip"
+                 ng-click="nav('device')"></div>
+
             <div class="current-view"
                  icon icon-id="flowTable" icon-size="36"></div>
 
diff --git a/web/gui/src/main/webapp/app/view/flow/flow.js b/web/gui/src/main/webapp/app/view/flow/flow.js
index 15678d5..7bb988a 100644
--- a/web/gui/src/main/webapp/app/view/flow/flow.js
+++ b/web/gui/src/main/webapp/app/view/flow/flow.js
@@ -37,6 +37,7 @@
             fs = _fs_;
             tbs = _tbs_;
             ns = _ns_;
+            $scope.deviceTip = 'Show device table';
             $scope.portTip = 'Show port view for this device';
             $scope.groupTip = 'Show group view for this device';
 
diff --git a/web/gui/src/main/webapp/app/view/group/group.css b/web/gui/src/main/webapp/app/view/group/group.css
index 42f1c31..6773aa8 100644
--- a/web/gui/src/main/webapp/app/view/group/group.css
+++ b/web/gui/src/main/webapp/app/view/group/group.css
@@ -23,7 +23,6 @@
 }
 
 #ov-group div.ctrl-btns {
-    width: 240px;
 }
 
 .light #ov-group .current-view use {
diff --git a/web/gui/src/main/webapp/app/view/group/group.html b/web/gui/src/main/webapp/app/view/group/group.html
index b963f46..fbd1f1e 100644
--- a/web/gui/src/main/webapp/app/view/group/group.html
+++ b/web/gui/src/main/webapp/app/view/group/group.html
@@ -30,6 +30,11 @@
             <div class="separator"></div>
 
             <div class="active"
+                 icon icon-id="query" icon-size="36"
+                 tooltip tt-msg="deviceTip"
+                 ng-click="nav('device')"></div>
+
+            <div class="active"
                  icon icon-id="flowTable" icon-size="36"
                  tooltip tt-msg="flowTip"
                  ng-click="nav('flow')"></div>
diff --git a/web/gui/src/main/webapp/app/view/group/group.js b/web/gui/src/main/webapp/app/view/group/group.js
index 2510190..2cb1f0c 100644
--- a/web/gui/src/main/webapp/app/view/group/group.js
+++ b/web/gui/src/main/webapp/app/view/group/group.js
@@ -37,6 +37,7 @@
             fs = _fs_;
             tbs = _tbs_;
             ns = _ns_;
+            $scope.deviceTip = 'Show device table';
             $scope.flowTip = 'Show flow view for this device';
             $scope.portTip = 'Show port view for this device';
 
diff --git a/web/gui/src/main/webapp/app/view/port/port.css b/web/gui/src/main/webapp/app/view/port/port.css
index 7fcfee3..2aaacfc 100644
--- a/web/gui/src/main/webapp/app/view/port/port.css
+++ b/web/gui/src/main/webapp/app/view/port/port.css
@@ -23,7 +23,6 @@
 }
 
 #ov-port div.ctrl-btns {
-    width: 240px;
 }
 
 .light #ov-port .current-view use {
diff --git a/web/gui/src/main/webapp/app/view/port/port.html b/web/gui/src/main/webapp/app/view/port/port.html
index 8eecb9d..92fbb90 100644
--- a/web/gui/src/main/webapp/app/view/port/port.html
+++ b/web/gui/src/main/webapp/app/view/port/port.html
@@ -30,6 +30,11 @@
             <div class="separator"></div>
 
             <div class="active"
+                 icon icon-id="query" icon-size="36"
+                 tooltip tt-msg="deviceTip"
+                 ng-click="nav('device')"></div>
+
+            <div class="active"
                  icon icon-id="flowTable" icon-size="36"
                  tooltip tt-msg="flowTip"
                  ng-click="nav('flow')"></div>
diff --git a/web/gui/src/main/webapp/app/view/port/port.js b/web/gui/src/main/webapp/app/view/port/port.js
index a157c5b..1e8585d 100644
--- a/web/gui/src/main/webapp/app/view/port/port.js
+++ b/web/gui/src/main/webapp/app/view/port/port.js
@@ -37,6 +37,7 @@
             fs = _fs_;
             tbs = _tbs_;
             ns = _ns_;
+            $scope.deviceTip = 'Show device table';
             $scope.flowTip = 'Show flow view for this device';
             $scope.groupTip = 'Show group view for this device';