diff --git a/html/images/os/tplink.png b/html/images/os/tplink.png
index d9a93d9dcf96..4cfd6eae32d0 100644
Binary files a/html/images/os/tplink.png and b/html/images/os/tplink.png differ
diff --git a/includes/polling/os/tplink.inc.php b/includes/polling/os/tplink.inc.php
index 2b70b754cd42..53ada3881ac1 100644
--- a/includes/polling/os/tplink.inc.php
+++ b/includes/polling/os/tplink.inc.php
@@ -1,5 +1,4 @@
 <?php
 
-preg_match('/JetStream [0-9]+-Port/', $poll_device['sysDescr'], $tmp_hardware);
-
-$hardware = $tmp_hardware[0];
+$version  = trim(snmp_get($device, 'RMON-MIB::rmon.19.2.0', '-Ovq'), '"');
+$hardware = trim(snmp_get($device, 'RMON-MIB::rmon.19.3.0', '-Ovq'), '"');