diff --git a/source/_components/arlo.markdown b/source/_components/arlo.markdown
index 23c0a4e075b..ec67022b6ad 100644
--- a/source/_components/arlo.markdown
+++ b/source/_components/arlo.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: arlo.png
 ha_category: Hub
 ha_release: 0.46
+ha_iot_class: "Cloud Polling"
 ---
 
 The `arlo` implementation allows you to integrate your [Arlo](https://arlo.netgear.com/) devices in Home Assistant.
diff --git a/source/_components/axis.markdown b/source/_components/axis.markdown
index 5e0fe5819b5..bdf70c5a40c 100644
--- a/source/_components/axis.markdown
+++ b/source/_components/axis.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: axis.png
 ha_category: Hub
 ha_release: "0.45"
+ha_iot_class: "Local Polling"
 ---
 
 [Axis Communications](https://www.axis.com/) devices are surveillance cameras and other security related network connected hardware. Sensor API works with firmware 5.50 and newer.
diff --git a/source/_components/binary_sensor.nest.markdown b/source/_components/binary_sensor.nest.markdown
index c466222c056..fa0a264474d 100644
--- a/source/_components/binary_sensor.nest.markdown
+++ b/source/_components/binary_sensor.nest.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: nest.png
 ha_category: Binary Sensor
 ha_release: pre 0.7
+ha_iot_class: "Cloud Polling"
 ---
 
 
diff --git a/source/_components/blink.markdown b/source/_components/blink.markdown
index e14d68d0d55..21cd6b4447b 100644
--- a/source/_components/blink.markdown
+++ b/source/_components/blink.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: blink.png
 ha_category: Hub
 ha_release: "0.40"
+ha_iot_class: "Cloud Polling"
 ---
 
 The `blink` component lets you view camera images and motion events from [Blink](http://blinkforhome.com) camera and security systems.
diff --git a/source/_components/camera.arlo.markdown b/source/_components/camera.arlo.markdown
index 51ea29fa9b8..0a659827ea6 100644
--- a/source/_components/camera.arlo.markdown
+++ b/source/_components/camera.arlo.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: arlo.png
 ha_category: Camera
 ha_release: 0.46
+ha_iot_class: "Cloud Polling"
 ---
 
 To get your [Arlo](https://arlo.netgear.com/) cameras working within Home Assistant, please follow the instructions for the general [Arlo component](/components/arlo).
diff --git a/source/_components/camera.nest.markdown b/source/_components/camera.nest.markdown
index efb79e67175..e597fcb19d1 100644
--- a/source/_components/camera.nest.markdown
+++ b/source/_components/camera.nest.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: nest.png
 ha_category: Camera
 ha_release: 0.34
+ha_iot_class: "Cloud Polling"
 ---
 
 The `nest` platform allows you to watch the live stream of your [Nest](https://nest.com/camera/meet-nest-cam/) camera in Home Assistant.
diff --git a/source/_components/climate.nest.markdown b/source/_components/climate.nest.markdown
index ded09ffbe4b..be9adf6d414 100644
--- a/source/_components/climate.nest.markdown
+++ b/source/_components/climate.nest.markdown
@@ -9,6 +9,7 @@ sharing: true
 footer: true
 logo: nest.png
 ha_category: Climate
+ha_iot_class: "Cloud Polling"
 ---
 
 
diff --git a/source/_components/cover.garadget.markdown b/source/_components/cover.garadget.markdown
index e560af4ea8e..50ed65b791f 100644
--- a/source/_components/cover.garadget.markdown
+++ b/source/_components/cover.garadget.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: garadget_logo.jpg
 ha_category: Cover
 ha_release: 0.32
+ha_iot_class: "Cloud Polling"
 ---
 
 
diff --git a/source/_components/cover.lutron_caseta.markdown b/source/_components/cover.lutron_caseta.markdown
index 3064c7377cb..5a1f315011e 100644
--- a/source/_components/cover.lutron_caseta.markdown
+++ b/source/_components/cover.lutron_caseta.markdown
@@ -9,6 +9,7 @@ sharing: true
 footer: true
 logo: lutron.png
 ha_category: Cover
+ha_iot_class: "Local Polling"
 ---
 
 To get your Lutron Caseta covers working with Home Assistant, follow the instructions for the general [Lutron Caseta component](/components/lutron_caseta/).
diff --git a/source/_components/cover.mqtt.markdown b/source/_components/cover.mqtt.markdown
index 36149f5bd42..665308a995d 100755
--- a/source/_components/cover.mqtt.markdown
+++ b/source/_components/cover.mqtt.markdown
@@ -9,6 +9,7 @@ sharing: true
 footer: true
 logo: mqtt.png
 ha_category: Cover
+ha_iot_class: "depends"
 ha_release: 0.18
 ---
 
diff --git a/source/_components/ifttt.markdown b/source/_components/ifttt.markdown
index 811f2c2972f..8aa8aa16b57 100644
--- a/source/_components/ifttt.markdown
+++ b/source/_components/ifttt.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: ifttt.png
 ha_category: Automation
 featured: true
+ha_iot_class: "Cloud Push"
 ---
 
 [IFTTT](https://ifttt.com) is a web service that allows users to create chains of simple conditional statements, so called "Applets". With the IFTTT component you can trigger applets through the **"Maker"** channel. See the [announcement blog post](/blog/2015/09/13/home-assistant-meets-ifttt/) for examples how to use it.
diff --git a/source/_components/image_processing.seven_segments.markdown b/source/_components/image_processing.seven_segments.markdown
index 8b54fecffa3..4afbe1c358b 100644
--- a/source/_components/image_processing.seven_segments.markdown
+++ b/source/_components/image_processing.seven_segments.markdown
@@ -12,6 +12,7 @@ ha_category: Image Processing
 featured: false
 ha_release: 0.45
 og_image: /images/screenshots/ssocr.png
+ha_iot_class: "Local Polling"
 ---
 
 The `seven_segments` image processing platform allows you to read physical seven segments displays through Home Assistant. [`ssocr`](https://www.unix-ag.uni-kl.de/~auerswal/ssocr/) is used to extract the value shown on the display which is observed by a [camera](/components/camera/). `ssocr` need to be available on your system. Check the installation instruction for Fedora below or use `$ sudo apt-get install ssocr` on a Debian-based system:
diff --git a/source/_components/light.lutron.markdown b/source/_components/light.lutron.markdown
index eadab676af1..3872b5373b5 100644
--- a/source/_components/light.lutron.markdown
+++ b/source/_components/light.lutron.markdown
@@ -9,6 +9,7 @@ sharing: true
 footer: true
 logo: lutron.png
 ha_category: Light
+ha_iot_class: "Local Polling"
 ---
 
 To get your Lutron lights working with Home Assistant, follow the instructions for the general [Lutron component](/components/lutron/).
diff --git a/source/_components/light.lutron_caseta.markdown b/source/_components/light.lutron_caseta.markdown
index 3e96036b5af..7edfca003d5 100644
--- a/source/_components/light.lutron_caseta.markdown
+++ b/source/_components/light.lutron_caseta.markdown
@@ -9,6 +9,7 @@ sharing: true
 footer: true
 logo: lutron.png
 ha_category: Light
+ha_iot_class: "Local Polling"
 ---
 
 To get your Lutron Caseta lights working with Home Assistant, follow the instructions for the general [Lutron Caseta component](/components/lutron_caseta/).
diff --git a/source/_components/lutron.markdown b/source/_components/lutron.markdown
index 1e1ac0afdab..0a8ac5e8774 100644
--- a/source/_components/lutron.markdown
+++ b/source/_components/lutron.markdown
@@ -11,6 +11,7 @@ logo: lutron.png
 ha_category: Hub
 featured: False
 ha_release: 0.37
+ha_iot_class: "Local Polling"
 ---
 
 [Lutron](http://www.lutron.com/) is an American lighting control company. They have several lines of home automation devices that manage light switches/dimmers, occupancy sensors, HVAC controls, etc. The `lutron` component in Home Assistant is responsible for communicating with the main hub for these systems.
diff --git a/source/_components/lutron_caseta.markdown b/source/_components/lutron_caseta.markdown
index f3d7cb30e00..e1781b73734 100644
--- a/source/_components/lutron_caseta.markdown
+++ b/source/_components/lutron_caseta.markdown
@@ -11,11 +11,13 @@ logo: lutron.png
 ha_category: Hub
 featured: False
 ha_release: 0.41
+ha_iot_class: "Local Polling"
 ---
 
-[Lutron](http://www.lutron.com/) is an American lighting control company. They have several lines of home automation devices that manage light switches/dimmers, occupancy sensors, HVAC controls, etc. The `lutron_caseta` component in Home Assistant is responsible for communicating with the Lutron SmartBridge for these systems.  Both 'pro' and 'standard' models are supported.  
+[Lutron](http://www.lutron.com/) is an American lighting control company. They have several lines of home automation devices that manage light switches/dimmers, occupancy sensors, HVAC controls, etc. The `lutron_caseta` component in Home Assistant is responsible for communicating with the Lutron SmartBridge for these systems.  Both 'pro' and 'standard' models are supported.
 
 This component only supports the Caseta line of products. The current supported Caseta devices are:
+
 - Dimmers as Home Assistant lights
 - Wall switches as Home Assistant switches
 - Serena shades as Home Assistant covers
diff --git a/source/_components/nest.markdown b/source/_components/nest.markdown
index c0cc1368dc6..389bc14d1e8 100644
--- a/source/_components/nest.markdown
+++ b/source/_components/nest.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: nest.png
 ha_category: Hub
 featured: true
+ha_iot_class: "Cloud Polling"
 ---
 
 The Nest component is the main component to integrate all [Nest](https://nest.com/) related platforms. To connect Nest, you will have to [sign up for a developer account](https://developers.nest.com/products) and get a `client_id` and `client_secret`.
diff --git a/source/_components/rest_command.markdown b/source/_components/rest_command.markdown
index ce2b1f6f15c..e1242238d4b 100644
--- a/source/_components/rest_command.markdown
+++ b/source/_components/rest_command.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: restful.png
 ha_category: Automation
 ha_release: 0.36
+ha_iot_class: "Local Push"
 ---
 
 This component can expose regular REST commands as services. Services can be called from a [script] or in [automation].
diff --git a/source/_components/sensor.arlo.markdown b/source/_components/sensor.arlo.markdown
index c8c47c44888..d679f7c7eb3 100644
--- a/source/_components/sensor.arlo.markdown
+++ b/source/_components/sensor.arlo.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: arlo.png
 ha_category: Sensor
 ha_release: "0.46"
+ha_iot_class: "Cloud Polling"
 ---
 
 To get your [Arlo](https://arlo.netgear.com/) sensors working within Home Assistant, please follow the instructions for the general [Arlo component](/components/arlo).
diff --git a/source/_components/sensor.modem_callerid.markdown b/source/_components/sensor.modem_callerid.markdown
index 1c17c3f4742..30f1c98f9e6 100644
--- a/source/_components/sensor.modem_callerid.markdown
+++ b/source/_components/sensor.modem_callerid.markdown
@@ -9,6 +9,7 @@ sharing: true
 footer: true
 ha_category: Sensor
 ha_release: "0.40"
+ha_iot_class: "Local Polling"
 ---
 
 The `modem_callerid` sensor platform uses an available modem for collecting caller ID information. It requires a Hayes AT compatible modem that supports caller ID detection (via AT+VCID=1).
diff --git a/source/_components/sensor.nest.markdown b/source/_components/sensor.nest.markdown
index 6f26b81bc8c..f9d08bf2d1f 100644
--- a/source/_components/sensor.nest.markdown
+++ b/source/_components/sensor.nest.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: nest.png
 ha_category: Sensor
 ha_release: pre 0.7
+ha_iot_class: "Cloud Polling"
 ---
 
 
diff --git a/source/_components/sensor.nest_weather.markdown b/source/_components/sensor.nest_weather.markdown
index fd11fbccb68..f2d78230556 100644
--- a/source/_components/sensor.nest_weather.markdown
+++ b/source/_components/sensor.nest_weather.markdown
@@ -9,7 +9,7 @@ sharing: true
 footer: true
 logo: nest.png
 ha_category: Weather
-ha_iot_class: "Cloud Poll"
+ha_iot_class: "Cloud Polling"
 ---
 
 <p class='note warning'>
diff --git a/source/_components/sensor.sensehat.markdown b/source/_components/sensor.sensehat.markdown
index f2b28881bad..ae552a92445 100644
--- a/source/_components/sensor.sensehat.markdown
+++ b/source/_components/sensor.sensehat.markdown
@@ -79,7 +79,7 @@ customize:
   sensor.sensehat_pressure:
     icon: mdi:gauge
     friendly_name: "Pressure"
-```  
+```
 
 **Create a group**
 Add the following to your `groups`
diff --git a/source/_components/sensor.yweather.markdown b/source/_components/sensor.yweather.markdown
index 487c1a3047e..77a7c94f0aa 100644
--- a/source/_components/sensor.yweather.markdown
+++ b/source/_components/sensor.yweather.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: yahooweather.png
 ha_category: Weather
 ha_release: 0.24
+ha_iot_class: "Cloud Polling"
 ---
 
 
diff --git a/source/_components/switch.lutron_caseta.markdown b/source/_components/switch.lutron_caseta.markdown
index 734c5a38482..a8767260906 100644
--- a/source/_components/switch.lutron_caseta.markdown
+++ b/source/_components/switch.lutron_caseta.markdown
@@ -9,6 +9,7 @@ sharing: true
 footer: true
 logo: lutron.png
 ha_category: Switch
+ha_iot_class: "Local Polling"
 ---
 
 To get your Lutron Caseta switches working with Home Assistant, follow the instructions for the general [Lutron Caseta component](/components/lutron_caseta/).
diff --git a/source/_components/switch.rest.markdown b/source/_components/switch.rest.markdown
index e79082cbf4f..deefd1b69cb 100644
--- a/source/_components/switch.rest.markdown
+++ b/source/_components/switch.rest.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: restful.png
 ha_category: Switch
 ha_release: 0.7.6
+ha_iot_class: "Local Polling"
 ---
 
 
diff --git a/source/_components/telegram_bot.markdown b/source/_components/telegram_bot.markdown
index 5cc99311a9f..1558621f39b 100644
--- a/source/_components/telegram_bot.markdown
+++ b/source/_components/telegram_bot.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: telegram.png
 ha_category: Hub
 ha_release: 0.42
+ha_iot_class: "Cloud Push"
 ---
 
 Use Telegram on your mobile or desktop device to send and receive messages or commands to/from your Home Assistant.
diff --git a/source/_components/volvooncall.markdown b/source/_components/volvooncall.markdown
index 016626d1305..b2ea329b844 100644
--- a/source/_components/volvooncall.markdown
+++ b/source/_components/volvooncall.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: volvo.png
 ha_category: Hub
 ha_release: 0.39
+ha_iot_class: "Cloud Polling"
 ---