diff --git a/html/images/os/ricoh.png b/html/images/os/ricoh.png
deleted file mode 100644
index ff2a45b7ed..0000000000
Binary files a/html/images/os/ricoh.png and /dev/null differ
diff --git a/html/images/os/ricoh.svg b/html/images/os/ricoh.svg
new file mode 100644
index 0000000000..f4185c5dc6
--- /dev/null
+++ b/html/images/os/ricoh.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1" viewBox="0 0 200 36.093"><g fill="#d7063b"><path d="M78.927 17.952c0 6.68 4.95 11.612 13.215 11.612 3.486 0 6.78-.55 10.183-2.14l3.09 4.226c-4.276 2.262-8.393 3.443-14.72 3.443-13.19 0-22.888-6.35-22.888-17.14v-.003c0-10.784 9.7-17.14 22.89-17.14 6.325 0 9.96.928 14.418 2.838l-3.175 4.856c-3.37-1.796-6.312-2.163-9.798-2.163-8.264 0-13.215 4.92-13.215 11.604M129.26.805c-12.772 0-21.984 6.357-21.984 17.144 0 10.79 9.212 17.142 21.984 17.142 12.77 0 21.98-6.35 21.98-17.143 0-10.788-9.21-17.145-21.98-17.145m0 28.954c-7.028 0-10.907-5.28-10.907-11.816 0-6.536 3.88-11.81 10.907-11.81 7.023 0 10.903 5.274 10.903 11.81 0 6.535-3.88 11.815-10.903 11.815M184.446 20.43v13.797H195V1.67h-10.554v12.408h-16.133V1.668H157.78v32.56h10.533v-13.8h16.133zM50.328 34.227h11.116V1.67H50.328v32.557zM18.45 16.57l-.004 3.115c5.23 4.04 10.557 9.415 14.464 14.542h12.44C41.02 29.143 34.383 23.1 29.492 20.06c5.74-.24 12.143-2.562 12.143-9.15 0-8.462-9.04-10.005-18.176-10.005-7.465 0-14.346.34-18.46.68v32.642h10.366V6.495c1.92-.205 3.983-.433 8.143-.433 5.34 0 8.044 1.762 8.044 4.847 0 2.626-1.12 5.774-13.105 5.66"/></g></svg>
diff --git a/includes/definitions/gestetner.yaml b/includes/definitions/gestetner.yaml
new file mode 100644
index 0000000000..f85016b68f
--- /dev/null
+++ b/includes/definitions/gestetner.yaml
@@ -0,0 +1,16 @@
+os: gestetner
+group: printer
+text: 'Gestetner Printer'
+type: printer
+icon: ricoh
+over:
+    - { graph: device_toner, text: Toner }
+discovery:
+    - sysDescr:
+        - Gestetner Network Printer
+discovery_modules:
+    toner: 1
+    mempools: 0
+poller_modules:
+    toner: 1
+    mempools: 0
\ No newline at end of file
diff --git a/includes/polling/os/gestetner.inc.php b/includes/polling/os/gestetner.inc.php
new file mode 100644
index 0000000000..10172afcb6
--- /dev/null
+++ b/includes/polling/os/gestetner.inc.php
@@ -0,0 +1,10 @@
+<?php
+
+// SNMPv2-SMI::enterprises.367.3.2.1.1.1.1.0 = STRING: "Aficio MP 3350"
+$hardware = trim(snmp_get($device, '1.3.6.1.4.1.367.3.2.1.1.1.1.0', '-OQv', '', ''), '" ');
+
+// SNMPv2-SMI::enterprises.367.3.2.1.1.1.2.0 = STRING: "1.15"
+$version = trim(snmp_get($device, '1.3.6.1.4.1.367.3.2.1.1.1.2.0', '-OQv', '', ''), '" ');
+
+// SNMPv2-SMI::enterprises.367.3.2.1.2.1.4.0 = STRING: "M6394300657"
+$serial = trim(snmp_get($device, '1.3.6.1.4.1.367.3.2.1.2.1.4.0', '-OQv', '', ''), '" ');
diff --git a/tests/snmpsim/gestetner.snmprec b/tests/snmpsim/gestetner.snmprec
new file mode 100644
index 0000000000..7baa349be7
--- /dev/null
+++ b/tests/snmpsim/gestetner.snmprec
@@ -0,0 +1,3 @@
+1.3.6.1.2.1.1.1.0|4|Gestetner MPC2500/DSc525 1.71 / Gestetner Network Printer C model / Gestetner Network Scanner C model
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.367.1.1
+