diff --git a/source/_includes/asides/getting_started_navigation.html b/source/_includes/asides/getting_started_navigation.html
index 43c44fd8ff4..efb6823b99c 100644
--- a/source/_includes/asides/getting_started_navigation.html
+++ b/source/_includes/asides/getting_started_navigation.html
@@ -19,6 +19,7 @@
         <ul>
           <li>{% active_link /getting-started/configuration/ Configuration.yaml  %}</li>
           <li>{% active_link /getting-started/devices/ Setting up devices %}</li>
+          <li>{% active_link /getting-started/customizing-devices/ Customizing devices and services %}</li>
           <li>{% active_link /getting-started/presence-detection/ Presence Detection %}</li>
           <li>{% active_link /getting-started/automation/ Automation %}</li>
           <li>{% active_link /getting-started/troubleshooting-configuration/ Troubleshooting configuration.yaml %}</li>
diff --git a/source/getting-started/customizing-devices.markdown b/source/getting-started/customizing-devices.markdown
new file mode 100644
index 00000000000..d7803014947
--- /dev/null
+++ b/source/getting-started/customizing-devices.markdown
@@ -0,0 +1,42 @@
+---
+layout: page
+title: "Customizing devices and services"
+description: "Simple customization for devices and services in the frontend."
+date: 2016-04-20 06:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+---
+ 
+By default, all of your devices will be visible and have a default icon determined by their domain. You can customize the look and feel of your front 
+page by altering some of these parameters. This can be done by adding the following configuration inside the `homeassistant:` section.
+
+Devices that you don't want to have visible can be hidden with `hidden`.  
+`entity_picture`entries, badges, `device_tracker` pictures, etc. can either be external URLs (e.g. `http://example.com/example.jpg`) or 
+of the form `/local/filename.jpg`, where `/local` represents the directory `www` in the HASS configuration directory. 
+You may have to create the `www` directory yourself as it is not made automatically.
+
+You can also use `icon` and refer to any icon from [MaterialDesignIcons.com](http://MaterialDesignIcons.com).
+
+```yaml
+# Example configuration.yaml entry
+homeassistant:
+
+  # Add this to your existing configuration
+  # Only the `entity_id` is required.  All other options are optional.
+  customize:
+    sensor.living_room_motion:
+      hidden: true
+    thermostat.family_roomfamily_room:
+      entity_picture: https://dl.dropboxusercontent.com/u/12345/images/nest.jpg
+      friendly_name: Nest
+    switch.wemo_switch_1:
+      friendly_name: Toaster
+      entity_picture: /local/toaster.jpg
+    switch.wemo_switch_2:
+      friendly_name: Kitchen kettle
+      icon: mdi:kettle
+```
+
+### [Next step: Setting up presence detection &raquo;](/getting-started/presence-detection/)
diff --git a/source/getting-started/devices.markdown b/source/getting-started/devices.markdown
index cc454d8f0ec..8429f2312c5 100644
--- a/source/getting-started/devices.markdown
+++ b/source/getting-started/devices.markdown
@@ -72,33 +72,4 @@ group:
 
 For more details please check the [Group](https://home-assistant.io/components/group/) page.
 
-### {% linkable_title Customizing devices and services %}
-
-By default, all of your devices will be visible and have a default icon determined by their domain. You can customize the look and feel of your front page by altering some of these parameters. This can be done by adding the following configuration inside the `homeassistant:` section.
-
-Devices that you dont want to have visible can be hidden with `hidden`.  
-`entity_picture`entries, badges, `device_tracker` pictures, etc. can either be external URLs (e.g. `http://example.com/example.jpg`) or of the form `/local/filename.jpg`, where `/local` represents the directory `www` in the HASS configuration directory. You may have to create the `www` directory yourself as it is not made automatically.
-
-You can also use `icon` and refer to any icon from [MaterialDesignIcons.com](http://MaterialDesignIcons.com).
-
-```yaml
-# Example configuration.yaml entry
-homeassistant:
-
-  # Add this to your existing configuration
-  # Only the `entity_id` is required.  All other options are optional.
-  customize:
-    sensor.living_room_motion:
-      hidden: true
-    thermostat.family_roomfamily_room:
-      entity_picture: https://dl.dropboxusercontent.com/u/12345/images/nest.jpg
-      friendly_name: Nest
-    switch.wemo_switch_1:
-      friendly_name: Toaster
-      entity_picture: /local/toaster.jpg
-    switch.wemo_switch_2:
-      friendly_name: Kitchen kettle
-      icon: mdi:kettle
-```
-
-### [Next step: Setting up presence detection &raquo;](/getting-started/presence-detection/)
+### [Next step: Customizing devices and services &raquo;](/getting-started/customizing-devices/)