diff --git a/src/config.js b/src/config.js
index 865303c..e3c4042 100644
--- a/src/config.js
+++ b/src/config.js
@@ -245,6 +245,7 @@ const config : Config = {
     onkyo: {
       name: "Onkyo",
       position: [350, 650],
+      iconColor: state => state.onkyo_power == "on" ? "#00FF00" : "#000000",
       icon: "volume_up",
       ui: [
         {
diff --git a/src/map.js b/src/map.js
index 6e62f43..f7e0512 100644
--- a/src/map.js
+++ b/src/map.js
@@ -32,12 +32,8 @@ const Markers = (props) => R.values(R.mapObjIndexed((el,key) => (
       {
         html: iconHtml(el, props.state),
         iconSize: Leaflet.point(32,32)
-      })}>
-    <Popup
-      onOpen={() => store.dispatch({type: Actions.CHANGE_UI, payload: key})}
-      onClose={() => store.dispatch({type: Actions.CHANGE_UI})}>
-        <span>{el.name}</span>
-    </Popup>
+      })}
+    onClick={() => store.dispatch({type: Actions.CHANGE_UI, payload: key})}>
   </Marker>
 ), R.propOr({}, "controls", Config)));