diff --git a/source/_components/ecobee.markdown b/source/_components/ecobee.markdown
index 2f7b0084e1b..a3861eecf5b 100644
--- a/source/_components/ecobee.markdown
+++ b/source/_components/ecobee.markdown
@@ -1,6 +1,6 @@
 ---
 layout: component
-title: "Ecobee thermostat"
+title: "Ecobee"
 description: "Instructions for how to integrate Ecobee thermostats and sensors within Home Assistant."
 date: 2015-11-30 17:54
 sidebar: true
@@ -12,12 +12,9 @@ ha_category: Hub
 ---
 
 
-The Ecobee platform lets you control a thermostats and view sensor data from the [Ecobee](https://ecobee.com)
-thermostat.
+The Ecobee platform lets you control a thermostats and view sensor data from the [Ecobee](https://ecobee.com) thermostat.
 
-You will need to obtain an API key from ecobee's [developer site](https://www.ecobee.com/developers/) to use this component.
-The first time you run Home-Assistant with this component it will give you a PIN code that you need to authorize in the
-[ecobee consumer portal](https://www.ecobee.com/consumerportal/index.html).  You can do this by clicking 'Add Application' in the 'My Apps' section in the sidebar.
+You will need to obtain an API key from ecobee's [developer site](https://www.ecobee.com/developers/) to use this component.  The first time you run Home-Assistant with this component it will give you a PIN code that you need to authorize in the [ecobee consumer portal](https://www.ecobee.com/consumerportal/index.html).  You can do this by clicking 'Add Application' in the 'My Apps' section in the sidebar.
 
 To set it up, add the following information to your `configuration.yaml` file:
 
diff --git a/source/_components/thermostat.ecobee.markdown b/source/_components/thermostat.ecobee.markdown
index a636a392cc5..eb25c3f2f29 100644
--- a/source/_components/thermostat.ecobee.markdown
+++ b/source/_components/thermostat.ecobee.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: ecobee.png
-ha_category: Sensor
+ha_category: Thermostat
 ---
 
 To get your Ecobee thermostats working with Home Assistant, follow the instructions for the general [Ecobee component](/components/ecobee/).
diff --git a/source/images/screenshots/ecobee-sensor-badges.png b/source/images/screenshots/ecobee-sensor-badges.png
index 3584d151443..0a132bceaca 100644
Binary files a/source/images/screenshots/ecobee-sensor-badges.png and b/source/images/screenshots/ecobee-sensor-badges.png differ
diff --git a/source/images/screenshots/ecobee-thermostat-card.png b/source/images/screenshots/ecobee-thermostat-card.png
index c3741930938..5c851879890 100644
Binary files a/source/images/screenshots/ecobee-thermostat-card.png and b/source/images/screenshots/ecobee-thermostat-card.png differ