diff --git a/drivers/bookmarklet/images/icons/Piwik.png b/drivers/bookmarklet/images/icons/Piwik.png
index fc29096bf..2223a5790 100644
Binary files a/drivers/bookmarklet/images/icons/Piwik.png and b/drivers/bookmarklet/images/icons/Piwik.png differ
diff --git a/drivers/bookmarklet/images/icons/RCMS.png b/drivers/bookmarklet/images/icons/RCMS.png
new file mode 100644
index 000000000..c135a8fd8
Binary files /dev/null and b/drivers/bookmarklet/images/icons/RCMS.png differ
diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index e963923d3..ace737969 100644
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -1332,7 +1332,7 @@
 		},
 		"RCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(RCMS|ReallyCMS)" }
+			"meta": { "generator": "^(RCMS|ReallyCMS)" }
 		},
 		"reCAPTCHA": {
 			"cats": [ 16 ],
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index e963923d3..ace737969 100644
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -1332,7 +1332,7 @@
 		},
 		"RCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(RCMS|ReallyCMS)" }
+			"meta": { "generator": "^(RCMS|ReallyCMS)" }
 		},
 		"reCAPTCHA": {
 			"cats": [ 16 ],
diff --git a/drivers/chrome/images/icons/Piwik.png b/drivers/chrome/images/icons/Piwik.png
index fc29096bf..2223a5790 100644
Binary files a/drivers/chrome/images/icons/Piwik.png and b/drivers/chrome/images/icons/Piwik.png differ
diff --git a/drivers/chrome/images/icons/RCMS.png b/drivers/chrome/images/icons/RCMS.png
new file mode 100644
index 000000000..c135a8fd8
Binary files /dev/null and b/drivers/chrome/images/icons/RCMS.png differ
diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index e963923d3..ace737969 100644
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -1332,7 +1332,7 @@
 		},
 		"RCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(RCMS|ReallyCMS)" }
+			"meta": { "generator": "^(RCMS|ReallyCMS)" }
 		},
 		"reCAPTCHA": {
 			"cats": [ 16 ],
diff --git a/drivers/firefox-jetpack/images/icons/Piwik.png b/drivers/firefox-jetpack/images/icons/Piwik.png
index fc29096bf..2223a5790 100644
Binary files a/drivers/firefox-jetpack/images/icons/Piwik.png and b/drivers/firefox-jetpack/images/icons/Piwik.png differ
diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index e963923d3..ace737969 100644
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -1332,7 +1332,7 @@
 		},
 		"RCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(RCMS|ReallyCMS)" }
+			"meta": { "generator": "^(RCMS|ReallyCMS)" }
 		},
 		"reCAPTCHA": {
 			"cats": [ 16 ],
diff --git a/drivers/firefox/skin/images/icons/Piwik.png b/drivers/firefox/skin/images/icons/Piwik.png
index fc29096bf..2223a5790 100644
Binary files a/drivers/firefox/skin/images/icons/Piwik.png and b/drivers/firefox/skin/images/icons/Piwik.png differ
diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index e963923d3..ace737969 100644
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -1332,7 +1332,7 @@
 		},
 		"RCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(RCMS|ReallyCMS)" }
+			"meta": { "generator": "^(RCMS|ReallyCMS)" }
 		},
 		"reCAPTCHA": {
 			"cats": [ 16 ],
diff --git a/drivers/html/images/icons/Piwik.png b/drivers/html/images/icons/Piwik.png
index fc29096bf..2223a5790 100644
Binary files a/drivers/html/images/icons/Piwik.png and b/drivers/html/images/icons/Piwik.png differ
diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index e963923d3..ace737969 100644
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -1332,7 +1332,7 @@
 		},
 		"RCMS": {
 			"cats": [ 1 ],
-			"meta": { "generator": "(RCMS|ReallyCMS)" }
+			"meta": { "generator": "^(RCMS|ReallyCMS)" }
 		},
 		"reCAPTCHA": {
 			"cats": [ 16 ],
diff --git a/share/images/icons/Piwik.png b/share/images/icons/Piwik.png
index fc29096bf..2223a5790 100644
Binary files a/share/images/icons/Piwik.png and b/share/images/icons/Piwik.png differ