diff --git a/source/_cookbook/notify.mqtt.markdown b/source/_cookbook/notify.mqtt.markdown
index 00e08139241..6ddb0d6de35 100644
--- a/source/_cookbook/notify.mqtt.markdown
+++ b/source/_cookbook/notify.mqtt.markdown
@@ -8,7 +8,7 @@ ha_iot_class: Configurable
The MQTT notification support is different than the other [notification](/integrations/notify/) platforms. It is a service. This means that you don't have to create a configuration entry but you need to provide more details when calling the service.
-**Call Service** section from the **Developer Tools** allows you to send MQTT messages. Choose *mqtt.publish* from the list of **Available services:** and enter something like the sample below into the **Service Data** field and hit **CALL SERVICE**.
+**Call Service** section from **Developer Tools** -> **Services** allows you to send MQTT messages. Choose *mqtt.publish* from the list of **Available services:** and enter something like the sample below into the **Service Data** field and hit **CALL SERVICE**.
```json
{"payload": "Test message from HA", "topic": "home/notification", "qos": 0, "retain": 0}
diff --git a/source/_docs/automation.markdown b/source/_docs/automation.markdown
index 81844501ffd..6294c48f783 100644
--- a/source/_docs/automation.markdown
+++ b/source/_docs/automation.markdown
@@ -41,4 +41,4 @@ Automation rules interact directly with the internal state of Home Assistant, so
State changes can be used as the source of triggers and the current state can be used in conditions.
-Actions are all about calling services. To explore the available services open the
Services developer tool. Services allow to change anything. For example turn on a light, run a script or enable a scene. Each service has a domain and a name. For example the service `light.turn_on` is capable of turning on any light in your system. Services can be passed parameters to for example tell which device to turn on or what color to use.
+Actions are all about calling services. To explore the available services open the **Developer Tools** -> **Services**. Services allow to change anything. For example turn on a light, run a script or enable a scene. Each service has a domain and a name. For example the service `light.turn_on` is capable of turning on any light in your system. Services can be passed parameters to for example tell which device to turn on or what color to use.
diff --git a/source/_docs/configuration/templating.markdown b/source/_docs/configuration/templating.markdown
index 89d2928c19c..2adfb527848 100644
--- a/source/_docs/configuration/templating.markdown
+++ b/source/_docs/configuration/templating.markdown
@@ -438,7 +438,7 @@ The following overview contains a couple of options to get the needed values:
{% raw %}{{ value_json.tst | timestamp_custom('%Y' True) }}{% endraw %}
```
-To evaluate a response, go to the
template developer tools, create your output in "Template", and check the result.
+To evaluate a response, go to **Developer Tools** -> **Template**, create your output in "Template editor", and check the result.
{% raw %}
```yaml
diff --git a/source/_docs/installation/docker.markdown b/source/_docs/installation/docker.markdown
index b943b08992f..73fb13522cc 100644
--- a/source/_docs/installation/docker.markdown
+++ b/source/_docs/installation/docker.markdown
@@ -224,7 +224,7 @@ device_tracker:
If you change the configuration you have to restart the server. To do that you have 2 options.
- 1. You can go to the
service developer tools, select the service `homeassistant/restart` and click "Call Service".
+ 1. You can go to the **Developer Tools** -> **Services**, select the service `homeassistant.restart` and click "Call Service".
2. Or you can restart it from a terminal by running `docker restart home-assistant`
## Docker Compose
diff --git a/source/_integrations/fibaro.markdown b/source/_integrations/fibaro.markdown
index 9279449322b..139836ad766 100644
--- a/source/_integrations/fibaro.markdown
+++ b/source/_integrations/fibaro.markdown
@@ -88,4 +88,4 @@ device_config:
### Using Z-Wave devices in automation
-If you want to use a Z-Wave device from the Fibaro controller in Home Assistant automation, you'll need the entity id. In the Home Assistant UI you'll find all entities listed under the
icon of the Developer Tools section. Look for entities that contain 'fibaro_id' in their attributes, and you'll find the entity id on the left.
+If you want to use a Z-Wave device from the Fibaro controller in Home Assistant automation, you'll need the entity id. In the Home Assistant UI you'll find all entities listed under **Developer Tools** -> **States**. Look for entities that contain 'fibaro_id' in their attributes, and you'll find the entity id on the left.
diff --git a/source/_integrations/hangouts.markdown b/source/_integrations/hangouts.markdown
index b550738840b..6ca273dc3ce 100644
--- a/source/_integrations/hangouts.markdown
+++ b/source/_integrations/hangouts.markdown
@@ -291,7 +291,7 @@ default_conversations:
### Finding the conversation ID
-The conversations has to be precreated, the conversation id can be obtained from the `hangouts.conversations` entity, this can be found in with the states developer tool that is shown as this icon
in the side bar. Using your web browsers search tool to find the `hangouts.conversations` entity. You will find something like below.
+The conversations has to be precreated, the conversation id can be obtained from the `hangouts.conversations` entity, this can be found in **Developer Tools** -> **States**. Using your web browsers search tool to find the `hangouts.conversations` entity. You will find something like below.
```json
0: {
diff --git a/source/_integrations/vera.markdown b/source/_integrations/vera.markdown
index 5c7f94f139a..044a548a4e8 100644
--- a/source/_integrations/vera.markdown
+++ b/source/_integrations/vera.markdown
@@ -55,7 +55,7 @@ You can find the Vera device id either via the advanced properties of the device
### Using Z-Wave devices in automation
-If you want to use a Z-Wave device from the Vera controller in Home Assistant automation, you'll need the entity id. In the Home Assistant UI you'll find all entities listed under the
icon of the Developer Tools section. Look for entities that contain 'Vera Device Id' in their attributes, and you'll find the entity id on the left.
+If you want to use a Z-Wave device from the Vera controller in Home Assistant automation, you'll need the entity id. In the Home Assistant UI you'll find all entities listed under **Developer Tools** -> **States**. Look for entities that contain 'Vera Device Id' in their attributes, and you'll find the entity id on the left.
### Sensor
diff --git a/source/_integrations/water_heater.markdown b/source/_integrations/water_heater.markdown
index 99705da7977..9d732787720 100644
--- a/source/_integrations/water_heater.markdown
+++ b/source/_integrations/water_heater.markdown
@@ -23,7 +23,7 @@ Available services: `water_heater.set_temperature`, `water_heater.turn_away_mode