diff --git a/source/_components/binary_sensor.nest.markdown b/source/_components/binary_sensor.nest.markdown
index 53b15fea5a3..f9d8e0af181 100644
--- a/source/_components/binary_sensor.nest.markdown
+++ b/source/_components/binary_sensor.nest.markdown
@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-logo: nest_thermostat.png
+logo: nest.png
 ha_category: Binary Sensor
 ha_release: pre 0.7
 ---
@@ -22,19 +22,12 @@ You must have the [Nest component](/components/nest/) configured to use these se
 To set it up, add the following information to your `configuration.yaml` file:
 
 ```yaml
+# Example configuration.yaml entry
 binary_sensor:
   - platform: nest
     monitored_conditions:
       - 'fan'
       - 'hvac_ac_state'
-      - 'hvac_heater_state'
-      - 'hvac_aux_heater_state'
-      - 'hvac_heat_x2_state'
-      - 'hvac_heat_x3_state'
-      - 'hvac_alt_heat_state'
-      - 'hvac_alt_heat_x2_state'
-      - 'hvac_emer_heat_state'
-      - 'online'
 ```
 
 Configuration variables:
diff --git a/source/_components/camera.nest.markdown b/source/_components/camera.nest.markdown
index dd78b03636d..ccccb5780d9 100644
--- a/source/_components/camera.nest.markdown
+++ b/source/_components/camera.nest.markdown
@@ -17,3 +17,11 @@ The `nest` platform allows you to watch the live stream of your [Nest](https://n
 <p class='note'>
 You must have the [Nest component](/components/nest/) configured to use those thermostats.
 </p>
+
+To set it up, add the following information to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+camera:
+  - platform: nest
+```
diff --git a/source/_components/climate.nest.markdown b/source/_components/climate.nest.markdown
index 2e8c6742055..8c3e2f08190 100644
--- a/source/_components/climate.nest.markdown
+++ b/source/_components/climate.nest.markdown
@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-logo: nest_thermostat.png
+logo: nest.png
 ha_category: Climate
 ---
 
@@ -21,8 +21,9 @@ You must have the [Nest component](/components/nest/) configured to use those th
 To set it up, add the following information to your `configuration.yaml` file:
 
 ```yaml
+# Example configuration.yaml entry
 climate:
-  platform: nest
+  - platform: nest
 ```
 
 <p class='img'>
diff --git a/source/_components/fan.nest.markdown b/source/_components/fan.nest.markdown
index b90fde96dc9..62f405cd8b4 100644
--- a/source/_components/fan.nest.markdown
+++ b/source/_components/fan.nest.markdown
@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-logo: nest_thermostat.png
+logo: nest.png
 ha_category: Fan
 ha_release: 0.29
 ha_iot_class: "Local Polling"
@@ -23,7 +23,8 @@ You must have the [Nest component](/components/nest/) configured to use those th
 To set it up, add the following information to your `configuration.yaml` file:
 
 ```yaml
+# Example configuration.yaml entry
 fan:
-  platform: nest
+  - platform: nest
 ```
 
diff --git a/source/_components/nest.markdown b/source/_components/nest.markdown
index 4f87020fec6..38bf4d8ec2d 100644
--- a/source/_components/nest.markdown
+++ b/source/_components/nest.markdown
@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-logo: nest_thermostat.png
+logo: nest.png
 ha_category: Hub
 featured: true
 ---
diff --git a/source/_components/sensor.nest.markdown b/source/_components/sensor.nest.markdown
index 4de66c156e5..7d9a92e1ecc 100644
--- a/source/_components/sensor.nest.markdown
+++ b/source/_components/sensor.nest.markdown
@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-logo: nest_thermostat.png
+logo: nest.png
 ha_category: Sensor
 ha_release: pre 0.7
 ---
@@ -24,15 +24,10 @@ To set it up, add the following information to your `configuration.yaml` file:
 ```yaml
 # Example configuration.yaml entry
 sensor:
-  platform: nest
-  monitored_conditions:
-    - 'temperature'
-    - 'target'
-    - 'humidity'
-    - 'operation_mode'
-    - 'last_connection'
-    - 'co_status' # Nest Protect only
-    - 'smoke_status' # Nest Protect only
+  - platform: nest
+    monitored_conditions:
+      - 'temperature'
+      - 'target'
 ```
 
 Configuration variables:
@@ -45,16 +40,16 @@ The following conditions can be monitored with a Nest Thermostat or Protect.
 The following conditions can be monitored with a Nest Thermostat only.
   - 'temperature'
   - 'target' 
-  - 'humidity'  
-  - 'operation_mode'  
-  - 'last_ip'  
+  - 'humidity'
+  - 'operation_mode'
+  - 'last_ip'
   - 'local_ip' 
-  - 'last_connection'  
-  - 'weather_condition'  
+  - 'last_connection'
+  - 'weather_condition'
   - 'weather_temperature' 
   - 'weather_humidity' 
-  - 'wind_speed'  
-  - 'wind_direction'  
+  - 'wind_speed'
+  - 'wind_direction'
   
 The following conditions can be monitored with a Nest Protect only. 
   - 'co_status'
diff --git a/source/_components/sensor.nest_weather.markdown b/source/_components/sensor.nest_weather.markdown
index 3f00c3b081d..c7df23d3366 100644
--- a/source/_components/sensor.nest_weather.markdown
+++ b/source/_components/sensor.nest_weather.markdown
@@ -7,7 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-logo: nest_thermostat.png
+logo: nest.png
 ha_category: Weather
 ha_iot_class: "Cloud Poll"
 ---
@@ -26,18 +26,14 @@ sensor:
   - platform: nest
     monitored_conditions:
       - 'weather_temperature'
-      - 'weather_humidity'
-      - 'weather_condition'
-      - 'wind_speed'
-      - 'wind_direction'
 ```
 
 Configuration variables:
 
 - **monitored_conditions** array (*Required*): States to monitor.
-    - 'weather_temperature'
-    - 'weather_humidity'
-    - 'weather_condition'
-    - 'wind_speed'
-    - 'wind_direction'
+  - 'weather_temperature'
+  - 'weather_humidity'
+  - 'weather_condition'
+  - 'wind_speed'
+  - 'wind_direction'