diff --git a/source/_dashboards/map.markdown b/source/_dashboards/map.markdown
index 9370e83431f..3ee49dcb992 100644
--- a/source/_dashboards/map.markdown
+++ b/source/_dashboards/map.markdown
@@ -5,7 +5,7 @@ sidebar_label: Map
description: "The map card that allows you to display entities on a map"
---
-The map card that allows you to display entities on a map
+The map card that allows you to display entities on a map. This card is used on the [Map dashboard](/dashboards/dashboards/#map-dashboard), which is one of the default dashboards.
@@ -138,4 +138,5 @@ hours_to_show: 48
## Related topics
- [Themes](/integrations/frontend/)
-- [Dashboard cards](/dashboards/cards/)
\ No newline at end of file
+- [Dashboard cards](/dashboards/cards/)
+- [Map dashboard](/dashboards/dashboards/#map-dashboard)
\ No newline at end of file
diff --git a/source/_integrations/default_config.markdown b/source/_integrations/default_config.markdown
index 61be61b50be..c579916b7d7 100644
--- a/source/_integrations/default_config.markdown
+++ b/source/_integrations/default_config.markdown
@@ -25,7 +25,6 @@ This {% term integration %} is a meta-component and configures a default set of
- [Home Assistant Cloud](/integrations/cloud/) (`cloud`)
- [Image upload](/integrations/image_upload/) (`image_upload`)
- [Logbook](/integrations/logbook/) (`logbook`)
-- [Map](/integrations/map/) (`map`)
- [Media source](/integrations/media_source/) (`media_source`)
- [Mobile app support](/integrations/mobile_app/) (`mobile_app`)
- [My Home Assistant](/integrations/my/) (`my`)
diff --git a/source/_integrations/map.markdown b/source/_integrations/map.markdown
deleted file mode 100644
index 3702fe90909..00000000000
--- a/source/_integrations/map.markdown
+++ /dev/null
@@ -1,27 +0,0 @@
----
-title: Map
-description: Offers a map to show tracked devices.
-ha_category:
- - Other
-ha_release: 0.56
-ha_quality_scale: internal
-ha_domain: map
-ha_integration_type: system
----
-
-This offers a map on the frontend to display the location of tracked devices. To set up tracked devices, look at the [device tracker](/integrations/device_tracker/) documentation. This integration is by default enabled, unless you've disabled or removed the [`default_config:`](/integrations/default_config/) line from your configuration. If that is the case, the following example shows you how to enable this integration manually:
-
-```yaml
-# Example configuration.yaml entry
-map:
-```
-
-
-Devices that are currently at home won't show on the map.
-
-
-
-
-This map always shows the location of all tracked devices. If you want to hide certain entities, you should look into the [Map Card](/dashboards/map/).
-
-
diff --git a/source/_redirects b/source/_redirects
index e0320acb707..a66bddc685c 100644
--- a/source/_redirects
+++ b/source/_redirects
@@ -467,6 +467,7 @@ layout: null
/docs/tools/credstash/ /docs/configuration/secrets
/docs/scripts/editor/ /docs/scripts
/getting-started/devices /integrations
+/integrations/map /dashboards/map/
# Blog
/blog/2019/05/29/release-94 /blog/2019/06/05/release-94
diff --git a/source/dashboards/dashboards.markdown b/source/dashboards/dashboards.markdown
index abcb82ff328..bbd9f892860 100644
--- a/source/dashboards/dashboards.markdown
+++ b/source/dashboards/dashboards.markdown
@@ -18,16 +18,20 @@ Home Assistant ships with some dashboards out of the box:
- Overview
- Energy
-- Map
+- [Map](#map-dashboard)
- Logbook
- History
- To-do lists
-Not all of the predefined dashboards are listed under {% my lovelace_dashboards title="**Settings** > **Dashboards**" %}. **Map**, **Logbook**, and **History**, are powered by their respective integrations.
+Not all of the predefined dashboards are listed under {% my lovelace_dashboards title="**Settings** > **Dashboards**" %}. The **Logbook** and **History** dashboards are powered by their respective integrations.
### Map dashboard
-The predefined **Map** dashboard is powered by the [Map integration](/integrations/map/). If you see a [person](/integrations/person/) on the map, it means you have connected a device that allows [presence detection](/integrations/#presence-detection). This is the case for example if you have the [Home Assistant Companion App](https://companion.home-assistant.io/) on your phone and allowed location tracking.
+The predefined **Map** dashboard is populated by the [Map card](/dashboards/map/). You can edit this dashboard like any other dashboard. For example, you can edit the [view](/dashboards/views/) to use the **Sidebar** instead of the default **Panel** view type if you like.
+
+#### Maps and presence detection
+
+If you see a [person](/integrations/person/) on the map, it means you have connected a device that allows [presence detection](/integrations/#presence-detection). This is the case for example if you have the [Home Assistant Companion App](https://companion.home-assistant.io/) on your phone and allowed location tracking.
### Logbook dashboard
@@ -255,6 +259,6 @@ views:
## Related topics
- [Logbook integration](/integrations/logbook/)
-- [Map integration](/integrations/map/)
- [History integration](/integrations/history/)
-- [To-do list integration](/integrations/todo/)
\ No newline at end of file
+- [To-do list integration](/integrations/todo/)
+- [Views](/dashboards/views/)
\ No newline at end of file
diff --git a/source/getting-started/presence-detection.markdown b/source/getting-started/presence-detection.markdown
index 71eac4875eb..3d1f98eb8e6 100644
--- a/source/getting-started/presence-detection.markdown
+++ b/source/getting-started/presence-detection.markdown
@@ -18,14 +18,14 @@ It's also possible to run an app on your phone to provide detailed location info
During the setup of Home Assistant Companion on your mobile device, the app will ask for permission to allow the device's location to be provided to Home Assistant. Allowing this will create a `device_tracker` entity for that device which can be used in automations and conditions.
-
### Zones
+

{% term Zones %} allow you to name areas on a map. These areas can then be used to name the location a tracked user is, or use entering/leaving a zone as an automation {% term trigger %} or {% term condition %}. See [Zones integration](/integrations/zone/) page for more details like creating zones.
-The map view will hide all devices that are home.
+The
map dashboard will hide all devices that are home.
[routers]: /integrations/#presence-detection
@@ -40,7 +40,6 @@ The map view will hide all devices that are home.
[zone]: /integrations/zone/
[trigger]: /getting-started/automation-trigger/#zone-trigger
[condition]: /getting-started/automation-condition/#zone-condition
-[ha-map]: /integrations/map/
[companion]: https://companion.home-assistant.io/
{% include getting-started/next_step.html step="Join the Community" link="/getting-started/join-the-community/" %}
diff --git a/source/images/dashboards/dashboard-manage-01.png b/source/images/dashboards/dashboard-manage-01.png
index bfd486c364f..55f693582c4 100644
Binary files a/source/images/dashboards/dashboard-manage-01.png and b/source/images/dashboards/dashboard-manage-01.png differ