diff --git a/homeassistant/components/map.py b/homeassistant/components/map.py
index c0184239a1a..d30a7568452 100644
--- a/homeassistant/components/map.py
+++ b/homeassistant/components/map.py
@@ -10,5 +10,5 @@ DOMAIN = 'map'
 async def async_setup(hass, config):
     """Register the built-in map panel."""
     await hass.components.frontend.async_register_built_in_panel(
-        'map', 'map', 'hass:account-location')
+        'map', 'map', 'hass:tooltip-account')
     return True
diff --git a/tests/components/frontend/test_init.py b/tests/components/frontend/test_init.py
index 9f386ceb904..b1b9a70d594 100644
--- a/tests/components/frontend/test_init.py
+++ b/tests/components/frontend/test_init.py
@@ -249,7 +249,7 @@ async def test_get_panels(hass, hass_ws_client):
     """Test get_panels command."""
     await async_setup_component(hass, 'frontend')
     await hass.components.frontend.async_register_built_in_panel(
-        'map', 'Map', 'mdi:account-location')
+        'map', 'Map', 'mdi:tooltip-account')
 
     client = await hass_ws_client(hass)
     await client.send_json({
@@ -264,7 +264,7 @@ async def test_get_panels(hass, hass_ws_client):
     assert msg['success']
     assert msg['result']['map']['component_name'] == 'map'
     assert msg['result']['map']['url_path'] == 'map'
-    assert msg['result']['map']['icon'] == 'mdi:account-location'
+    assert msg['result']['map']['icon'] == 'mdi:tooltip-account'
     assert msg['result']['map']['title'] == 'Map'