diff --git a/source/_components/sensor.zabbix.markdown b/source/_components/sensor.zabbix.markdown
index 7253916859b..9a3a123a8ab 100644
--- a/source/_components/sensor.zabbix.markdown
+++ b/source/_components/sensor.zabbix.markdown
@@ -7,12 +7,12 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-logo: 
-ha_category: Sensor
-ha_release: 0.35
+logo: zabbix.png
+ha_category: System Monitor
+ha_release: 0.37
+ha_iot_class: "Local Polling"
 ---
 
-
 The `zabbix` sensor platform let you monitor the current count of active triggers for your [Zabbix](http://www.zabbix.com/) monitoring instance.
 
 <p class='note'>
@@ -33,7 +33,7 @@ sensor:
 
 Configuration variables:
 
-- **triggers** (*Required*): Specifies that this sensor is for Zabbix 'triggers'.  In the future there will be other Zabbix sensors.
+- **triggers** array(*Required*): Specifies that this sensor is for Zabbix 'triggers'. In the future there will be other Zabbix sensors.
 - **name** (*Optional*): Allows you to specify the name for the Sensor, otherwise the host name, as stored in Zabbix, is used.  This is useful when you are specifying a list of hostids to monitor as a single count.
 - **hostids** (*Optional*): This is a list of Zabbis hostids that we want to filter our count on.
 - **individual** (*Optional*): A 'true'/'false' to specify whether we should show individual sensors when a list of hostsids is provided.  If false, the sensor state will be the count of all triggers for the specified hosts (or all hosts within the Zabbix instance, if hostids isn't provided).
diff --git a/source/_components/zabbix.markdown b/source/_components/zabbix.markdown
index c113092c3c9..41c9e643155 100644
--- a/source/_components/zabbix.markdown
+++ b/source/_components/zabbix.markdown
@@ -7,22 +7,24 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-logo: g
-ha_category: 
+logo: zabbix.png
+ha_category: System Monitor
 featured: false
-ha_release: 0.35
+ha_release: 0.37
 ---
 
-The Zabbix component is the main component to connect to a Zabbix monitoring instance via the Zabbix API.
+The `zabbix` component is the main component to connect to a [Zabbix](http://www.zabbix.com/) monitoring instance via the Zabbix API.
+
+To set the Zabbix component up, add the following information to your `configuration.yaml` file:
 
 ```yaml
+# Example configuration.yaml entry
 zabbix:
   host: 192.168.0.100
-  username: zabbix_user
-  password: zabbix_password
 ```
 
 Configuration variables:
+
 - **host** (*Required*): Your Zabbix server.
 - **path** (*Optional*): Path to your Zabbix install. Defaults to `/zabbix/`.
 - **ssl** (*Optional*): Set to `True` if your Zabbix installation is using SSL. Default to `False`.
diff --git a/source/images/supported_brands/zabbix.png b/source/images/supported_brands/zabbix.png
new file mode 100644
index 00000000000..0a62d6df936
Binary files /dev/null and b/source/images/supported_brands/zabbix.png differ