diff --git a/client/src/app/util/__tests__/generateImageSpec.js b/client/src/app/util/__tests__/generateImageSpec.js
index 8e7cebe8fe..a8c0953251 100644
--- a/client/src/app/util/__tests__/generateImageSpec.js
+++ b/client/src/app/util/__tests__/generateImageSpec.js
@@ -24,7 +24,8 @@ const expectedImagesByType = {
 describe('util - generateImage', function() {
 
   const svg = require('./diagram.svg'),
-        outOfBoundsSVG = require('./out_of_bounds_diagram.svg');
+        outOfBoundsSVG = require('./out_of_bounds_diagram.svg'),
+        webhookSVG = require('./webhook.svg');
 
   keys(expectedImagesByType).forEach(function(type) {
 
@@ -32,7 +33,7 @@ describe('util - generateImage', function() {
 
       const image = await generateImage(type, svg);
 
-      expect(image).to.exist;
+      expectToBeAnImage(image);
     });
 
 
@@ -40,10 +41,7 @@ describe('util - generateImage', function() {
 
       const image = await generateImage(type, outOfBoundsSVG);
 
-      // if image cannot be generated properly it returns a data string with
-      // 6 characters. If it is generated, image.length returns the actual size
-      // of the generated image which is more than 6.
-      expect(image.length).to.be.greaterThan(6);
+      expectToBeAnImage(image);
     }).timeout(10000); // downscaling may exceed the default timeout 2000ms.
 
 
@@ -54,6 +52,25 @@ describe('util - generateImage', function() {
 
       expect(image).to.be.eql(expectedImage);
     });
+
+
+    it('should handle webhook icon <' + type + '>', async function() {
+
+      const image = await generateImage(type, webhookSVG);
+
+      expectToBeAnImage(image);
+    });
   });
 
 });
+
+
+/**
+ * If image cannot be generated properly it returns a data string with
+ * 6 characters. If it is generated, image.length returns the actual size
+ * of the generated image which is more than 6.
+ */
+function expectToBeAnImage(image) {
+  expect(image).to.exist;
+  expect(image.length).to.be.greaterThan(6);
+}
diff --git a/client/src/app/util/__tests__/webhook.svg b/client/src/app/util/__tests__/webhook.svg
new file mode 100644
index 0000000000..aa9c95e991
--- /dev/null
+++ b/client/src/app/util/__tests__/webhook.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- created with bpmn-js / http://bpmn.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="46" height="46" viewBox="147 77 46 46" version="1.1"><defs><pattern id="djs-grid-pattern-279480" width="10" height="10" patternUnits="userSpaceOnUse"><circle cx="0.5" cy="0.5" r="0.5" style="fill: rgb(204, 204, 204);"/></pattern></defs><g class="djs-group"><g class="djs-element djs-shape" data-element-id="Event_0lwofnq" style="display: block;" transform="matrix(1 0 0 1 152 82)"><g class="djs-visual"><circle cx="18" cy="18" r="18" style="stroke-linecap: round; stroke-linejoin: round; stroke: rgb(91, 23, 109); stroke-width: 1.5px; fill: rgb(225, 190, 231); fill-opacity: 0.95;"/><circle cx="18" cy="18" r="15" style="stroke-linecap: round; stroke-linejoin: round; stroke: rgb(91, 23, 109); stroke-width: 1.5px; fill: none;"/><image href="data:image/svg+xml,%3Csvg id='icon' xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 32 32'%3E%3Cdefs%3E%3Cstyle%3E .cls-1 %7B fill: none; %7D %3C/style%3E%3C/defs%3E%3Cpath d='M24,26a3,3,0,1,0-2.8164-4H13v1a5,5,0,1,1-5-5V16a7,7,0,1,0,6.9287,8h6.2549A2.9914,2.9914,0,0,0,24,26Z'/%3E%3Cpath d='M24,16a7.024,7.024,0,0,0-2.57.4873l-3.1656-5.5395a3.0469,3.0469,0,1,0-1.7326.9985l4.1189,7.2085.8686-.4976a5.0006,5.0006,0,1,1-1.851,6.8418L17.937,26.501A7.0005,7.0005,0,1,0,24,16Z'/%3E%3Cpath d='M8.532,20.0537a3.03,3.03,0,1,0,1.7326.9985C11.74,18.47,13.86,14.7607,13.89,14.708l.4976-.8682-.8677-.497a5,5,0,1,1,6.812-1.8438l1.7315,1.002a7.0008,7.0008,0,1,0-10.3462,2.0356c-.457.7427-1.1021,1.8716-2.0737,3.5728Z'/%3E%3Crect id='_Transparent_Rectangle_' data-name='&amp;lt;Transparent Rectangle&amp;gt;' class='cls-1' width='32' height='32'/%3E%3C/svg%3E" width="18" height="18" x="9" y="9"/></g><rect class="djs-hit djs-hit-all" x="0" y="0" width="36" height="36" style="fill: none; stroke-opacity: 0; stroke: white; stroke-width: 15px;"/><circle cx="18" cy="18" r="23" class="djs-outline" style="fill: none;"/></g></g></svg>
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 4552104926..471f44abfb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2735,9 +2735,10 @@
       }
     },
     "node_modules/@bpmn-io/element-template-icon-renderer/node_modules/tiny-svg": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.0.1.tgz",
-      "integrity": "sha512-P8T4iwiW1t95vpHVHqrD36Brn7TqFYCPSHIWk9WLJtYK1X4aDd+5cgqcAADIWSjf1/i5idKnpCh9mim8hEdRBg=="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+      "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ==",
+      "license": "MIT"
     },
     "node_modules/@bpmn-io/element-templates-validator": {
       "version": "2.1.0",
@@ -11279,9 +11280,10 @@
       }
     },
     "node_modules/bpmn-js/node_modules/tiny-svg": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.2.tgz",
-      "integrity": "sha512-qvNlv/4N48HqbNpwAhzQ9HKHlBUKgA4091x+aVfsrRXHIcQ9NA3W6ZYwdmYAIdwT+vfAAksrc9L/3RQBj5KwPw=="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+      "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ==",
+      "license": "MIT"
     },
     "node_modules/bpmn-moddle": {
       "version": "9.0.1",
@@ -14590,9 +14592,10 @@
       "integrity": "sha512-to+unsToePnm7cUeR9TrMzFlETHd/UXmU+ELTRfWZj5XGT41KF6X3L233o3E/GdEs3sk2Tbw/lOLD1avmWkg8A=="
     },
     "node_modules/diagram-js-grid/node_modules/tiny-svg": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.0.1.tgz",
-      "integrity": "sha512-P8T4iwiW1t95vpHVHqrD36Brn7TqFYCPSHIWk9WLJtYK1X4aDd+5cgqcAADIWSjf1/i5idKnpCh9mim8hEdRBg=="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+      "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ==",
+      "license": "MIT"
     },
     "node_modules/diagram-js-minimap": {
       "version": "5.1.0",
@@ -14625,9 +14628,10 @@
       }
     },
     "node_modules/diagram-js-minimap/node_modules/tiny-svg": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.2.tgz",
-      "integrity": "sha512-qvNlv/4N48HqbNpwAhzQ9HKHlBUKgA4091x+aVfsrRXHIcQ9NA3W6ZYwdmYAIdwT+vfAAksrc9L/3RQBj5KwPw=="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+      "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ==",
+      "license": "MIT"
     },
     "node_modules/diagram-js-origin": {
       "version": "1.4.0",
@@ -14640,7 +14644,9 @@
       }
     },
     "node_modules/diagram-js-origin/node_modules/tiny-svg": {
-      "version": "3.0.0",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+      "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ==",
       "license": "MIT"
     },
     "node_modules/diagram-js/node_modules/component-event": {
@@ -14675,9 +14681,9 @@
       }
     },
     "node_modules/diagram-js/node_modules/tiny-svg": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.2.tgz",
-      "integrity": "sha512-qvNlv/4N48HqbNpwAhzQ9HKHlBUKgA4091x+aVfsrRXHIcQ9NA3W6ZYwdmYAIdwT+vfAAksrc9L/3RQBj5KwPw==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+      "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ==",
       "license": "MIT"
     },
     "node_modules/didi": {
@@ -14927,9 +14933,10 @@
       }
     },
     "node_modules/dmn-js-drd/node_modules/tiny-svg": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.2.tgz",
-      "integrity": "sha512-qvNlv/4N48HqbNpwAhzQ9HKHlBUKgA4091x+aVfsrRXHIcQ9NA3W6ZYwdmYAIdwT+vfAAksrc9L/3RQBj5KwPw=="
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+      "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ==",
+      "license": "MIT"
     },
     "node_modules/dmn-js-literal-expression": {
       "version": "16.7.1",
@@ -35366,9 +35373,9 @@
       },
       "dependencies": {
         "tiny-svg": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.0.1.tgz",
-          "integrity": "sha512-P8T4iwiW1t95vpHVHqrD36Brn7TqFYCPSHIWk9WLJtYK1X4aDd+5cgqcAADIWSjf1/i5idKnpCh9mim8hEdRBg=="
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+          "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ=="
         }
       }
     },
@@ -41613,9 +41620,9 @@
           }
         },
         "tiny-svg": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.2.tgz",
-          "integrity": "sha512-qvNlv/4N48HqbNpwAhzQ9HKHlBUKgA4091x+aVfsrRXHIcQ9NA3W6ZYwdmYAIdwT+vfAAksrc9L/3RQBj5KwPw=="
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+          "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ=="
         }
       }
     },
@@ -44614,9 +44621,9 @@
           "integrity": "sha512-6kJqKWryKZmtte6QYvouas0/EIJKPI1/MMIuRsiBlNuhIMfqYTggzX2F1AJ2+cDs288xyi9GL7FyasHINR98BQ=="
         },
         "tiny-svg": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.2.tgz",
-          "integrity": "sha512-qvNlv/4N48HqbNpwAhzQ9HKHlBUKgA4091x+aVfsrRXHIcQ9NA3W6ZYwdmYAIdwT+vfAAksrc9L/3RQBj5KwPw=="
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+          "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ=="
         }
       }
     },
@@ -44642,9 +44649,9 @@
           "integrity": "sha512-to+unsToePnm7cUeR9TrMzFlETHd/UXmU+ELTRfWZj5XGT41KF6X3L233o3E/GdEs3sk2Tbw/lOLD1avmWkg8A=="
         },
         "tiny-svg": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.0.1.tgz",
-          "integrity": "sha512-P8T4iwiW1t95vpHVHqrD36Brn7TqFYCPSHIWk9WLJtYK1X4aDd+5cgqcAADIWSjf1/i5idKnpCh9mim8hEdRBg=="
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+          "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ=="
         }
       }
     },
@@ -44679,9 +44686,9 @@
           }
         },
         "tiny-svg": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.2.tgz",
-          "integrity": "sha512-qvNlv/4N48HqbNpwAhzQ9HKHlBUKgA4091x+aVfsrRXHIcQ9NA3W6ZYwdmYAIdwT+vfAAksrc9L/3RQBj5KwPw=="
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+          "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ=="
         }
       }
     },
@@ -44692,7 +44699,9 @@
       },
       "dependencies": {
         "tiny-svg": {
-          "version": "3.0.0"
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+          "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ=="
         }
       }
     },
@@ -44908,9 +44917,9 @@
           "integrity": "sha512-6kJqKWryKZmtte6QYvouas0/EIJKPI1/MMIuRsiBlNuhIMfqYTggzX2F1AJ2+cDs288xyi9GL7FyasHINR98BQ=="
         },
         "tiny-svg": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.2.tgz",
-          "integrity": "sha512-qvNlv/4N48HqbNpwAhzQ9HKHlBUKgA4091x+aVfsrRXHIcQ9NA3W6ZYwdmYAIdwT+vfAAksrc9L/3RQBj5KwPw=="
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/tiny-svg/-/tiny-svg-3.1.3.tgz",
+          "integrity": "sha512-9mwnPqXInRsBmH/DO6NMxBE++9LsqpVXQSSTZGc5bomoKKvL5OX/Hlotw7XVXP6XLRcHWIzZpxfovGqWKgCypQ=="
         }
       }
     },