diff --git a/Tests/Parser/Client/fixtures/mobile_app.yml b/Tests/Parser/Client/fixtures/mobile_app.yml
index bb8fb9fa7c..9400f695a3 100644
--- a/Tests/Parser/Client/fixtures/mobile_app.yml
+++ b/Tests/Parser/Client/fixtures/mobile_app.yml
@@ -1667,3 +1667,69 @@
     type: mobile app
     name: Twitch Studio
     version: 0.115.7
+-
+  user_agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.5005.63 Safari/537.36 Stream Master
+  client:
+    type: mobile app
+    name: Stream Master
+    version: ""
+-
+  user_agent: WhatsApp/2.22.9.76 i
+  client:
+    type: mobile app
+    name: WhatsApp
+    version: 2.22.9.76
+-
+  user_agent: YoFMWhatsApp/2.22.17.76 A
+  client:
+    type: mobile app
+    name: FM WhatsApp
+    version: 2.22.17.76
+-
+  user_agent: YoGBWhatsApp/2.22.10.73 A
+  client:
+    type: mobile app
+    name: GBWhatsApp
+    version: 2.22.10.73
+-
+  user_agent: YoYoWhatsApp/2.22.10.73 A
+  client:
+    type: mobile app
+    name: Yo WhatsApp
+    version: 2.22.10.73
+-
+  user_agent: WhatsApp
+  client:
+    type: mobile app
+    name: Signal
+    version: ""
+-
+  user_agent: WhatsApp/2
+  client:
+    type: mobile app
+    name: Signal
+    version: ""
+-
+  user_agent: Mozilla/5.0 (Windows NT 6.2) AppleWebKit/537.36 (KHTML, like Gecko) WhatsAppElectron/1.0.3 Chrome/108.0.5359.215 Electron/22.3.27 Safari/537.36
+  client:
+    type: mobile app
+    name: WhatsApp
+    version: 1.0.3
+-
+  user_agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) whatsapp-linux-app/1.0.0 Chrome/120.0.6099.216 Electron/28.1.4 Safari/537.36
+  client:
+    type: mobile app
+    name: WhatsApp
+    version: 1.0.0
+-
+  user_agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) whatsapp-app/1.0.1 Chrome/91.0.4472.124 Electron/13.1.6 Safari/537.36
+  client:
+    type: mobile app
+    name: WhatsApp
+    version: 1.0.1
+-
+  user_agent: WhatsApp/2.22.2 CloudAPI/99.99.99 Device/x86_64
+  client:
+    type: mobile app
+    name: WhatsApp Business
+    version: 2.22.2
diff --git a/regexes/client/mobile_apps.yml b/regexes/client/mobile_apps.yml
index e9825f0cc4..4676501945 100644
--- a/regexes/client/mobile_apps.yml
+++ b/regexes/client/mobile_apps.yml
@@ -171,11 +171,41 @@
   name: '$1'
   version: '$2'
 
+# Signal uses WhatsApp user agent
+- regex: 'WhatsApp(?:/2)?$'
+  name: 'Signal'
+  version: ''
+
+# WhatsApp Business
+- regex: 'WhatsApp/([\d\.]+).+CloudAPI'
+  name: 'WhatsApp Business'
+  version: '$1'
+
 # WhatsApp
-- regex: 'WhatsApp(?:[ /]([\d\.]+))?'
+- regex: 'WhatsApp(?:Electron|\-app|\-linux-app)?(?:[ /]([\d\.]+))?'
   name: 'WhatsApp'
   version: '$1'
 
+# WhatsApp+2
+- regex: 'YoWhatsApp2Plus(?:/(\d+[\.\d]+))?'
+  name: 'WhatsApp+2'
+  version: '$1'
+
+# FM WhatsApp
+- regex: 'YoFMWhatsApp(?:/(\d+[\.\d]+))?'
+  name: 'FM WhatsApp'
+  version: '$1'
+
+# GBWhatsApp
+- regex: '(?:Yo)?GBWhatsApp(?:/(\d+[\.\d]+))?'
+  name: 'GBWhatsApp'
+  version: '$1'
+
+# Yo WhatsApp
+- regex: 'YoYoWhatsApp(?:/(\d+[\.\d]+))?'
+  name: 'Yo WhatsApp'
+  version: '$1'
+
 # Line
 - regex: 'Line(?:[ /]([\d\.]+))'
   name: 'Line'
@@ -1378,22 +1408,11 @@
   name: 'Amazon Music'
   version: '$1'
 
-
 # Klarna (https://apps.apple.com/us/app/klarna-shop-now-pay-later/id1115120118)
 - regex: 'Klarna/(\d+\.[.\d]+)?'
   name: 'Klarna'
   version: '$1'
 
-# WhatsApp+2
-- regex: 'YoWhatsApp2Plus(?:/(\d+[\.\d]+))?'
-  name: 'WhatsApp+2'
-  version: '$1'
-
-# GBWhatsApp
-- regex: 'GBWhatsApp(?:/(\d+[\.\d]+))?'
-  name: 'GBWhatsApp'
-  version: '$1'
-
 # R (https://www.r-project.org/)
 - regex: '^R/(\d+[\.\d]+)'
   name: 'R'
@@ -2258,3 +2277,8 @@
 - regex: 'twitch-desktop-electron-platform.*spotlight/(\d+[\.\d]+)'
   name: 'Twitch Studio'
   version: '$1'
+
+# Stream Master (https://www.lovense.com/stream-master)
+- regex: 'Stream Master$'
+  name: 'Stream Master'
+  version: ''