diff --git a/plugins/configuration.rb b/plugins/configuration.rb
index 52bcf87fb96..30a5196d721 100644
--- a/plugins/configuration.rb
+++ b/plugins/configuration.rb
@@ -2,7 +2,7 @@ module Jekyll
   class ConfigurationBlock < Liquid::Block
     TYPE_LINKS = {
       'action'       => '/docs/scripts/',
-      'device_class' => '/components/%{component}/#device_class',
+      'device_class' => '/components/%{component}/#device-class',
       'template'     => '/docs/configuration/templating/',
     }
 
diff --git a/source/_components/binary_sensor.markdown b/source/_components/binary_sensor.markdown
index 5826f9c1470..fe8f4a51078 100644
--- a/source/_components/binary_sensor.markdown
+++ b/source/_components/binary_sensor.markdown
@@ -11,6 +11,8 @@ footer: true
 
 Binary sensors gather information about the state of devices which have a "digital" return value (either 1 or 0). These can be switches, contacts, pins, etc. These sensors only have two states: **0/off/low/closed/false** and **1/on/high/open/true**.  Knowing that there are only two states allows Home Assistant to represent these sensors in a better way in the frontend according to their functionality.
 
+### {% linkable_title Device Class %}
+
 The way these sensors are displayed in the frontend can be modified in the [customize section](/getting-started/customizing-devices/). The following device classes are supported for binary sensors:
 
 - **None**: Generic on/off. This is the default and doesn't need to be set.
diff --git a/source/_components/sensor.markdown b/source/_components/sensor.markdown
index 57ee8300bb0..d973c2442e1 100644
--- a/source/_components/sensor.markdown
+++ b/source/_components/sensor.markdown
@@ -9,8 +9,20 @@ sharing: true
 footer: true
 ---
 
-Sensors are gathering information about states and conditions. 
+Sensors are gathering information about states and conditions.
 
 Home Assistant currently supports a wide range of sensors. They are able to display information which are provides by Home Assistant directly, are gathered from web services, and, of course, physical devices. Please check the sidebar for a full list of supported sensor platforms.
 
+### {% linkable_title Device Class %}
 
+The way these sensors are displayed in the frontend can be modified in the [customize section](/docs/configuration/customizing-devices/). The following device classes are supported for sensors:
+
+- **None**: Generic sensor. This is the default and doesn't need to be set.
+- **battery**: Percentage of battery that is left.
+- **humidity**: Percentage of humidity in the air.
+- **temperature**: Temperature in °C or °F.
+
+<p class='img'>
+<img src='/images/screenshots/sensor_device_classes_icons.png' />
+Example of various device class icons for sensors.
+</p>
diff --git a/source/_docs/configuration/customizing-devices.markdown b/source/_docs/configuration/customizing-devices.markdown
index c3cc8cc4415..a76c1ed2aa8 100644
--- a/source/_docs/configuration/customizing-devices.markdown
+++ b/source/_docs/configuration/customizing-devices.markdown
@@ -71,9 +71,10 @@ homeassistant:
 
 ### {% linkable_title Device Class %}
 
-Device class is currently supported by the following platforms:
+Device class is currently supported by the following components:
 
 * [Binary Sensor](/components/binary_sensor/)
+* [Sensor](/components/sensor/)
 * [Cover](/components/cover/)
 
 ### {% linkable_title Reloading customize %}
diff --git a/source/images/screenshots/sensor_device_classes_icons.png b/source/images/screenshots/sensor_device_classes_icons.png
new file mode 100644
index 00000000000..58e115250ca
Binary files /dev/null and b/source/images/screenshots/sensor_device_classes_icons.png differ