diff --git a/src/drivers/webextension/images/icons/Accessibe.png b/src/drivers/webextension/images/icons/Accessibe.png
deleted file mode 100644
index 77614df7d..000000000
Binary files a/src/drivers/webextension/images/icons/Accessibe.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Accessibe.svg b/src/drivers/webextension/images/icons/Accessibe.svg
new file mode 100644
index 000000000..238f0ede6
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Accessibe.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 258 240">
+  <path d="M166.9 240H72.1l83.6-219a34 34 0 0131.2-21H242a16 16 0 0114.9 22.1l-73.7 206.5-.3.8a17.3 17.3 0 01-10.5 9.7l-1.4.4-.7.2-1.4.2-2 .1z" fill="#136ef8"/>
+  <path d="M155.3 240H59.6a17.1 17.1 0 01-14-9.3l-1.1-2.8L1.2 102.3a16 16 0 0114.9-22h51.8c13.7 0 26.1 8.4 31.2 21.1L152 229c2.3 5.9 7.4 11 13.7 10.9l-10.4.1z" fill="#60d0ff"/>
+  <path d="M152 229c2.3 5.8 7.3 10.9 13.5 10.9H72.1L112.5 134l39.5 95z" fill="#2d7fff"/>
+  <path d="M166.9 240h-1.5c-6.2-.1-11.1-5.2-13.4-10.9l-39.4-94.9 18-47.2 27.2 132.8s1.2 15.6 14.4 19.4l-1.3.4-.7.2-1.4.2h-1.9z" fill="#0047d8"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/AudioEye.png b/src/drivers/webextension/images/icons/AudioEye.png
deleted file mode 100644
index 0708ecf1d..000000000
Binary files a/src/drivers/webextension/images/icons/AudioEye.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/AudioEye.svg b/src/drivers/webextension/images/icons/AudioEye.svg
new file mode 100644
index 000000000..693be792d
--- /dev/null
+++ b/src/drivers/webextension/images/icons/AudioEye.svg
@@ -0,0 +1,10 @@
+<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 29.74 30.13">
+  <path d="M7.6 9.56a5.65 5.65 0 00-5.83 1.26 5.79 5.79 0 00-.09 8.24 5.85 5.85 0 006 1.45A10.12 10.12 0 017.6 9.56z" fill="#0376bd"/>
+  <path d="M7.6 9.56a9.5 9.5 0 00-1.53 5.23 10.45 10.45 0 001.62 5.72 6.76 6.76 0 002.11-1.26 5.81 5.81 0 001.68-4.07 5.9 5.9 0 00-1.63-4.17A5.76 5.76 0 007.6 9.56z" fill="#305b5c"/>
+  <path d="M9.48 22.36a5.83 5.83 0 001.15 5.91 5.68 5.68 0 008.12.29 5.9 5.9 0 001.52-6.11 9.7 9.7 0 01-10.79-.09z" fill="#febd1c"/>
+  <path d="M15.05 18.57a5.66 5.66 0 00-4.11 1.61 6.23 6.23 0 00-1.46 2.18A9.1 9.1 0 0014.64 24a9.86 9.86 0 005.63-1.55 6.7 6.7 0 00-1.24-2.13 5.63 5.63 0 00-3.98-1.75z" fill="#e09526"/>
+  <path d="M28.23 11.11a5.67 5.67 0 00-6-1.55 10.28 10.28 0 01-.09 10.95 5.64 5.64 0 005.83-1.16 6 6 0 00.26-8.24z" fill="#f89521"/>
+  <path d="M22.21 9.56a5.78 5.78 0 00-2.1 1.26 5.56 5.56 0 00-1.81 4.07 5.79 5.79 0 001.53 4.17 6.11 6.11 0 002.19 1.45 9.39 9.39 0 001.63-5.23 10.18 10.18 0 00-1.44-5.72z" fill="#d37328"/>
+  <path d="M20.21 7.71a5.89 5.89 0 00-1.24-5.91 5.59 5.59 0 00-8.12-.1 6.1 6.1 0 00-1.44 6.11 9.74 9.74 0 0110.8-.1z" fill="#25b8eb"/>
+  <path d="M15.05 6.06a10.08 10.08 0 00-5.64 1.65 6.86 6.86 0 001.25 2.14 5.62 5.62 0 004 1.74 5.71 5.71 0 004.11-1.65 6 6 0 001.43-2.32 11.08 11.08 0 00-5.15-1.56z" fill="#20886e"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Facil-iti.png b/src/drivers/webextension/images/icons/Facil-iti.png
deleted file mode 100644
index 8e1091214..000000000
Binary files a/src/drivers/webextension/images/icons/Facil-iti.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Facil-iti.svg b/src/drivers/webextension/images/icons/Facil-iti.svg
new file mode 100644
index 000000000..06ccdb022
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Facil-iti.svg
@@ -0,0 +1,4 @@
+<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 66.2 32">
+  <path fill="#e2033c" d="M65.3 6.6l-22.5 5 2.5 3.1 20-8.1zM.6 6.5l22.5 5.1-2.5 3-20-8.1zM33.1 19.8l10.1-4.2L33.1 0 22.6 15.5l10.5 4.3v.1-.1.1-.1z"/>
+  <path fill="#e2033c" d="M33.1 22.3L0 8.4 14.1 32h38L66.2 8.4 33.1 22.3z"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Google Analytics.svg b/src/drivers/webextension/images/icons/Google Analytics.svg
index 5ac2f3aef..20f5920ea 100644
--- a/src/drivers/webextension/images/icons/Google Analytics.svg	
+++ b/src/drivers/webextension/images/icons/Google Analytics.svg	
@@ -1 +1,4 @@
-<svg width="256" height="256" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><defs><filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="a"><feOffset dy="16" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation="9" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.214965466 0" in="shadowBlurOuter1" result="shadowMatrixOuter1"/><feMerge><feMergeNode in="shadowMatrixOuter1"/><feMergeNode in="SourceGraphic"/></feMerge></filter></defs><path d="M127.979 155.387L256 27.93v-7.323C256 9.227 246.773 0 235.392 0H20.608C9.227 0 0 9.227 0 20.608v150.304l71.067-70.656 56.912 55.13" fill="#FF9C0B"/><path d="M71.088 157.83L0 228.767v6.624C0 246.773 9.227 256 20.608 256h214.784c11.381 0 20.608-9.227 20.608-20.608V86.597L127.979 214.053 71.088 157.83" fill="#FB5722"/><path d="M0 170.912l71.067-70.656 56.912 55.13L256 27.932l-.021 58.682-128 127.44-56.891-56.224L0 228.768v-57.856" fill="#F2F2F2" filter="url(#a)"/><path d="M99.552 185.968l.005-58.117-28.469 29.978 28.464 28.139" fill="#FF9B07"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2195.9 2430.9">
+  <path d="M2196 2127a302 302 0 01-338 301 310 310 0 01-264-314V316A310 310 0 011859 2a302 302 0 01337 302v1823z" fill="#f9ab00"/>
+  <path d="M301 1829a301 301 0 110 602 301 301 0 010-602zm792-913a310 310 0 00-293 317v809c1 219 97 352 239 381a302 302 0 00361-297v-907a302 302 0 00-307-303z" fill="#e37400"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Google App Engine.png b/src/drivers/webextension/images/icons/Google App Engine.png
deleted file mode 100644
index 32ff514d7..000000000
Binary files a/src/drivers/webextension/images/icons/Google App Engine.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Google App Engine.svg b/src/drivers/webextension/images/icons/Google App Engine.svg
new file mode 100644
index 000000000..dd44866e7
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Google App Engine.svg	
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 612 490">
+  <path fill="#424242" fill-rule="evenodd" d="M376.4 220.8l-37.3 37.4a52.4 52.4 0 11-73.7 73.6l-37.3 37.4a105 105 0 10148.3-148.4z"/>
+  <path fill="#757575" fill-rule="evenodd" d="M306 107.5a191.2 191.2 0 100 382.5 191.2 191.2 0 000-382.5m0 327.2a136 136 0 11136-136 136 136 0 01-136 136"/>
+  <path fill="#626261" fill-rule="evenodd" d="M600.3 280.1l-78.2-24.6a222 222 0 012.5 79.8h75.7c7-2 11.7-6.3 11.7-12.8V293c0-6.4-4.7-10.9-11.7-12.8M305 84.8a222 222 0 0145.9 4.8l-28.1-78c-2-7-6.4-11.6-12.8-11.6h-11.7c-6.4 0-11 4.7-12.8 11.7L261 89.2a222 222 0 0144-4.4M84.9 302.3a222.3 222.3 0 015-46.8l-78.2 24.6c-7 2-11.7 6.4-11.7 12.8v29.6c0 6.4 4.7 10.8 11.7 12.8h75.7a224.5 224.5 0 01-2.5-33m221.1-80a76.5 76.5 0 1076.5 76.5 76.5 76.5 0 00-76.5-76.5zm0 114.7a38.3 38.3 0 1138.3-38.2A38.3 38.3 0 01306 337z"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Google Maps.png b/src/drivers/webextension/images/icons/Google Maps.png
deleted file mode 100644
index bda281d74..000000000
Binary files a/src/drivers/webextension/images/icons/Google Maps.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Google Maps.svg b/src/drivers/webextension/images/icons/Google Maps.svg
new file mode 100644
index 000000000..83a607868
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Google Maps.svg	
@@ -0,0 +1,7 @@
+<svg height="2500" viewBox="14.32 4.88 37.856 52.79" width="2500" xmlns="http://www.w3.org/2000/svg">
+  <path d="M37.34 7.82C35.66 7.29 33.86 7 32 7c-5.43 0-10.29 2.45-13.54 6.31l8.35 7.02z" fill="#1a73e8"/>
+  <path d="M18.46 13.31a17.615 17.615 0 00-4.14 11.36c0 3.32.66 6.02 1.75 8.43l10.74-12.77z" fill="#ea4335"/>
+  <path d="M32 17.92a6.764 6.764 0 015.16 11.13l10.52-12.51a17.684 17.684 0 00-10.35-8.71L26.82 20.34A6.74 6.74 0 0132 17.92" fill="#4285f4"/>
+  <path d="M32 31.44c-3.73 0-6.76-3.03-6.76-6.76a6.7 6.7 0 011.58-4.34L16.07 33.11c1.84 4.07 4.89 7.34 8.03 11.46l13.06-15.52A6.752 6.752 0 0132 31.44" fill="#fbbc04"/>
+  <path d="M36.9 48.8c5.9-9.22 12.77-13.41 12.77-24.13 0-2.94-.72-5.71-1.99-8.15L24.11 44.57c1 1.31 2.01 2.7 2.99 4.24 3.58 5.54 2.59 8.86 4.9 8.86s1.32-3.33 4.9-8.87" fill="#34a853"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Google PageSpeed.png b/src/drivers/webextension/images/icons/Google PageSpeed.png
deleted file mode 100644
index 8f830f0e4..000000000
Binary files a/src/drivers/webextension/images/icons/Google PageSpeed.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Google PageSpeed.svg b/src/drivers/webextension/images/icons/Google PageSpeed.svg
new file mode 100644
index 000000000..3de254771
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Google PageSpeed.svg	
@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="2338" viewBox="-1.7 -1.8 285.6 266.9">
+  <linearGradient id="a" x1="1766.9" x2="1944" y1="-11285.7" y2="-11462.8" gradientTransform="matrix(.5 0 0 -.5 -710.3 -5458.2)" gradientUnits="userSpaceOnUse">
+    <stop offset="0" stop-color="#212121" stop-opacity=".2"/>
+    <stop offset="1" stop-color="#212121" stop-opacity="0"/>
+  </linearGradient>
+  <radialGradient id="b" cx="1452.8" cy="-10980.2" r="680.4" gradientTransform="matrix(.5 0 0 -.5 -710.3 -5458.2)" gradientUnits="userSpaceOnUse">
+    <stop offset="0" stop-color="#fff" stop-opacity=".1"/>
+    <stop offset="1" stop-color="#fff" stop-opacity="0"/>
+  </radialGradient>
+  <path fill="#e1e1e1" d="M272.7 37.2V217a18.6 18.6 0 01-18.5 18.6H18.7A18.6 18.6 0 010 216.9V37.2z"/>
+  <path fill="#c2c2c2" d="M18.6 0h235.6a18.6 18.6 0 0118.5 18.6v18.6H.1V18.6A18.6 18.6 0 0118.6 0z"/>
+  <path fill="#fff" fill-opacity=".2" d="M254.2 0H18.7A18.6 18.6 0 000 18.6V20A18.6 18.6 0 0118.6 1.5h235.6a18.6 18.6 0 0118.5 18.6v-1.5A18.6 18.6 0 00254.2 0z"/>
+  <path fill="#212121" fill-opacity=".1" d="M0 37.2h272.7v1.5H.1z"/>
+  <path fill="#4285f4" d="M136.3 93a99 99 0 00-99 99v6.3h43.3a54.9 54.9 0 010-6.2 55.8 55.8 0 0185-47.5l31.1-31a98.8 98.8 0 00-60.4-20.7z"/>
+  <path fill="#f44336" d="M196.7 113.5l-31.1 31.1a55.7 55.7 0 0126.5 47.5 54.9 54.9 0 010 6.2h43.4c.2-1.5 0-4.2 0-6.3a99 99 0 00-38.8-78.5z"/>
+  <circle cx="24.9" cy="18.6" r="6.2" fill="#eee"/>
+  <circle cx="49.6" cy="18.6" r="6.2" fill="#eee"/>
+  <path fill="#212121" fill-opacity=".1" d="M254.2 234H18.6A18.6 18.6 0 010 215.2v1.5a18.6 18.6 0 0018.6 18.6h235.6a18.6 18.6 0 0018.5-18.6v-1.5a18.6 18.6 0 01-18.5 18.6z"/>
+  <path fill="#9e9e9e" d="M197 117.2a3 3 0 00.6-1.8 3.1 3.1 0 00-3.1-3 3 3 0 00-2 .6L125 165a18.6 18.6 0 1027.3 24.3l44.7-72z"/>
+  <path fill="#fff" d="M125 166.6l67.6-52a3 3 0 014.9 1.6 2.9 2.9 0 000-.8 3.1 3.1 0 00-3-3 3 3 0 00-2 .6L125 165a18.5 18.5 0 00-7.2 14.7v.9a18.6 18.6 0 017.2-14z" opacity=".2"/>
+  <path fill="#212121" d="M197 117.2l-44.7 72.2a18.6 18.6 0 01-34.4-8.8v.7a18.6 18.6 0 0034.4 9.6l44.8-72.1a3 3 0 00.5-1.8 2.7 2.7 0 000-.8 3.3 3.3 0 01-.6 1z" opacity=".2"/>
+  <path fill="url(#a)" d="M206.2 141.3a3 3 0 010 3.7l-44.7 72.1a18.6 18.6 0 01-28 4.5l41.7 41.6h88.2a18.6 18.6 0 0018.6-18.5V217z" transform="translate(-9.3 -27.8)"/>
+  <path fill="url(#b)" d="M282 46.4a18.6 18.6 0 00-18.6-18.6H28A18.6 18.6 0 009.3 46.4v198.3A18.6 18.6 0 0028 263.1h235.5a18.6 18.6 0 0018.6-18.5z" transform="translate(-9.3 -27.8)"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Google Tag Manager.png b/src/drivers/webextension/images/icons/Google Tag Manager.png
deleted file mode 100644
index 3e316480e..000000000
Binary files a/src/drivers/webextension/images/icons/Google Tag Manager.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Google Tag Manager.svg b/src/drivers/webextension/images/icons/Google Tag Manager.svg
new file mode 100644
index 000000000..ebbc641de
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Google Tag Manager.svg	
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 2469.7 2469.8" style="enable-background:new 0 0 2469.7 2469.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#8AB4F8;}
+	.st1{fill:#4285F4;}
+	.st2{fill:#246FDB;}
+</style>
+<g>
+	<path class="st0" d="M1449.8,2376L1021,1946.7l921.1-930.5l436.7,436.6L1449.8,2376z"/>
+	<path class="st1" d="M1452.9,527.1L1016.3,90.4L90.5,1016.2c-120.6,120.5-120.7,315.8-0.2,436.4c0.1,0.1,0.2,0.2,0.2,0.2
+		l925.8,925.8l428.3-430.3L745,1235.1L1452.9,527.1z"/>
+	<path class="st0" d="M2378.7,1016.2L1452.9,90.4c-120.6-120.6-316.1-120.6-436.7,0c-120.6,120.6-120.6,316.1,0,436.6l926.3,925.8
+		c120.6,120.6,316.1,120.6,436.6,0c120.6-120.6,120.6-316.1,0-436.6L2378.7,1016.2z"/>
+	<circle class="st2" cx="1231.2" cy="2163.9" r="306"/>
+</g>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Heap.png b/src/drivers/webextension/images/icons/Heap.png
deleted file mode 100644
index 5713f7f0c..000000000
Binary files a/src/drivers/webextension/images/icons/Heap.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Heap.svg b/src/drivers/webextension/images/icons/Heap.svg
new file mode 100644
index 000000000..4032de893
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Heap.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 183.3 209.6">
+  <path fill="#ed485f" d="M180 50L95 1a7 7 0 00-7 0L3 50a7 7 0 00-3 6v98a7 7 0 003 6l85 49a7 7 0 007 0l85-49a7 7 0 003-6V56a7 7 0 00-3-6zm-18 95l-70 41-71-41V64l71-40v75a3 3 0 005 3l65-38z" data-name="Heap-RGB Logo-Horizontal-Lockup-Color"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Hotjar.png b/src/drivers/webextension/images/icons/Hotjar.png
deleted file mode 100644
index dd9f0c3db..000000000
Binary files a/src/drivers/webextension/images/icons/Hotjar.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Hotjar.svg b/src/drivers/webextension/images/icons/Hotjar.svg
new file mode 100644
index 000000000..6a20f65d7
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Hotjar.svg
@@ -0,0 +1,3 @@
+<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 289.3 323.5">
+  <path d="M198.6 314.4c23.9-85.7 15.3-128.9-26.6-137.2 6.4 29.1 13.6 59-17 79.2-16 10.6-28.7 6.5-57.1-15.3-13.1 26.9-8.7 53.7-2.6 82.4-40.7-7.1-72.8-24-87.7-63.3a93.5 93.5 0 0121.1-104.3 249.5 249.5 0 0131.7-27.3c45.8-34.4 54.7-67.8 30.5-119.5A58.8 58.8 0 0188.3 0a307.5 307.5 0 01140.1 59.4c89.3 73 78.5 204.3-20.1 252.5a25.3 25.3 0 00-9.7 2.5z" fill="#ee4854"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Imperva.svg b/src/drivers/webextension/images/icons/Imperva.svg
index 371e04285..23f102c3b 100644
--- a/src/drivers/webextension/images/icons/Imperva.svg
+++ b/src/drivers/webextension/images/icons/Imperva.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 178.338 163.568"><g transform="translate(-160.86 -168.43)"><path d="M34-101.49v-19.89H9.86v19.89ZM9.86-87.89V0H34V-87.89Zm43.86,0V0H77.86V-51a24.843,24.843,0,0,1,1.87-10.455,16.88,16.88,0,0,1,4.505-6.12,14.951,14.951,0,0,1,5.44-2.89,18.09,18.09,0,0,1,4.5-.765q5.78,0,8.755,1.955a10.85,10.85,0,0,1,4.25,5.185,21.711,21.711,0,0,1,1.445,7.055q.17,3.825.17,7.735V0h24.14V-48.96a54.741,54.741,0,0,1,.6-8.075,20.422,20.422,0,0,1,2.38-7.14,14.164,14.164,0,0,1,4.93-5.1,15.442,15.442,0,0,1,8.245-1.955,16.294,16.294,0,0,1,8.075,1.7,11.322,11.322,0,0,1,4.505,4.59,17.678,17.678,0,0,1,1.87,6.8q.34,3.91.34,8.33V0h24.14V-58.82a39.64,39.64,0,0,0-2.38-14.535,24.921,24.921,0,0,0-6.63-9.775,26.01,26.01,0,0,0-10.2-5.44,46.875,46.875,0,0,0-12.92-1.7,28.248,28.248,0,0,0-15.9,4.42,37.416,37.416,0,0,0-10.625,10.2q-3.57-8.16-10.455-11.39A35.377,35.377,0,0,0,103.7-90.27a31.083,31.083,0,0,0-15.385,3.74A34.377,34.377,0,0,0,76.84-75.99H76.5v-11.9Z" transform="translate(151 294)" fill="#295ae6"/><path d="M161.2,164.43v24h24v-24Z" transform="translate(154 143.57)"/><path d="M161.2,164.43v24h24v-24Z" transform="translate(0 4)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 178.3 163.6">
+  <path d="M24.1 24V4.3H0V24zM0 37.8v87.9h24.1v-88zm43.9 0v87.9H68v-51A24.8 24.8 0 0169.9 64a16.9 16.9 0 014.5-6.1 15 15 0 015.4-2.9 18 18 0 014.5-.8q5.8 0 8.8 2a10.8 10.8 0 014.2 5.2 21.7 21.7 0 011.5 7l.1 7.8v49.3h24.2v-49a54.7 54.7 0 01.6-8 20.4 20.4 0 012.4-7.2 14.2 14.2 0 014.9-5.1 15.4 15.4 0 018.2-2 16.3 16.3 0 018.1 1.7 11.3 11.3 0 014.5 4.6 17.7 17.7 0 011.9 6.8q.3 4 .3 8.4v49.8h24.2V66.7a39.6 39.6 0 00-2.4-14.5 25 25 0 00-6.7-9.8A26 26 0 00159 37a46.9 46.9 0 00-12.9-1.7 28.2 28.2 0 00-15.9 4.4A37.4 37.4 0 00119.5 50Q116 41.8 109 38.5a35.4 35.4 0 00-15.2-3.2A31 31 0 0078.5 39 34.4 34.4 0 0067 49.6h-.4v-12z" fill="#295ae6"/>
+  <path d="M154.3 139.6v24h24v-24zM.3 0v24h24V0z"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Synology DiskStation.png b/src/drivers/webextension/images/icons/Synology DiskStation.png
deleted file mode 100644
index 68ed5ff34..000000000
Binary files a/src/drivers/webextension/images/icons/Synology DiskStation.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Synology DiskStation.svg b/src/drivers/webextension/images/icons/Synology DiskStation.svg
new file mode 100644
index 000000000..80d9e379b
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Synology DiskStation.svg	
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80.08 102.36"><g id="圖層_1" data-name="圖層 1"><path d="M0,76.17l19.26-1.8q1.78,9.7,7.09,14.28t14.42,4.53c6.39,0,11.21-1.37,14.48-4.05s4.84-5.88,4.84-9.46a9.14,9.14,0,0,0-2-6c-1.37-1.6-3.74-3-7.13-4.2-2.34-.89-7.63-2.31-15.87-4.41C24.42,62.45,17,59.18,12.71,55.33A26,26,0,0,1,3.65,35.39a24.94,24.94,0,0,1,4.27-14.1A26.78,26.78,0,0,1,20.23,11.23C25.57,9,32,7.83,39.61,7.83q18.49,0,27.87,8.17c6.24,5.53,9.5,12.78,9.81,21.88l-19.94.67c-.88-5-2.65-8.63-5.47-10.87s-7-3.34-12.51-3.34c-5.76,0-10.28,1.18-13.52,3.6A7.15,7.15,0,0,0,22.69,34a7.51,7.51,0,0,0,2.95,6c2.48,2.16,8.58,4.35,18.23,6.6s16.79,4.68,21.4,7.14a27.66,27.66,0,0,1,10.87,10.1c2.59,4.17,3.94,9.51,3.94,15.78a29.16,29.16,0,0,1-4.72,15.91,28.52,28.52,0,0,1-13.3,11c-5.74,2.35-12.88,3.61-21.43,3.61q-18.68,0-28.7-8.73C5.23,95.64,1.3,87.22,0,76.17Z" transform="translate(0 -7.83)" style="fill:#4a5158"/></g></svg>
\ No newline at end of file
diff --git a/src/drivers/webextension/images/icons/Texthelp.png b/src/drivers/webextension/images/icons/Texthelp.png
deleted file mode 100644
index 3232e1d76..000000000
Binary files a/src/drivers/webextension/images/icons/Texthelp.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Texthelp.svg b/src/drivers/webextension/images/icons/Texthelp.svg
new file mode 100644
index 000000000..bb0ac9d26
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Texthelp.svg
@@ -0,0 +1,4 @@
+<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 89 90.1">
+  <path d="M85 0H15.3A15.5 15.5 0 000 15.5V53a15.3 15.3 0 0015.3 15.3h9.4v17.5a4.4 4.4 0 008.8 0V68.2h4.2v17.5a4.4 4.4 0 008.8 0V68.2h12a15.4 15.4 0 0015.3-15.3V18.3l13.4-13c3-2.8 2-5.3-2.2-5.3zM59.2 15.2a4.2 4.2 0 114.2-4.3 4.3 4.3 0 01-4.2 4.3z" fill="#fd3269"/>
+  <circle cx="59.2" cy="10.9" r="4.2" fill="#fff"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/TrackJs.png b/src/drivers/webextension/images/icons/TrackJs.png
deleted file mode 100644
index 514dad9d9..000000000
Binary files a/src/drivers/webextension/images/icons/TrackJs.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/TrackJs.svg b/src/drivers/webextension/images/icons/TrackJs.svg
new file mode 100644
index 000000000..1ea09385d
--- /dev/null
+++ b/src/drivers/webextension/images/icons/TrackJs.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 69.4 65">
+  <path fill="#212932" d="M44.2 7H19.6a4.5 4.5 0 00-4.3 4.6v41.8a4.5 4.5 0 004.3 4.7h30.2a4.5 4.5 0 004.3-4.7V17.6L44.2 6.9zM19.6 53.3V11.6h21.6v9.3h8.6v32.5z"/>
+  <path fill="#212932" d="M6 32.5A9.2 9.2 0 018 34a7 7 0 011.4 2.1 11.7 11.7 0 011 3 25.3 25.3 0 01.2 4.3v7.2c0 2 0 3.8.2 5.2a8.3 8.3 0 00.8 3.4 4 4 0 002.2 1.9 12.9 12.9 0 004.2.5V65h-.5a16.6 16.6 0 01-5.4-.7A7.8 7.8 0 018.7 62 8 8 0 017 58.6a20.3 20.3 0 01-.5-4.8v-13a7.7 7.7 0 00-.4-2.4 6 6 0 00-1.1-2 6.4 6.4 0 00-2-1.6 6.4 6.4 0 00-3-.7V31a6.3 6.3 0 002.9-.6 6.4 6.4 0 002-1.6 6 6 0 001.2-2 7.7 7.7 0 00.4-2.5v-13A20.3 20.3 0 017 6.4a8.2 8.2 0 011.7-3.5A7.8 7.8 0 0112.1.7a16.6 16.6 0 015.4-.7h.5v3.4a12.9 12.9 0 00-4.2.5 4 4 0 00-2.2 1.8 8.3 8.3 0 00-.9 3.5v12.4a25.6 25.6 0 01-.4 4.3 12 12 0 01-.9 3.1A7 7 0 018 31.1 9.2 9.2 0 016 32.5zm57.5 0a9.2 9.2 0 00-2 1.5A7 7 0 0060 36a12.2 12.2 0 00-1 3 25.3 25.3 0 00-.2 4.3v7.1l-.1 5.3a8.3 8.3 0 01-.9 3.4 3.9 3.9 0 01-2.2 1.9 12.9 12.9 0 01-4.2.5V65h.6a16.6 16.6 0 005.4-.7 7.8 7.8 0 003.4-2.2 8.1 8.1 0 001.7-3.5 21.4 21.4 0 00.5-4.8v-13a7.7 7.7 0 01.4-2.4 5.7 5.7 0 011.1-2 6.4 6.4 0 012-1.6 6.5 6.5 0 013-.6v-3.3a6.2 6.2 0 01-5-2.2 5.7 5.7 0 01-1.1-2 7.7 7.7 0 01-.4-2.5v-13a21.3 21.3 0 00-.5-4.8 8 8 0 00-1.8-3.5A7.8 7.8 0 0057.5.7 16.6 16.6 0 0052 0h-.5v3.4a12.9 12.9 0 014.2.5 3.9 3.9 0 012.2 1.8 8.3 8.3 0 01.8 3.5l.1 5.2v7.2a25.6 25.6 0 00.4 4.3A12 12 0 0060 29a7.3 7.3 0 001.4 2.1 9.2 9.2 0 002 1.5z"/>
+  <ellipse cx="39.8" cy="46.6" fill="#d03f40" rx="17" ry="16.9"/>
+  <path fill="#fff" d="M37 35.6h6.5v5l-1.3 10.2h-4l-1.3-10.2zm.2 16.7h6v5.4h-6z"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/Vimeo.png b/src/drivers/webextension/images/icons/Vimeo.png
deleted file mode 100644
index 4be20e25d..000000000
Binary files a/src/drivers/webextension/images/icons/Vimeo.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Vimeo.svg b/src/drivers/webextension/images/icons/Vimeo.svg
new file mode 100644
index 000000000..4e6ffbb30
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Vimeo.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2500 2157">
+  <path fill="#1ab7ea" d="M2499 499c-12 243-182 575-510 997-340 441-628 661-863 661-145 0-269-134-370-403l-201-740c-75-269-155-403-241-403-19 0-84 39-196 118L0 577c123-107 244-215 364-324C529 111 652 36 734 29c194-19 314 113 359 397 48 306 82 497 100 572 56 253 118 380 185 380 52 0 131-82 235-246 105-164 161-289 168-375 15-142-41-213-168-213-59 0-121 13-184 39 123-400 358-594 705-583 258 8 379 174 365 499z"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/font-awesome.svg b/src/drivers/webextension/images/icons/font-awesome.svg
index 8c1d44528..6ca6d75a9 100644
--- a/src/drivers/webextension/images/icons/font-awesome.svg
+++ b/src/drivers/webextension/images/icons/font-awesome.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M397.8 32H50.2C22.7 32 0 54.7 0 82.2v347.6C0 457.3 22.7 480 50.2 480h347.6c27.5 0 50.2-22.7 50.2-50.2V82.2c0-27.5-22.7-50.2-50.2-50.2zm-45.4 284.3c0 4.2-3.6 6-7.8 7.8-16.7 7.2-34.6 13.7-53.8 13.7-26.9 0-39.4-16.7-71.7-16.7-23.3 0-47.8 8.4-67.5 17.3-1.2.6-2.4.6-3.6 1.2V385c0 1.8 0 3.6-.6 4.8v1.2c-2.4 8.4-10.2 14.3-19.1 14.3-11.3 0-20.3-9-20.3-20.3V166.4c-7.8-6-13.1-15.5-13.1-26.3 0-18.5 14.9-33.5 33.5-33.5 18.5 0 33.5 14.9 33.5 33.5 0 10.8-4.8 20.3-13.1 26.3v18.5c1.8-.6 3.6-1.2 5.4-2.4 18.5-7.8 40.6-14.3 61.5-14.3 22.7 0 40.6 6 60.9 13.7 4.2 1.8 8.4 2.4 13.1 2.4 22.7 0 47.8-16.1 53.8-16.1 4.8 0 9 3.6 9 7.8v140.3z"/></svg>
\ No newline at end of file
+<svg fill="none" height="2500" width="2500" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 860 860">
+  <path d="M763.6 0H96.4A97 97 0 000 96.4v667.2A97 97 0 0096.4 860h667.2a97 97 0 0096.4-96.4V96.4A97 97 0 00763.6 0zm-87.1 545.8c0 8-7 11.5-15 15-32 13.7-66.4 26.2-103.3 26.2-51.6 0-75.6-32-137.6-32-44.7 0-91.8 16-129.6 33.2-2.3 1.1-4.6 1.1-6.9 2.3v87.1c0 3.5 0 7-1.1 9.2v2.4a38.8 38.8 0 01-75.6-11.5V258a63.8 63.8 0 0139-114.8 64.2 64.2 0 0164.4 64.3c0 20.7-9.2 39-25.2 50.5v35.5c3.5-1.1 7-2.3 10.4-4.6 35.5-15 78-27.4 118-27.4 43.6 0 78 11.5 117 26.3 8 3.4 16.1 4.6 25.1 4.6 43.6 0 91.8-31 103.3-31 9.2 0 17.3 7 17.3 15v269.4z" fill="#339af0"/>
+</svg>
diff --git a/src/drivers/webextension/images/icons/godaddy.svg b/src/drivers/webextension/images/icons/godaddy.svg
index b6eef1c75..9c7492ad8 100644
--- a/src/drivers/webextension/images/icons/godaddy.svg
+++ b/src/drivers/webextension/images/icons/godaddy.svg
@@ -1,45 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 300 300" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(0.25,0,0,0.25,112.5,112.5)">
-        <g transform="matrix(1,0,0,1,-450,-450)">
-            <rect x="0" y="0" width="1200" height="1200" style="fill:rgb(2,197,76);"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-450,-450)">
-            <path d="M534.321,278.003C536.097,282.139 536.865,285.845 536.865,289.321C536.865,296.097 533.818,302.391 528.413,308.506C526.758,310.747 515.82,310.278 510.239,319.401L509.974,319.963L509.891,320.617L509.521,324.025C509.598,333.55 517.015,339.546 525,342.614C529.707,344.406 534.146,345.119 538.555,345.119C555.368,345.036 569.533,334.592 576.924,322.746C582.451,313.415 584.741,304.123 584.741,295.007C584.165,259.704 552.798,228.773 549.028,197.401C548.794,195.917 548.711,194.299 548.711,192.673C548.242,169.289 570.44,143.684 571.143,117.668L571.27,117.585L571.27,116.975C571.045,112.38 567.824,109.372 564.606,107.953C561.325,106.454 557.492,105.863 553.273,105.863C543.122,105.995 530.469,109.641 523.711,119.994C512.734,142.893 495.327,166.967 495.166,191.786C495.093,199.641 497.085,207.611 501.714,215.155C511.313,236.324 524.297,255.303 534.321,278.003Z" style="fill:rgb(238,108,15);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-450,-450)">
-            <path d="M643.232,295.914C643.232,304.742 640.205,313.766 636.434,324C635.371,326.817 634.793,329.698 634.793,332.291C634.891,344.581 645.877,351.056 655.74,351.056L655.846,351.056C661.365,351.056 667.223,349.07 671.5,344.635C691.891,323.58 699.684,305.743 699.684,289.869C699.635,269.682 687.682,254.454 677.908,240.387C659.803,214.347 657.019,210.437 647.195,190.691C644.92,185.968 640.486,178.914 640.486,170.794C640.623,164.588 642.82,157.537 651.785,149.49C656.873,144.871 658.758,137.776 658.758,130.594C658.758,121.956 655.849,112.718 648.808,106.785C642.039,102.228 636.074,100.003 630.351,100.003C618.271,100.091 610.594,109.456 605.068,120.482C599.344,131.83 595.091,146.096 590.791,159.437C589.106,164.924 588.262,170.31 588.262,175.642C588.893,215.969 632.1,247.375 641.592,284.802C642.686,288.584 643.232,292.354 643.232,295.914Z" style="fill:rgb(238,108,15);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-450,-450)">
-            <path d="M335.298,317.94C340.034,324.625 342.744,329.765 342.803,335.673C342.803,339.643 341.802,343.788 339.951,348.316C336.777,353.676 328.579,365.844 327.158,374.379L327.046,375.025L327.158,375.67C327.158,379.708 331.141,383.878 334.795,383.878L335.493,383.815C339.951,383.581 343.143,381.973 346.87,381.973L347.474,382.023L349.692,382.023C372.158,381.973 386.805,363.926 390.615,347.37C391.434,343.444 391.688,339.836 391.688,336.309C390.843,291.47 338.53,270.225 322.456,236.89C318.857,229.738 317.744,221.315 317.744,212.243C317.744,200.148 319.839,187.014 319.839,174.455C319.839,167.297 319.229,160.363 316.904,153.889C314.8,148.635 309.629,147.243 305.355,147.243C293.792,147.653 277.084,155.739 272.801,171.203C270.833,188.786 266.258,207.834 266.16,225.627C266.131,241.433 270.774,256.027 283.473,268.142C303.032,286.807 323.701,301.548 335.298,317.94Z" style="fill:rgb(238,108,15);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-450,-450)">
-            <path d="M419.663,274.332C421.299,278.932 421.943,283.233 422.007,287.691C422.007,295.792 419.663,304.218 416.875,313.759C416.128,315.673 415.894,317.822 415.894,319.755C415.739,324.975 418.589,329.4 422.432,331.659C426.154,333.977 430.64,334.911 435.22,334.911C443.975,334.833 453.477,331.845 459.313,325.487C469.175,312.821 473.068,299.276 473.039,286.083C473.01,265.062 463.737,244.862 453.688,228.437C437.061,200.853 414.17,175.965 411.774,148.916L412.746,148.145C416.13,145.285 427.526,144.058 435.139,140.954C439.812,139.699 446.117,137.141 451.628,133.82C456.882,130.422 462.38,126.96 462.8,119.761C462.878,116.49 460.871,113.291 458.064,111.333C449.143,106.035 439.364,103.779 429.564,103.779C400.051,103.857 369.076,123.603 361.516,151.844C360.466,156.318 359.841,160.682 359.841,164.954C360.627,206.902 407.605,236.355 419.582,274.095L419.663,274.332Z" style="fill:rgb(238,108,15);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-450,-450)">
-            <path d="M899.004,570.582C879.131,560.255 853.135,554.41 824.502,554.41L823.467,554.454C796.984,488.116 763.496,438.642 723.516,407.364C672.676,367.89 607.217,347.042 534.191,347.042C497.917,347.042 460.461,352.579 423.102,362.257C420.425,355.177 417.808,348.025 414.645,341.482C413.068,338.245 407.842,336.339 404.245,339.386C401.037,342.418 398.337,348.064 399.821,354.353C400.801,359.124 400.822,363.899 400.552,368.66C379.816,375.076 359.17,382.425 338.903,391.668L328.507,396.502C325.128,398.084 323.326,401.805 324.181,405.442L337.257,460.603C331.565,465.724 325.896,471.085 319.82,475.67C314.389,479.625 313.668,491.349 318.227,492.677C327.558,495.079 336.679,496.031 345.689,496.183L359.2,553.214L358.619,554.801C357.091,558.572 354.757,562.462 353.468,565.47C350.309,572.462 356.393,580.577 360.05,578.473C361.609,577.532 362.942,576.305 364.415,575.281L379.254,637.913C366.056,646.934 357.374,656.526 351.178,664.808C341.783,677.288 337.903,693.119 337.789,708.021C337.789,716.605 339.161,724.857 342.589,732.347L343.258,733.304C339.718,742.767 338.092,752.718 338.131,762.806C338.131,766.771 338.38,770.863 338.707,775.033C340.416,797.387 354.132,814.349 371.808,824.242C387.649,833.099 406.847,837.357 426.736,838.305L487.317,1093.96C487.892,1096.35 489.547,1098.34 491.795,1099.34L494.988,1100L498.758,1099.05L514.764,1090.3C529.824,1082.04 554.002,1067.88 583.67,1047.27C594.334,1039.91 603.621,1036.86 616.976,1036.75C627.601,1036.75 639.663,1039.91 653.608,1043.6C671.577,1048.35 691.938,1053.77 715.677,1053.94C725.794,1053.94 736.009,1052.82 746.019,1050.57C771.87,1044.94 793.04,1029.53 804.095,1008.35C811.409,994.429 815.159,978.491 815.267,960.906C815.267,955.994 814.897,952.232 814.681,949.849C814.124,924.79 800.882,898.384 788.089,872.788L784.007,864.575C762.026,822.27 757.757,806.548 758.069,800.708L757.971,799.536C762.668,795.923 782.356,788.608 808.01,782.436C819.68,779.565 830.803,776.674 839.924,773.715C844.485,772.104 848.957,770.444 853.147,767.914C856.145,766.31 858.666,764.35 861.293,761.547C865.442,756.772 867.758,750.854 867.758,744.828C867.68,731.371 865.014,706.713 859.008,676.107C873.881,673.39 887.532,669.132 899.008,663.246C918.412,653.139 933.529,637.523 933.842,616.908C933.525,596.216 918.408,580.792 899.004,570.582ZM534.175,378.438C600.259,378.438 659.053,397.033 704.17,432.188C737.178,457.824 765.957,499.38 789.756,555.709C774.072,558.297 760.527,562.384 749.502,567.882C735.889,574.493 725.488,584.073 719.375,595.636C717.256,595.359 715.234,595.265 713.35,595.216C707.442,595.294 701.74,596.227 697.549,597.062C688.311,557.633 647.178,529.127 599.024,529.075C547.658,529.129 505.158,561.354 499.489,604.221C462.961,605.744 432.852,611.409 407.569,621.506L391.125,552.062C395.852,546.315 400.832,539.91 406.319,532.483L407.541,530.846C412.678,524.044 418.488,516.349 424.278,516.349L424.854,516.383C441.535,518.175 453.379,526.36 467.085,535.802C470.806,538.365 474.658,541.031 478.799,543.698C481.353,545.368 483.867,547.258 486.299,549.079C493.555,554.494 501.026,560.124 509.863,560.124L513.426,559.807L513.455,559.807C516.16,559.807 517.698,556.926 519.334,553.879C520.179,552.302 521.048,550.671 522.132,549.343L522.264,549.167L522.368,548.972C523.823,545.736 521.826,542.424 520.63,540.451L520.068,539.46C518.857,537.02 517.778,534.725 516.748,532.541C513.184,524.997 510.098,518.488 504.033,510.627C497.142,501.716 490.664,492.946 484.398,484.471C480.848,479.652 477.275,474.818 473.602,469.914C481.937,463.387 490.97,460.35 500.516,457.131C504.93,455.656 509.5,454.128 513.978,452.214C517.749,450.803 520.306,444.31 519.248,438.596C518.574,435.305 516.201,432.795 514.214,431.55L513.867,431.346L513.457,431.301C503.574,430.477 494.321,428.073 482.607,423.303C476.893,422.038 471.494,421.981 466.279,421.903C458.735,421.791 451.611,421.698 444.463,418.5C441.094,416.884 439.917,411.371 438.867,406.509L437.972,402.691C437.28,400.074 436.484,397.545 435.693,395.03L434.642,391.651C469.639,382.886 503.11,378.438 534.175,378.438ZM673.184,613.232C673.184,628.115 665.85,642.285 652.531,653.183C638.342,664.599 619.346,670.898 599.03,670.898C579.02,670.898 559.523,664.433 545.563,653.164C532.287,642.314 524.971,628.115 524.971,613.232C524.971,598.457 532.285,584.257 545.581,573.291C559.629,562.031 579.106,555.571 599.028,555.571C618.906,555.571 638.426,562.031 652.549,573.3C665.85,584.278 673.184,598.477 673.184,613.232ZM390.586,404.849C389.233,409.162 387.949,413.291 386.885,417.443C385.864,419.24 383.882,420.871 381.979,422.427L380.005,424.092L380.005,428.268C375.488,432.018 370.61,435.591 364.473,439.581L359.126,416.969C369.688,412.383 380.415,408.423 390.586,404.849ZM378.164,539.971L378.164,539.948C380.308,532.017 381.758,524.328 382.886,517.852C383.369,515.01 383.848,512.149 384.336,509.214C384.946,505.581 385.563,501.856 386.245,497.959C386.875,495.371 388.149,492.9 389.512,490.273C390.446,488.457 391.421,486.572 392.285,484.458C394.126,479.697 393.807,474.941 391.421,471.724L391.304,471.535L391.128,471.398C389.541,470.132 387.593,469.507 385.337,469.507C381.455,469.507 377.608,471.406 375.654,472.534L373.149,473.149L370.698,473.667C366.152,475.117 361.489,475.864 356.836,475.864C353.384,475.864 349.898,475.464 346.445,474.668C348.807,471.846 351.831,470.21 354.775,468.623L358.745,466.328C361.929,464.722 365.171,463.086 368.398,461.185C370.843,459.754 374.017,457.747 376.971,455.003L379.824,453.611C381.377,453.024 383.135,452.35 383.994,450.758L387.051,447.731C389.943,444.977 392.949,442.151 395.197,437.542C401.574,427.42 404.473,415.418 407.282,403.807C407.775,401.81 408.244,399.828 408.732,397.861C409.844,393.491 411.081,388.916 412.658,384.388C414.118,387.493 415.518,390.908 416.984,394.881C419.523,401.751 421.608,408.777 423.825,416.214C426.392,424.871 429.058,433.851 432.507,442.61C432.668,443.313 433.386,444.84 435.695,444.84L436.945,444.742L438.005,444.664L439.284,445.523L440.129,447.623L441.887,446.222C446.252,442.711 451.125,442.252 455.339,442.252C456.985,442.252 458.669,442.335 460.329,442.408C462.048,442.496 463.762,442.579 465.466,442.579L468.358,442.418L471.366,442.252C473.334,442.252 475.58,442.55 477.65,444.42C475.316,445.646 472.992,446.91 470.702,448.19C464.154,451.79 457.973,455.203 451.459,457.257L451.225,457.33L451.02,457.472C448.793,459.015 446.049,462.96 445.346,467.262C444.897,470.115 445.414,472.698 446.869,474.772C447.87,477.371 450.038,478.839 451.957,480.154L455.082,482.742C467.771,495.016 479.145,509.474 489.96,527.024L489.589,527.067C488.173,527.067 486.503,525.319 484.877,523.639L483.813,522.535C476.119,516.222 468.331,511.847 460.805,507.623C452.359,502.9 443.627,498.004 435.175,490.46C433.017,488.561 430.746,487.599 428.412,487.599C422.396,487.599 417.391,493.777 412.128,500.299C409.447,503.6 406.669,507.028 403.9,509.381C397.626,514.869 392.504,521.569 387.538,528.033C386.288,529.648 385.053,531.275 383.793,532.867L382.069,535.107C380.771,536.827 379.507,538.487 378.164,539.971ZM369.619,678.916C373.667,673.906 378.535,668.262 385.112,662.607L390.843,686.816C378.455,692.959 368.929,699.775 361.077,707.295C361.172,697.09 364.556,685.313 369.619,678.916ZM384.287,802.1C371.351,794.649 365.054,785.625 363.872,772.832C363.564,768.672 363.408,765.469 363.408,762.812C363.525,747.519 366.762,737.919 374.941,728.525C379.653,723.193 386.504,717.949 395.322,712.91L418.867,812.314C405.068,810.811 393.164,807.305 384.287,802.1ZM804.004,751.152L803.506,751.269C778.252,757.792 749.727,765.156 736.309,776.845C714.201,796.308 734.248,835.751 755.469,877.519C765.363,897.04 773.994,914.55 779.043,930.117C732.451,923.232 701.475,911.221 675.537,889.99C650.557,869.59 630.058,840.029 606.357,805.781C603.475,801.601 598.68,799.101 593.574,799.101C590.381,799.101 587.303,800.068 584.681,801.874C581.258,804.187 578.953,807.724 578.193,811.845C577.425,815.986 578.348,820.136 580.747,823.544L582.197,825.651C606.395,860.585 627.303,890.758 655.781,914.247C686.426,939.362 724.453,954.296 775.459,961.21C778.799,961.679 781.436,961.991 783.984,962.304C783.924,980.732 777.713,1011.27 739.178,1020.09C732.303,1021.62 724.853,1022.41 717.07,1022.41C698.965,1022.41 680.742,1018.26 663.73,1013.77C647.225,1009.44 631.875,1005.41 615.664,1005.41C597.349,1005.41 581.25,1010.72 565.024,1022.09C555.97,1028.32 535.327,1042.52 510.654,1056.75L413.711,647.438C435.649,638.124 464.15,632.643 500.729,630.69C510.451,669.42 551.535,697.46 599.025,697.565C649.357,697.46 691.846,665.868 698.41,623.922L698.42,623.922C704.144,622.604 709.699,621.822 713.322,621.822L714.25,621.861C716.281,640.162 728.762,655.806 749.504,666.021C769.289,675.845 795.228,681.031 824.525,681.031L827.131,680.914L827.736,680.885C832.57,705.035 835.684,727.477 836.174,741.481C830.42,744.297 815.244,748.242 804.004,751.152ZM777.5,959.658L775.684,959.56L777.5,959.658ZM887.451,641.162C878.652,645.732 867.041,649.404 853.847,651.826C843.477,653.701 833.886,654.629 824.522,654.629L824.384,654.629C799.677,654.541 776.825,650.039 761.366,642.266C747.216,635.039 740.038,626.514 740.038,616.907C740.038,607.393 747.216,598.888 761.366,591.628C771.464,586.579 785.194,582.844 801.073,580.876C809.657,579.807 816.991,579.309 824.12,579.309L824.589,579.309C826.181,579.309 827.704,579.426 829.237,579.538L832.167,579.724C853.23,580.622 873.378,585.344 887.46,592.663C903.612,601.08 909.13,610.684 908.905,616.838C909.131,623.105 903.613,632.686 887.451,641.162Z" style="fill:rgb(35,34,34);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-450,-450)">
-            <path d="M437.974,402.686L438.869,406.504C439.919,411.367 441.096,416.88 444.465,418.496C451.613,421.694 458.737,421.787 466.281,421.898C471.496,421.976 476.895,422.036 482.609,423.299C494.323,428.07 503.576,430.472 513.459,431.297L513.869,431.341L514.216,431.546C516.203,432.791 518.576,435.301 519.25,438.592C520.31,444.305 517.751,450.799 513.98,452.21C509.502,454.124 504.932,455.652 500.518,457.127C490.972,460.345 481.94,463.382 473.604,469.91C477.277,474.811 480.85,479.645 484.401,484.466C490.666,492.944 497.144,501.712 504.035,510.623C510.098,518.483 513.184,524.993 516.75,532.537C517.78,534.72 518.859,537.015 520.07,539.456L520.632,540.446C521.828,542.42 523.825,545.729 522.37,548.967L522.266,549.162L522.134,549.338C521.05,550.666 520.181,552.297 519.336,553.874C517.7,556.921 516.162,559.802 513.457,559.802L513.428,559.802L509.865,560.119C501.026,560.119 493.555,554.488 486.301,549.074C483.869,547.253 481.355,545.362 478.801,543.692C474.66,541.026 470.808,538.36 467.087,535.796C453.381,526.353 441.535,518.169 424.856,516.377L424.281,516.343C418.49,516.343 412.678,524.038 407.543,530.84L406.322,532.476C400.834,539.903 395.852,546.309 391.127,552.056L407.572,621.499C432.854,611.401 462.963,605.737 499.491,604.214C505.16,561.348 547.66,529.121 599.027,529.068C647.18,529.123 688.313,557.629 697.551,597.056C701.74,596.221 707.445,595.288 713.352,595.21C715.238,595.259 717.258,595.352 719.377,595.63C725.49,584.067 735.891,574.487 749.504,567.876C760.529,562.378 774.074,558.291 789.758,555.703C765.959,499.375 737.18,457.816 704.172,432.182C659.055,397.026 600.261,378.432 534.177,378.432C503.114,378.432 469.641,382.88 434.646,391.64L435.697,395.019C436.484,397.54 437.28,400.069 437.974,402.686Z" style="fill:white;fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-450,-450)">
-            <path d="M380.005,428.267L380.005,424.092L381.979,422.427C383.882,420.869 385.866,419.239 386.885,417.442C387.949,413.293 389.235,409.162 390.586,404.849C380.415,408.423 369.688,412.383 359.126,416.968L364.473,439.58C370.61,435.591 375.488,432.017 380.005,428.267Z" style="fill:white;fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-450,-450)">
-            <path d="M827.129,680.918L824.522,681.035C795.225,681.035 769.289,675.849 749.502,666.025C728.76,655.81 716.279,640.166 714.248,621.865L713.32,621.826C709.697,621.826 704.139,622.607 698.418,623.926L698.408,623.926C691.845,665.869 649.355,697.461 599.023,697.569C551.533,697.464 510.449,669.424 500.726,630.694C464.15,632.647 435.648,638.128 413.709,647.442L510.652,1056.75C535.325,1042.52 555.968,1028.32 565.022,1022.09C581.248,1010.73 597.345,1005.41 615.662,1005.41C631.873,1005.41 647.225,1009.44 663.727,1013.77C680.74,1018.26 698.961,1022.42 717.068,1022.42C724.85,1022.42 732.301,1021.62 739.176,1020.09C777.711,1011.27 783.922,980.736 783.982,962.308C781.432,961.995 778.795,961.683 775.457,961.214C724.451,954.3 686.424,939.368 655.779,914.251C627.301,890.765 606.393,860.589 582.195,825.657L580.745,823.548C578.348,820.14 577.425,815.989 578.191,811.849C578.953,807.728 581.256,804.193 584.679,801.878C587.301,800.071 590.377,799.105 593.572,799.105C598.678,799.105 603.473,801.605 606.355,805.785C630.055,840.033 650.553,869.594 675.535,889.994C701.473,911.224 732.449,923.236 779.041,930.121C773.992,914.555 765.359,897.045 755.467,877.523C734.246,835.755 714.197,796.312 736.308,776.849C749.726,765.16 778.25,757.796 803.504,751.273L804.002,751.156C815.242,748.246 830.418,744.301 836.17,741.488C835.683,727.484 832.566,705.043 827.732,680.892L827.129,680.918Z" style="fill:white;fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-450,-450)">
-            <path d="M374.941,728.525C366.761,737.92 363.525,747.519 363.408,762.812C363.408,765.468 363.564,768.671 363.872,772.832C365.054,785.625 371.351,794.648 384.287,802.1C393.164,807.305 405.068,810.811 418.867,812.315L395.322,712.913C386.504,717.949 379.653,723.193 374.941,728.525Z" style="fill:white;fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-450,-450)">
-            <path d="M887.461,592.662C873.379,585.343 853.232,580.621 832.168,579.723L829.238,579.537C827.705,579.425 826.18,579.308 824.59,579.308L824.121,579.308C816.992,579.308 809.658,579.806 801.074,580.875C785.195,582.843 771.465,586.578 761.367,591.627C747.217,598.888 740.039,607.393 740.039,616.905C740.039,626.514 747.217,635.04 761.367,642.266C776.826,650.039 799.678,654.541 824.385,654.629L824.522,654.629C833.887,654.629 843.477,653.701 853.848,651.826C867.041,649.404 878.654,645.73 887.452,641.162C903.614,632.683 909.132,623.103 908.907,616.836C909.131,610.684 903.613,601.08 887.461,592.662Z" style="fill:rgb(2,197,76);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-450,-450)">
-            <path d="M599.028,555.572C579.106,555.572 559.629,562.032 545.581,573.292C532.285,584.259 524.971,598.458 524.971,613.233C524.971,628.116 532.285,642.315 545.563,653.165C559.523,664.435 579.02,670.899 599.03,670.899C619.346,670.899 638.342,664.6 652.531,653.184C665.85,642.286 673.184,628.116 673.184,613.233C673.184,598.478 665.85,584.278 652.549,573.301C638.428,562.032 618.906,555.572 599.028,555.572Z" style="fill:rgb(2,197,76);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(1,0,0,1,-450,-450)">
-            <path d="M383.789,532.872C385.049,531.28 386.284,529.654 387.534,528.038C392.5,521.573 397.622,514.874 403.896,509.386C406.665,507.032 409.443,503.605 412.124,500.304C417.388,493.782 422.393,487.605 428.408,487.605C430.742,487.605 433.012,488.567 435.171,490.465C443.623,498.009 452.354,502.906 460.801,507.628C468.325,511.852 476.114,516.227 483.809,522.54L484.873,523.644C486.499,525.325 488.169,527.073 489.585,527.073L489.956,527.029C479.141,509.48 467.768,495.021 455.078,482.747L451.953,480.159C450.034,478.846 447.866,477.376 446.865,474.778C445.41,472.703 444.891,470.12 445.342,467.267C446.045,462.965 448.789,459.021 451.016,457.477L451.221,457.335L451.455,457.262C457.969,455.206 464.15,451.793 470.698,448.196C472.988,446.917 475.312,445.652 477.646,444.425C475.576,442.555 473.33,442.257 471.362,442.257L468.353,442.423L465.462,442.584C463.758,442.584 462.044,442.501 460.325,442.413C458.665,442.34 456.98,442.257 455.335,442.257C451.121,442.257 446.248,442.716 441.883,446.227L440.125,447.628L439.28,445.528L438.001,444.669L436.941,444.747L435.691,444.845C433.38,444.845 432.664,443.318 432.503,442.615C429.056,433.855 426.39,424.876 423.821,416.219C421.604,408.782 419.518,401.756 416.98,394.886C415.514,390.911 414.114,387.498 412.654,384.393C411.077,388.919 409.841,393.496 408.727,397.866C408.24,399.834 407.771,401.815 407.278,403.813C404.469,415.423 401.57,427.425 395.193,437.547C392.947,442.156 389.938,444.985 387.047,447.737L383.99,450.763C383.131,452.355 381.373,453.03 379.82,453.616L376.967,455.008C374.013,457.752 370.839,459.759 368.394,461.19C365.165,463.089 361.923,464.725 358.741,466.333L354.771,468.628C351.827,470.215 348.803,471.851 346.441,474.673C349.892,475.469 353.379,475.869 356.832,475.869C361.485,475.869 366.148,475.122 370.694,473.672L373.144,473.154L375.65,472.539C377.603,471.411 381.451,469.512 385.333,469.512C387.589,469.512 389.537,470.137 391.124,471.403L391.3,471.54L391.417,471.73C393.805,474.948 394.122,479.704 392.281,484.463C391.417,486.577 390.44,488.462 389.508,490.278C388.147,492.905 386.871,495.376 386.241,497.964C385.556,501.86 384.942,505.586 384.332,509.219C383.844,512.155 383.365,515.015 382.882,517.857C381.754,524.333 380.304,532.023 378.16,539.953L378.16,539.976C379.503,538.493 380.766,536.831 382.06,535.119L383.789,532.872Z" style="fill:rgb(253,221,0);fill-rule:nonzero;"/>
-        </g>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="800" viewBox="-5.7 -8.5 49.6 51">
+  <path fill="#1BDBDB" d="M33 1.6c-4-2.5-9.3-2-14 1-4.6-3-9.8-3.5-13.8-1-6.2 3.9-7 14-1.7 22.5 4 6.3 10.1 10 15.6 9.9 5.5 0 11.6-3.6 15.5-10C40 15.7 39.2 5.6 33 1.7zM6.3 22.3A20.4 20.4 0 014 16.7a16.1 16.1 0 01-.6-5.4C3.7 8.2 5 5.7 7 4.4c2.1-1.3 4.9-1.3 7.8-.2l1.4.6a24 24 0 00-4.3 5.1c-3.2 5.2-4.2 11-3 15.5a21 21 0 01-2.5-3.1zm27.8-5.6a20.5 20.5 0 01-2.4 5.6 21.1 21.1 0 01-2.5 3.1c1-4 .4-9.1-2.1-13.8a.6.6 0 00-.9-.3l-7.7 4.8a.6.6 0 00-.2.9l1.1 1.8a.6.6 0 00.9.2l5-3.1.4 1.4c.5 1.8.7 3.6.6 5.3-.3 3.2-1.6 5.7-3.6 7a7 7 0 01-3.6 1H19a7 7 0 01-3.6-1c-2-1.3-3.3-3.8-3.6-7a16.1 16.1 0 01.6-5.3A21 21 0 0118.8 7a16.1 16.1 0 014.5-2.8c3-1.2 5.7-1 7.8.2 2.1 1.3 3.4 3.8 3.6 7a16.1 16.1 0 01-.5 5.3z"/>
 </svg>
diff --git a/src/drivers/webextension/images/icons/hCaptcha.svg b/src/drivers/webextension/images/icons/hCaptcha.svg
new file mode 100644
index 000000000..7ed16950d
--- /dev/null
+++ b/src/drivers/webextension/images/icons/hCaptcha.svg
@@ -0,0 +1,41 @@
+<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 482.3 482.3">
+  <g data-name="Layer 2">
+    <g data-name="Layer 1-2">
+      <path style="isolation:isolate" fill="#0074bf" opacity=".5" d="M301.5 422.1h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#0074bf" opacity=".7" d="M241.2 422.1h60.3v60.3h-60.3zM180.9 422.1h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#0074bf" opacity=".5" d="M120.6 422.1h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#0082bf" opacity=".7" d="M361.8 361.8h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#0082bf" opacity=".8" d="M301.5 361.8h60.3v60.3h-60.3z"/>
+      <path fill="#0082bf" d="M241.2 361.8h60.3v60.3h-60.3zM180.9 361.8h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#0082bf" opacity=".8" d="M120.6 361.8h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#0082bf" opacity=".7" d="M60.3 361.8h60.3v60.3H60.3z"/>
+      <path style="isolation:isolate" fill="#008fbf" opacity=".5" d="M422.1 301.5h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#008fbf" opacity=".8" d="M361.8 301.5h60.3v60.3h-60.3z"/>
+      <path fill="#008fbf" d="M301.5 301.5h60.3v60.3h-60.3zM241.2 301.5h60.3v60.3h-60.3zM180.9 301.5h60.3v60.3h-60.3zM120.6 301.5h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#008fbf" opacity=".8" d="M60.3 301.5h60.3v60.3H60.3z"/>
+      <path style="isolation:isolate" fill="#008fbf" opacity=".5" d="M0 301.5h60.3v60.3H0z"/>
+      <path style="isolation:isolate" fill="#009dbf" opacity=".7" d="M422.1 241.2h60.3v60.3h-60.3z"/>
+      <path fill="#009dbf" d="M361.8 241.2h60.3v60.3h-60.3zM301.5 241.2h60.3v60.3h-60.3zM241.2 241.2h60.3v60.3h-60.3zM180.9 241.2h60.3v60.3h-60.3zM120.6 241.2h60.3v60.3h-60.3z"/>
+      <path fill="#009dbf" d="M60.3 241.2h60.3v60.3H60.3z"/>
+      <path style="isolation:isolate" fill="#009dbf" opacity=".7" d="M0 241.2h60.3v60.3H0z"/>
+      <path style="isolation:isolate" fill="#00abbf" opacity=".7" d="M422.1 180.9h60.3v60.3h-60.3z"/>
+      <path fill="#00abbf" d="M361.8 180.9h60.3v60.3h-60.3zM301.5 180.9h60.3v60.3h-60.3zM241.2 180.9h60.3v60.3h-60.3zM180.9 180.9h60.3v60.3h-60.3zM120.6 180.9h60.3v60.3h-60.3z"/>
+      <path fill="#00abbf" d="M60.3 180.9h60.3v60.3H60.3z"/>
+      <path style="isolation:isolate" fill="#00abbf" opacity=".7" d="M0 180.9h60.3v60.3H0z"/>
+      <path style="isolation:isolate" fill="#00b9bf" opacity=".5" d="M422.1 120.6h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#00b9bf" opacity=".8" d="M361.8 120.6h60.3v60.3h-60.3z"/>
+      <path fill="#00b9bf" d="M301.5 120.6h60.3v60.3h-60.3zM241.2 120.6h60.3v60.3h-60.3zM180.9 120.6h60.3v60.3h-60.3zM120.6 120.6h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#00b9bf" opacity=".8" d="M60.3 120.6h60.3v60.3H60.3z"/>
+      <path style="isolation:isolate" fill="#00b9bf" opacity=".5" d="M0 120.6h60.3v60.3H0z"/>
+      <path style="isolation:isolate" fill="#00c6bf" opacity=".7" d="M361.8 60.3h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#00c6bf" opacity=".8" d="M301.5 60.3h60.3v60.3h-60.3z"/>
+      <path fill="#00c6bf" d="M241.2 60.3h60.3v60.3h-60.3zM180.9 60.3h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#00c6bf" opacity=".8" d="M120.6 60.3h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#00c6bf" opacity=".7" d="M60.3 60.3h60.3v60.3H60.3z"/>
+      <path style="isolation:isolate" fill="#00d4bf" opacity=".5" d="M301.5 0h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#00d4bf" opacity=".7" d="M241.2 0h60.3v60.3h-60.3zM180.9 0h60.3v60.3h-60.3z"/>
+      <path style="isolation:isolate" fill="#00d4bf" opacity=".5" d="M120.6 0h60.3v60.3h-60.3z"/>
+      <path d="M158.8 222.2l16.7-37.6c6.2-9.7 5.4-21.5-1.3-28.2a17.3 17.3 0 00-3-2.4 18.6 18.6 0 00-15.5-1.8 25.3 25.3 0 00-14 10.9s-23 53.6-31.6 77.7-5.1 68.4 27.9 101.5c35 35 85.7 43 118 18.7a20.6 20.6 0 003.8-2.5l99.6-83.1c4.8-4 12-12.3 5.6-21.7-6.3-9.2-18.2-3-23 .2l-57.4 41.7a2.6 2.6 0 01-3.6-.4c-1.5-1.9-1.8-6.6.5-8.5l87.9-74.5c7.6-6.9 8.6-16.8 2.5-23.6s-15.5-6.5-23.2.4l-79.1 61.8a3.5 3.5 0 01-5-.5v-.1c-1.6-1.8-2.2-4.8-.5-6.5l89.6-87a17.5 17.5 0 00.9-24.7 16.7 16.7 0 00-12.2-5.2 17.9 17.9 0 00-12.5 5l-91.6 86c-2.2 2.2-6.5 0-7-2.6a2.8 2.8 0 01.8-2.5l70-79.8a17.3 17.3 0 00-23.5-25.3l-.8.8L171.5 226c-3.8 3.8-9.4 4-12 1.8a4 4 0 01-.8-5.5z" fill="#fff"/>
+    </g>
+  </g>
+</svg>
diff --git a/src/drivers/webextension/images/icons/hcaptcha-symbol-256.png b/src/drivers/webextension/images/icons/hcaptcha-symbol-256.png
deleted file mode 100644
index ee526dde4..000000000
Binary files a/src/drivers/webextension/images/icons/hcaptcha-symbol-256.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/reCAPTCHA.png b/src/drivers/webextension/images/icons/reCAPTCHA.png
deleted file mode 100644
index 819a4b26a..000000000
Binary files a/src/drivers/webextension/images/icons/reCAPTCHA.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/reCAPTCHA.svg b/src/drivers/webextension/images/icons/reCAPTCHA.svg
new file mode 100644
index 000000000..1a579c6d0
--- /dev/null
+++ b/src/drivers/webextension/images/icons/reCAPTCHA.svg
@@ -0,0 +1,5 @@
+<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 84 83.8">
+  <path d="M84 41.8V6l-9.4 9.4a42 42 0 00-66 1.2L24 32.2a20.5 20.5 0 016.3-7A18.6 18.6 0 0142 21.4a4.2 4.2 0 011.5.2A20.3 20.3 0 0159 30.9L48 42H84" fill="#1c3aa9"/>
+  <path d="M41.8 0H6l9.4 9.4a42 42 0 001.2 66l15.6-15.5a20.3 20.3 0 01-7-6.2A18.6 18.6 0 0121.3 42a4.2 4.2 0 01.3-1.5A20.3 20.3 0 0130.9 25l11 11c0-13.9-.2-29.5 0-35.9" fill="#4285f4"/>
+  <path d="M0 42v35.7l9.4-9.3a42 42 0 0066-1.2L60 51.6a20.4 20.4 0 01-6.2 7A18.6 18.6 0 0142 62.4a4.2 4.2 0 01-1.5-.2A20.3 20.3 0 0125 52.8L35.9 42H0" fill="#ababab"/>
+</svg>
diff --git a/src/drivers/webextension/images/logo-purple.svg b/src/drivers/webextension/images/logo-purple.svg
index e5e67bb21..b49651a8b 100644
--- a/src/drivers/webextension/images/logo-purple.svg
+++ b/src/drivers/webextension/images/logo-purple.svg
@@ -1,29 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="389px" height="97px" viewBox="0 0 389 97" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
-    <title>Logo</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="wappalyzer_rebrand" transform="translate(-317.000000, -669.000000)">
-            <g id="Logo" transform="translate(317.000000, 669.000000)">
-                <g id="Logo-Mark-Purple">
-                    <polygon id="Fill-1" fill="#1C0172" points="57.0285 74.6616 6.5385 48.4526 0.0015 53.1396 -0.0005 56.0066 57.0285 96.9046 114.0545 56.0086 114.0585 53.1426 107.5185 48.4526"></polygon>
-                    <path d="M57.0285,0.0003 L0.0025,40.8963 L-0.0005,43.7633 L57.0285,84.6623 L114.0545,43.7653 L114.0575,40.8983 L57.0285,0.0003 Z M64.4895,40.3623 L57.5365,30.7743 L63.4645,26.4363 L75.8235,44.7273 L70.8465,48.3703 L57.5555,42.8723 L57.4985,42.9133 L65.0675,52.5983 L60.0905,56.2403 L35.0915,47.1963 L41.0385,42.8443 L54.1065,47.9333 L54.1805,47.8783 L46.9285,38.5343 L51.6075,35.1113 L64.4145,40.4173 L64.4895,40.3623 Z" id="Fill-2" fill="#4608AD"></path>
-                </g>
-                <g id="Wappalyzer" transform="translate(133.000000, 23.905100)" fill="#1C0172">
-                    <path d="M57.8766,28.762 C60.5366,28.762 62.6966,26.647 62.6966,23.394 C62.6966,20.257 60.6276,17.983 57.8996,17.983 C55.1256,17.983 53.0106,20.143 53.0106,23.394 C53.0106,26.6 55.0346,28.76 57.8766,28.76 L57.8766,28.762 L57.8766,28.762 Z M69.6996,11.958 L69.6996,34.74 L62.7876,34.74 L62.7876,32.284 L62.6966,32.284 C61.2416,34.194 59.1046,35.172 56.3756,35.172 C50.1006,35.172 45.6446,30.42 45.6446,23.372 C45.6446,16.414 50.1456,11.526 56.0346,11.526 C58.4906,11.526 60.6956,12.481 62.3106,14.368 L62.4016,14.368 L62.4016,11.958 L69.6996,11.958 L69.6996,11.958 Z" id="Fill-4"></path>
-                    <path d="M91.2316,23.3943 C91.2316,20.1433 89.1166,17.9833 86.3436,17.9833 C83.4326,17.9833 81.3406,20.2563 81.3406,23.3943 C81.3406,26.6453 83.5006,28.7603 86.3656,28.7603 C89.2076,28.7603 91.2316,26.6003 91.2316,23.3943 M98.5986,23.3713 C98.5986,30.4203 94.1196,35.1723 87.8666,35.1723 C85.2516,35.1723 83.2056,34.2173 81.7276,32.5113 L81.6136,32.5113 L81.6136,43.9483 L74.3386,43.9483 L74.3386,11.9573 L81.6366,11.9573 L81.6366,14.4133 L81.7276,14.4133 C83.3646,12.5033 85.6386,11.5253 88.2076,11.5253 C94.0966,11.5253 98.5986,16.4143 98.5986,23.3713" id="Fill-6"></path>
-                    <path d="M119.1525,23.3943 C119.1525,20.1433 117.0375,17.9833 114.2645,17.9833 C111.3535,17.9833 109.2615,20.2563 109.2615,23.3943 C109.2615,26.6453 111.4215,28.7603 114.2865,28.7603 C117.1285,28.7603 119.1525,26.6003 119.1525,23.3943 M126.5195,23.3713 C126.5195,30.4203 122.0405,35.1723 115.7875,35.1723 C113.1725,35.1723 111.1265,34.2173 109.6485,32.5113 L109.5345,32.5113 L109.5345,43.9483 L102.2595,43.9483 L102.2595,11.9573 L109.5575,11.9573 L109.5575,14.4133 L109.6485,14.4133 C111.2855,12.5033 113.5595,11.5253 116.1285,11.5253 C122.0175,11.5253 126.5195,16.4143 126.5195,23.3713" id="Fill-8"></path>
-                    <path d="M141.2527,28.762 C143.9127,28.762 146.0727,26.647 146.0727,23.394 C146.0727,20.257 144.0037,17.983 141.2757,17.983 C138.5017,17.983 136.3867,20.143 136.3867,23.394 C136.3867,26.6 138.4107,28.76 141.2527,28.76 L141.2527,28.762 Z M153.0757,11.958 L153.0757,34.74 L146.1637,34.74 L146.1637,32.284 L146.0727,32.284 C144.6177,34.194 142.4807,35.172 139.7517,35.172 C133.4767,35.172 129.0207,30.42 129.0207,23.372 C129.0207,16.414 133.5217,11.526 139.4107,11.526 C141.8667,11.526 144.0717,12.481 145.6867,14.368 L145.7777,14.368 L145.7777,11.958 L153.0757,11.958 Z" id="Fill-10"></path>
-                    <polygon id="Fill-12" points="157.964 34.74 165.217 34.74 165.217 0.453 157.964 0.453"></polygon>
-                    <polygon id="Fill-14" points="192.1151 11.9577 180.1551 43.9487 172.9481 43.9487 176.8811 33.1937 167.9911 11.9577 175.5401 11.9577 180.1781 24.3037 180.2921 24.3037 184.6571 11.9577"></polygon>
-                    <polygon id="Fill-15" points="203.2561 28.783 203.2561 28.874 212.9421 28.874 212.9421 34.74 193.7291 34.74 193.7291 29.874 203.5741 17.892 203.5741 17.801 194.5931 17.801 194.5931 11.958 213.3281 11.958 213.3281 16.778"></polygon>
-                    <path d="M222.2624,20.9615 L230.7884,20.9165 C230.3114,18.7105 228.8334,17.3465 226.6504,17.3465 C224.4674,17.3465 222.7394,18.6195 222.2624,20.9615 L222.2624,20.9615 Z M237.9284,23.1445 C237.9284,23.7805 237.8144,24.8045 237.7464,25.3045 L222.2394,25.3045 C222.7624,27.8735 225.0134,29.2375 227.6284,29.2375 C229.7424,29.2375 231.5844,28.3055 233.1554,26.4865 L237.0184,30.8295 C235.0874,33.2625 231.5864,35.1725 226.8574,35.1725 C220.1044,35.1725 215.0114,30.3975 215.0114,23.3485 C215.0114,16.4365 219.8994,11.5255 226.5844,11.5255 C233.2234,11.5255 237.9294,16.3685 237.9294,23.1445 L237.9284,23.1445 Z" id="Fill-16"></path>
-                    <path d="M255.7556,11.5484 L255.7556,19.3924 C255.0966,19.3474 254.4146,19.3474 254.0506,19.3474 C250.5946,19.3474 248.8206,21.5294 248.8206,24.5084 L248.8206,34.7404 L241.5446,34.7404 L241.5446,11.9574 L248.8206,11.9574 L248.8206,15.0044 L248.9116,15.0044 C250.6396,12.7304 253.0046,11.5254 255.5056,11.5254 C255.5736,11.5254 255.6876,11.5254 255.7556,11.5484" id="Fill-17"></path>
-                    <polygon id="Fill-3" points="47.1903 1.6579 36.8453 34.7399 29.7283 34.7399 24.1803 12.9809 24.1123 12.9809 18.3603 34.7399 11.2433 34.7399 0.8983 1.6579 9.1973 1.6579 14.7903 21.9619 14.8583 21.9619 19.9743 1.6579 28.1823 1.6579 33.2303 21.9619 33.2983 21.9619 38.8913 1.6579"></polygon>
-                </g>
-            </g>
-        </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="389" height="97">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#1C0172" d="M57 74.7L6.5 48.5 0 53v3l57 40.8L114 56v-2.9l-6.5-4.6z"/>
+    <path fill="#4608AD" d="M57 0L0 40.9v2.9l57 40.9 57-41V41L57 0zm7.5 40.4l-7-9.6 6-4.4 12.3 18.3-5 3.7-13.2-5.5h-.1l7.6 9.7-5 3.6-25-9 6-4.4L54 48 47 38.5l4.7-3.4 12.8 5.3z"/>
+    <g fill="#1C0172">
+      <path d="M190.9 52.7c2.6 0 4.8-2.1 4.8-5.4 0-3.1-2-5.4-4.8-5.4S186 44 186 47.3c0 3.2 2 5.4 4.9 5.4zm11.8-16.8v22.7h-7v-2.4a7.5 7.5 0 01-6.3 2.9c-6.3 0-10.8-4.8-10.8-11.8 0-7 4.5-11.9 10.4-11.9a8 8 0 016.3 2.9h.1v-2.4h7.3zM224.2 47.3c0-3.3-2-5.4-4.9-5.4-2.9 0-5 2.3-5 5.4 0 3.3 2.2 5.4 5 5.4 3 0 5-2.2 5-5.4m7.3 0c0 7-4.5 11.8-10.7 11.8-2.6 0-4.7-1-6.2-2.7V68h-7.4v-32h7.3v2.4h.1c1.7-1.9 4-2.9 6.5-2.9 5.9 0 10.4 5 10.4 11.9M252.2 47.3c0-3.3-2.2-5.4-5-5.4s-5 2.3-5 5.4c0 3.3 2.2 5.4 5 5.4 3 0 5-2.2 5-5.4m7.3 0c0 7-4.5 11.8-10.7 11.8-2.6 0-4.7-1-6.2-2.7V68h-7.3v-32h7.3v2.4c1.7-1.9 4-2.9 6.5-2.9 6 0 10.4 5 10.4 11.9M274.3 52.7c2.6 0 4.8-2.1 4.8-5.4 0-3.1-2.1-5.4-4.8-5.4-2.8 0-5 2.1-5 5.4 0 3.2 2.1 5.4 5 5.4zM286 35.9v22.7h-7v-2.4a7.5 7.5 0 01-6.3 2.9c-6.3 0-10.8-4.8-10.8-11.8 0-7 4.5-11.9 10.4-11.9a8 8 0 016.3 2.9v-2.4h7.4zM291 58.6h7.2V24.4H291zM325.1 35.9l-12 32H306l4-10.8-9-21.2h7.6l4.7 12.3 4.5-12.3zM336.3 52.7h9.6v6h-19.2v-5l9.9-11.9h-9v-6h18.7v4.9zM355.3 44.9h8.5c-.5-2.3-2-3.6-4.1-3.6-2.2 0-4 1.2-4.4 3.6zm15.6 2.1c0 .7 0 1.7-.2 2.2h-15.5c.6 2.6 2.8 4 5.4 4 2.1 0 4-1 5.6-2.8l3.8 4.3c-2 2.5-5.4 4.4-10.1 4.4-6.8 0-11.9-4.8-11.9-11.8 0-7 4.9-11.9 11.6-11.9 6.6 0 11.3 4.9 11.3 11.6zM388.8 35.5v7.8H387c-3.5 0-5.3 2.1-5.3 5.1v10.2h-7.3V36h7.3v3h.1a8.2 8.2 0 016.9-3.4M180.2 25.6l-10.4 33h-7L157.1 37l-5.8 21.7h-7.2l-10.3-33h8.3l5.6 20.3 5.2-20.3h8.2l5 20.3h.1l5.6-20.3z"/>
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/src/drivers/webextension/images/logo-white.svg b/src/drivers/webextension/images/logo-white.svg
index bfbecc41b..83c949829 100644
--- a/src/drivers/webextension/images/logo-white.svg
+++ b/src/drivers/webextension/images/logo-white.svg
@@ -1,29 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="389px" height="97px" viewBox="0 0 389 97" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch -->
-    <title>Logo-White</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Styleguide" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="wappalyzer_rebrand" transform="translate(-317.000000, -1149.000000)" fill="#FFFFFF">
-            <g id="Logo-White" transform="translate(317.000000, 1149.000000)">
-                <g id="Logo-Mark-White">
-                    <polygon id="Fill-1" opacity="0.6" points="57.0285 74.6616 6.5385 48.4526 0.0015 53.1396 -0.0005 56.0066 57.0285 96.9046 114.0545 56.0086 114.0585 53.1426 107.5185 48.4526"></polygon>
-                    <path d="M57.0285,0.0003 L0.0025,40.8963 L-0.0005,43.7633 L57.0285,84.6623 L114.0545,43.7653 L114.0575,40.8983 L57.0285,0.0003 Z M64.4895,40.3623 L57.5365,30.7743 L63.4645,26.4363 L75.8235,44.7273 L70.8465,48.3703 L57.5555,42.8723 L57.4985,42.9133 L65.0675,52.5983 L60.0905,56.2403 L35.0915,47.1963 L41.0385,42.8443 L54.1065,47.9333 L54.1805,47.8783 L46.9285,38.5343 L51.6075,35.1113 L64.4145,40.4173 L64.4895,40.3623 Z" id="Fill-2"></path>
-                </g>
-                <g id="Wappalyzer" transform="translate(133.000000, 23.905100)">
-                    <path d="M57.8766,28.762 C60.5366,28.762 62.6966,26.647 62.6966,23.394 C62.6966,20.257 60.6276,17.983 57.8996,17.983 C55.1256,17.983 53.0106,20.143 53.0106,23.394 C53.0106,26.6 55.0346,28.76 57.8766,28.76 L57.8766,28.762 L57.8766,28.762 Z M69.6996,11.958 L69.6996,34.74 L62.7876,34.74 L62.7876,32.284 L62.6966,32.284 C61.2416,34.194 59.1046,35.172 56.3756,35.172 C50.1006,35.172 45.6446,30.42 45.6446,23.372 C45.6446,16.414 50.1456,11.526 56.0346,11.526 C58.4906,11.526 60.6956,12.481 62.3106,14.368 L62.4016,14.368 L62.4016,11.958 L69.6996,11.958 L69.6996,11.958 Z" id="Fill-4"></path>
-                    <path d="M91.2316,23.3943 C91.2316,20.1433 89.1166,17.9833 86.3436,17.9833 C83.4326,17.9833 81.3406,20.2563 81.3406,23.3943 C81.3406,26.6453 83.5006,28.7603 86.3656,28.7603 C89.2076,28.7603 91.2316,26.6003 91.2316,23.3943 M98.5986,23.3713 C98.5986,30.4203 94.1196,35.1723 87.8666,35.1723 C85.2516,35.1723 83.2056,34.2173 81.7276,32.5113 L81.6136,32.5113 L81.6136,43.9483 L74.3386,43.9483 L74.3386,11.9573 L81.6366,11.9573 L81.6366,14.4133 L81.7276,14.4133 C83.3646,12.5033 85.6386,11.5253 88.2076,11.5253 C94.0966,11.5253 98.5986,16.4143 98.5986,23.3713" id="Fill-6"></path>
-                    <path d="M119.1525,23.3943 C119.1525,20.1433 117.0375,17.9833 114.2645,17.9833 C111.3535,17.9833 109.2615,20.2563 109.2615,23.3943 C109.2615,26.6453 111.4215,28.7603 114.2865,28.7603 C117.1285,28.7603 119.1525,26.6003 119.1525,23.3943 M126.5195,23.3713 C126.5195,30.4203 122.0405,35.1723 115.7875,35.1723 C113.1725,35.1723 111.1265,34.2173 109.6485,32.5113 L109.5345,32.5113 L109.5345,43.9483 L102.2595,43.9483 L102.2595,11.9573 L109.5575,11.9573 L109.5575,14.4133 L109.6485,14.4133 C111.2855,12.5033 113.5595,11.5253 116.1285,11.5253 C122.0175,11.5253 126.5195,16.4143 126.5195,23.3713" id="Fill-8"></path>
-                    <path d="M141.2527,28.762 C143.9127,28.762 146.0727,26.647 146.0727,23.394 C146.0727,20.257 144.0037,17.983 141.2757,17.983 C138.5017,17.983 136.3867,20.143 136.3867,23.394 C136.3867,26.6 138.4107,28.76 141.2527,28.76 L141.2527,28.762 Z M153.0757,11.958 L153.0757,34.74 L146.1637,34.74 L146.1637,32.284 L146.0727,32.284 C144.6177,34.194 142.4807,35.172 139.7517,35.172 C133.4767,35.172 129.0207,30.42 129.0207,23.372 C129.0207,16.414 133.5217,11.526 139.4107,11.526 C141.8667,11.526 144.0717,12.481 145.6867,14.368 L145.7777,14.368 L145.7777,11.958 L153.0757,11.958 Z" id="Fill-10"></path>
-                    <polygon id="Fill-12" points="157.964 34.74 165.217 34.74 165.217 0.453 157.964 0.453"></polygon>
-                    <polygon id="Fill-14" points="192.1151 11.9577 180.1551 43.9487 172.9481 43.9487 176.8811 33.1937 167.9911 11.9577 175.5401 11.9577 180.1781 24.3037 180.2921 24.3037 184.6571 11.9577"></polygon>
-                    <polygon id="Fill-15" points="203.2561 28.783 203.2561 28.874 212.9421 28.874 212.9421 34.74 193.7291 34.74 193.7291 29.874 203.5741 17.892 203.5741 17.801 194.5931 17.801 194.5931 11.958 213.3281 11.958 213.3281 16.778"></polygon>
-                    <path d="M222.2624,20.9615 L230.7884,20.9165 C230.3114,18.7105 228.8334,17.3465 226.6504,17.3465 C224.4674,17.3465 222.7394,18.6195 222.2624,20.9615 L222.2624,20.9615 Z M237.9284,23.1445 C237.9284,23.7805 237.8144,24.8045 237.7464,25.3045 L222.2394,25.3045 C222.7624,27.8735 225.0134,29.2375 227.6284,29.2375 C229.7424,29.2375 231.5844,28.3055 233.1554,26.4865 L237.0184,30.8295 C235.0874,33.2625 231.5864,35.1725 226.8574,35.1725 C220.1044,35.1725 215.0114,30.3975 215.0114,23.3485 C215.0114,16.4365 219.8994,11.5255 226.5844,11.5255 C233.2234,11.5255 237.9294,16.3685 237.9294,23.1445 L237.9284,23.1445 Z" id="Fill-16"></path>
-                    <path d="M255.7556,11.5484 L255.7556,19.3924 C255.0966,19.3474 254.4146,19.3474 254.0506,19.3474 C250.5946,19.3474 248.8206,21.5294 248.8206,24.5084 L248.8206,34.7404 L241.5446,34.7404 L241.5446,11.9574 L248.8206,11.9574 L248.8206,15.0044 L248.9116,15.0044 C250.6396,12.7304 253.0046,11.5254 255.5056,11.5254 C255.5736,11.5254 255.6876,11.5254 255.7556,11.5484" id="Fill-17"></path>
-                    <polygon id="Fill-3" points="47.1903 1.6579 36.8453 34.7399 29.7283 34.7399 24.1803 12.9809 24.1123 12.9809 18.3603 34.7399 11.2433 34.7399 0.8983 1.6579 9.1973 1.6579 14.7903 21.9619 14.8583 21.9619 19.9743 1.6579 28.1823 1.6579 33.2303 21.9619 33.2983 21.9619 38.8913 1.6579"></polygon>
-                </g>
-            </g>
-        </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="389" height="97">
+  <title>
+    Logo-White
+  </title>
+  <desc>
+    Created with Sketch.
+  </desc>
+  <g fill="#FFF" fill-rule="evenodd">
+    <path d="M57 74.7L6.5 48.5 0 53v3l57 40.8L114 56v-2.9l-6.5-4.6z" opacity=".6"/>
+    <path d="M57 0L0 40.9v2.9l57 40.9 57-41V41L57 0zm7.5 40.4l-7-9.6 6-4.4 12.3 18.3-5 3.7-13.2-5.5h-.1l7.6 9.7-5 3.6-25-9 6-4.4L54 48 47 38.5l4.7-3.4 12.8 5.3z"/>
+    <g>
+      <path d="M190.9 52.7c2.6 0 4.8-2.1 4.8-5.4 0-3.1-2-5.4-4.8-5.4S186 44 186 47.3c0 3.2 2 5.4 4.9 5.4zm11.8-16.8v22.7h-7v-2.4a7.5 7.5 0 01-6.3 2.9c-6.3 0-10.8-4.8-10.8-11.8 0-7 4.5-11.9 10.4-11.9a8 8 0 016.3 2.9h.1v-2.4h7.3zM224.2 47.3c0-3.3-2-5.4-4.9-5.4-2.9 0-5 2.3-5 5.4 0 3.3 2.2 5.4 5 5.4 3 0 5-2.2 5-5.4m7.3 0c0 7-4.5 11.8-10.7 11.8-2.6 0-4.7-1-6.2-2.7V68h-7.4v-32h7.3v2.4h.1c1.7-1.9 4-2.9 6.5-2.9 5.9 0 10.4 5 10.4 11.9M252.2 47.3c0-3.3-2.2-5.4-5-5.4s-5 2.3-5 5.4c0 3.3 2.2 5.4 5 5.4 3 0 5-2.2 5-5.4m7.3 0c0 7-4.5 11.8-10.7 11.8-2.6 0-4.7-1-6.2-2.7V68h-7.3v-32h7.3v2.4c1.7-1.9 4-2.9 6.5-2.9 6 0 10.4 5 10.4 11.9M274.3 52.7c2.6 0 4.8-2.1 4.8-5.4 0-3.1-2.1-5.4-4.8-5.4-2.8 0-5 2.1-5 5.4 0 3.2 2.1 5.4 5 5.4zM286 35.9v22.7h-7v-2.4a7.5 7.5 0 01-6.3 2.9c-6.3 0-10.8-4.8-10.8-11.8 0-7 4.5-11.9 10.4-11.9a8 8 0 016.3 2.9v-2.4h7.4zM291 58.6h7.2V24.4H291zM325.1 35.9l-12 32H306l4-10.8-9-21.2h7.6l4.7 12.3 4.5-12.3zM336.3 52.7h9.6v6h-19.2v-5l9.9-11.9h-9v-6h18.7v4.9zM355.3 44.9h8.5c-.5-2.3-2-3.6-4.1-3.6-2.2 0-4 1.2-4.4 3.6zm15.6 2.1c0 .7 0 1.7-.2 2.2h-15.5c.6 2.6 2.8 4 5.4 4 2.1 0 4-1 5.6-2.8l3.8 4.3c-2 2.5-5.4 4.4-10.1 4.4-6.8 0-11.9-4.8-11.9-11.8 0-7 4.9-11.9 11.6-11.9 6.6 0 11.3 4.9 11.3 11.6zM388.8 35.5v7.8H387c-3.5 0-5.3 2.1-5.3 5.1v10.2h-7.3V36h7.3v3h.1a8.2 8.2 0 016.9-3.4M180.2 25.6l-10.4 33h-7L157.1 37l-5.8 21.7h-7.2l-10.3-33h8.3l5.6 20.3 5.2-20.3h8.2l5 20.3h.1l5.6-20.3z"/>
     </g>
-</svg>
\ No newline at end of file
+  </g>
+</svg>
diff --git a/src/technologies.json b/src/technologies.json
index 85156bfce..85c7837a1 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -492,7 +492,7 @@
         68
       ],
       "description": "AccessiBe is an automated web accessibility solution for ADA and WCAG compliance. The system scans and analyzes a website using AI technology, and applies all the required adjustments to become ADA and WCAG 2.1 compliant.",
-      "icon": "Accessibe.png",
+      "icon": "Accessibe.svg",
       "scripts": "acsbap\\.com/.*/acsb\\.js",
       "website": "https://accessibe.com/"
     },
@@ -1749,7 +1749,7 @@
       ],
       "description": "AudioEye automatically evaluates and adjusts website content to be accessible.",
       "html": "<iframe[^>]*audioeye\\.com/frame/cookieStorage",
-      "icon": "AudioEye.png",
+      "icon": "AudioEye.svg",
       "scripts": "audioeye\\.com/ae\\.js",
       "website": "https://www.audioeye.com/"
     },
@@ -4818,7 +4818,7 @@
         68
       ],
       "description": "Facil-iti is solution for website owners, providing accessibility to disability users and seniors.",
-      "icon": "Facil-iti.png",
+      "icon": "Facil-iti.svg",
       "scripts": "ws\\.facil-iti\\.com/tag/faciliti-tag\\.min\\.js",
       "website": "https://www.facil-iti.com/"
     },
@@ -5839,7 +5839,7 @@
       "headers": {
         "Server": "Google Frontend"
       },
-      "icon": "Google App Engine.png",
+      "icon": "Google App Engine.svg",
       "website": "http://code.google.com/appengine"
     },
     "Google Charts": {
@@ -5895,7 +5895,7 @@
         35
       ],
       "description": "Google Maps is a web mapping service. It offers satellite imagery, aerial photography, street maps, 360° interactive panoramic views of streets, real-time traffic conditions, and route planning for traveling by foot, car, bicycle and air, or public transportation.",
-      "icon": "Google Maps.png",
+      "icon": "Google Maps.svg",
       "scripts": [
         "(?:maps\\.google\\.com/maps\\?file=api(?:&v=([\\d.]+))?|maps\\.google\\.com/maps/api/staticmap)\\;version:API v\\1",
         "//maps\\.google(?:apis)?\\.com/maps/api/js"
@@ -5924,7 +5924,7 @@
         "X-Mod-Pagespeed": "([\\d.]+)\\;version:\\1",
         "X-Page-Speed": "(.+)\\;version:\\1"
       },
-      "icon": "Google PageSpeed.png",
+      "icon": "Google PageSpeed.svg",
       "website": "http://developers.google.com/speed/pagespeed/mod"
     },
     "Google Pay": {
@@ -5983,7 +5983,7 @@
         "googletagmanager\\.com/ns\\.html[^>]+></iframe>",
         "<!-- (?:End )?Google Tag Manager -->"
       ],
-      "icon": "Google Tag Manager.png",
+      "icon": "Google Tag Manager.svg",
       "js": {
         "google_tag_manager": "",
         "googletag": ""
@@ -6335,7 +6335,7 @@
       "cats": [
         10
       ],
-      "icon": "Heap.png",
+      "icon": "Heap.svg",
       "js": {
         "heap": ""
       },
@@ -6503,7 +6503,7 @@
         10
       ],
       "description": "Hotjar is a suite of analytic tools to assist in the gathering of qualitative data, providing feedback through tools such as heatmaps, session recordings, and surveys.",
-      "icon": "Hotjar.png",
+      "icon": "Hotjar.svg",
       "js": {
         "HotLeadfactory": "",
         "HotleadController": "",
@@ -6698,7 +6698,7 @@
       "cats": [
         16
       ],
-      "icon": "Imperva.svg",
+    "icon": "Imperva.svg",
       "scripts": [
         "/_Incapsula_Resource"
       ],
@@ -13853,7 +13853,7 @@
       ],
       "description": "DiskStation provides a full-featured network attached storage.",
       "html": "<noscript><div class='syno-no-script'",
-      "icon": "Synology DiskStation.png",
+      "icon": "Synology DiskStation.svg",
       "meta": {
         "application-name": "Synology DiskStation",
         "description": "^DiskStation provides a full-featured network attached storage"
@@ -14122,7 +14122,7 @@
         68
       ],
       "description": "TextHelp is a literacy, accessibility and dyslexia software developer for people with reading and writing difficulties.",
-      "icon": "Texthelp.png",
+      "icon": "Texthelp.svg",
       "scripts": "browsealoud\\.com/.*/browsealoud\\.js",
       "website": "https://www.texthelp.com/en-gb/products/browsealoud/"
     },
@@ -14354,7 +14354,7 @@
         10
       ],
       "description": "TrackJS is an error monitoring agent for production web sites and applications.",
-      "icon": "TrackJs.png",
+      "icon": "TrackJs.svg",
       "js": {
         "TrackJs": ""
       },
@@ -14949,7 +14949,11 @@
       ],
       "description": "Vimeo is a video hosting, sharing and services platform. Vimeo operation an ad-free basis by providing subscription plans.",
       "html": "(?:<(?:param|embed)[^>]+vimeo\\.com/moogaloop|<iframe[^>]player\\.vimeo\\.com)",
-      "icon": "Vimeo.png",
+      "js": {
+        "Vimeo.Player": "",
+        "VimeoPlayer": ""
+      },
+      "icon": "Vimeo.svg",
       "website": "http://vimeo.com"
     },
     "Virgool": {
@@ -16656,7 +16660,7 @@
         16
       ],
       "html": "<style[^>]+[^<]+#cf-hcaptcha-container[^<]+</style>",
-      "icon": "hcaptcha-symbol-256.png",
+      "icon": "hCaptcha.svg",
       "scripts": "https://hcaptcha.com/([\\d]+?)/api.js\\;version:\\1",
       "website": "https://www.hcaptcha.com/"
     },
@@ -17415,7 +17419,7 @@
         "<link[^>]+recaptcha",
         "<div[^>]+class=\"g-recaptcha\""
       ],
-      "icon": "reCAPTCHA.png",
+      "icon": "reCAPTCHA.svg",
       "js": {
         "Recaptcha": "",
         "recaptcha": ""