diff --git a/src/drivers/webextension/images/icons/Ruby on Rails.png b/src/drivers/webextension/images/icons/Ruby on Rails.png
deleted file mode 100644
index 09a9fbeff..000000000
Binary files a/src/drivers/webextension/images/icons/Ruby on Rails.png and /dev/null differ
diff --git a/src/drivers/webextension/images/icons/Ruby on Rails.svg b/src/drivers/webextension/images/icons/Ruby on Rails.svg
new file mode 100644
index 000000000..46ab616f8
--- /dev/null
+++ b/src/drivers/webextension/images/icons/Ruby on Rails.svg	
@@ -0,0 +1,6 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.66833 25.3652H12.3106C12.3106 25.3652 10.2765 16.0835 17.0121 12.3251C18.4805 11.6111 23.155 8.94377 30.8067 14.6017C31.0492 14.3996 31.2782 14.238 31.2782 14.238C31.2782 14.238 24.2731 7.24639 16.4733 8.02772C12.5531 8.37798 7.7304 11.9479 4.90144 16.6628C2.07247 21.3777 1.66833 25.3652 1.66833 25.3652Z" fill="#CC0000"/>
+<path d="M1.66833 25.3652H12.3106C12.3106 25.3652 10.2765 16.0835 17.0121 12.3251C18.4805 11.6111 23.155 8.94377 30.8067 14.6017C31.0492 14.3996 31.2782 14.238 31.2782 14.238C31.2782 14.238 24.2731 7.24639 16.4733 8.02772C12.5531 8.37798 7.7304 11.9479 4.90144 16.6628C2.07247 21.3777 1.66833 25.3652 1.66833 25.3652Z" fill="#CC0000"/>
+<path d="M1.66833 25.3654H12.3106C12.3106 25.3654 10.2765 16.0837 17.0121 12.3252C18.4805 11.6112 23.155 8.94393 30.8067 14.6019C31.0492 14.3998 31.2782 14.2381 31.2782 14.2381C31.2782 14.2381 24.2731 7.24655 16.4733 8.02788C12.5396 8.37813 7.71693 11.948 4.88797 16.663C2.059 21.3779 1.66833 25.3654 1.66833 25.3654ZM23.842 8.78227L23.8959 7.8797C23.7747 7.81234 23.4379 7.65069 22.5892 7.4082L22.5353 8.29731C22.9799 8.44549 23.411 8.60715 23.842 8.78227Z" fill="#CC0000"/>
+<path d="M22.5623 11.6381L22.5084 12.4868C22.9529 12.5002 23.3975 12.5541 23.842 12.6484L23.8959 11.8132C23.4379 11.7189 22.9933 11.665 22.5623 11.6381ZM17.5779 7.43503H17.7126L17.4432 6.61328C17.0256 6.61328 16.5945 6.64022 16.1499 6.69411L16.4059 7.48891C16.7966 7.4485 17.1872 7.43503 17.5779 7.43503ZM18.2245 12.3925L18.5344 13.322C18.925 13.1334 19.3157 12.9717 19.7064 12.8505L19.41 11.9614C18.952 12.0961 18.5613 12.2443 18.2245 12.3925ZM12.1086 8.84951L11.5024 7.91999C11.1656 8.09512 10.8153 8.28372 10.4516 8.49926L11.0713 9.44225C11.4215 9.22671 11.7583 9.02464 12.1086 8.84951ZM14.8702 14.9116L15.5168 15.8815C15.7458 15.5447 16.0152 15.2349 16.3116 14.9251L15.7054 14.009C15.3955 14.2919 15.1127 14.6017 14.8702 14.9116ZM12.9168 19.2493L14.008 20.1115C14.0619 19.5861 14.1562 19.0607 14.2909 18.5354L13.321 17.7675C13.1458 18.2659 13.0246 18.7644 12.9168 19.2493ZM7.01642 12.8505L6.05996 12.0153C5.70971 12.352 5.37293 12.6888 5.06309 13.0256L6.10038 13.9147C6.38327 13.551 6.69311 13.1873 7.01642 12.8505ZM2.9481 18.8721L1.39891 18.3063C1.14295 18.8856 0.860054 19.5592 0.725342 19.9229L2.27454 20.4887C2.44966 20.0307 2.73256 19.3706 2.9481 18.8721ZM12.7148 22.671C12.7417 23.385 12.8091 23.9643 12.8764 24.3684L14.493 24.9477C14.3717 24.4223 14.2505 23.8296 14.1697 23.1964L12.7148 22.671Z" fill="#CC0000"/>
+</svg>
diff --git a/src/technologies/r.json b/src/technologies/r.json
index 6f7caa6fc..57fe8b8af 100644
--- a/src/technologies/r.json
+++ b/src/technologies/r.json
@@ -2322,7 +2322,7 @@
     "cpe": "cpe:2.3:a:ruby-lang:ruby:*:*:*:*:*:*:*:*",
     "description": "Ruby is an open-source object-oriented programming language.",
     "headers": {
-      "Server": "(?:Mongrel|WEBrick|Ruby)"
+      "Server": "(?:Mongrel|Ruby(?:/([\\d\\.]+))?)\\;version:\\1"
     },
     "icon": "Ruby.png",
     "website": "https://ruby-lang.org"
@@ -2357,7 +2357,7 @@
       "Server": "mod_(?:rails|rack)",
       "X-Powered-By": "mod_(?:rails|rack)"
     },
-    "icon": "Ruby on Rails.png",
+    "icon": "Ruby on Rails.svg",
     "implies": "Ruby",
     "js": {
       "ReactOnRails": "",
diff --git a/src/technologies/w.json b/src/technologies/w.json
index de2832413..63eb3133b 100644
--- a/src/technologies/w.json
+++ b/src/technologies/w.json
@@ -835,6 +835,19 @@
     "saas": true,
     "website": "https://www.webnode.com"
   },
+  "WEBrick": {
+    "cats": [
+      22
+    ],
+    "cpe": "cpe:2.3:a:ruby-lang:webrick:*:*:*:*:*:*:*:*",
+    "description": "WEBrick is a lightweight HTTP server library in Ruby, included in the standard library, primarily used for local development and testing of Ruby web applications.",
+    "icon": "Ruby.png",
+    "headers": {
+      "Server": "^WEBrick/([\\d\\.]+)\\;version:\\1"
+    },
+    "oss": true,
+    "website": "https://docs.ruby-lang.org/en/2.4.0/WEBrick.html"
+  },
   "WebRTC": {
     "cats": [
       19