diff --git a/src/apps.json b/src/apps.json
index 6adadb87c..0c00f9da4 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -1200,7 +1200,7 @@
 			"headers": {
 				"Server": "CANON HTTP Server(?:/([\\d.]+))?\\;version:\\1"
 			},
-			"icon": "Canon HTTP Server.png",
+			"icon": "Canon.png",
 			"implies": "Canon",
 			"website": "http://www.canon.com"
 		},
@@ -2167,7 +2167,7 @@
 			"headers": {
 				"Server": "ELOG HTTP( \\d[\\-\\d\\.]+)?\\;version:\\1"
 			},
-			"icon": "ELOG HTTP.png",
+			"icon": "ELOG.png",
 			"implies": "ELOG",
 			"website": "http://midas.psi.ch/elog"
 		},
@@ -3319,7 +3319,7 @@
 				25
 			],
 			"html": "<svg[^>]*><desc>Created with Highstock ([\\d.]*)\\;version:\\1",
-			"icon": "Highstock.png",
+			"icon": "Highcharts.png",
 			"script": "highstock(?:\\-|\\.)?([\\d\\.]*\\d).*\\.js\\;version:\\1",
 			"website": "http://highcharts.com/products/highstock"
 		},
@@ -4450,7 +4450,7 @@
 			"cats": [
 				28
 			],
-			"icon": "M.R. Inc BoxyOS.png",
+			"icon": "M.R. Inc.png",
 			"website": "http://mrincworld.com"
 		},
 		"M.R. Inc SiteFrame": {
@@ -4460,7 +4460,7 @@
 			"headers": {
 				"Powered-By": "M\\.R\\. Inc SiteFrame"
 			},
-			"icon": "M.R. Inc SiteFrame.png",
+			"icon": "M.R. Inc.png",
 			"website": "http://mrincworld.com"
 		},
 		"M.R. Inc Webserver": {
@@ -4470,7 +4470,7 @@
 			"headers": {
 				"Server": "M\\.R\\. Inc Webserver"
 			},
-			"icon": "M.R. Inc Webserver.png",
+			"icon": "M.R. Inc.png",
 			"implies": [
 				"M.R. Inc BoxyOS"
 			],
@@ -9167,7 +9167,7 @@
 				47
 			],
 			"html": "<!-- git web interface version ([\\d.]+)?\\;version:\\1",
-			"icon": "gitweb.png",
+			"icon": "git.png",
 			"implies": [
 				"Perl",
 				"git"
diff --git a/src/icons/Canon HTTP Server.png b/src/icons/Canon HTTP Server.png
deleted file mode 100755
index 1f55e03b3..000000000
Binary files a/src/icons/Canon HTTP Server.png and /dev/null differ
diff --git a/src/icons/E-CommercePy.png b/src/icons/E-CommercePy.png
deleted file mode 100644
index 16fb0d0b9..000000000
Binary files a/src/icons/E-CommercePy.png and /dev/null differ
diff --git a/src/icons/ELOG HTTP.png b/src/icons/ELOG HTTP.png
deleted file mode 100644
index 8a53cd3dc..000000000
Binary files a/src/icons/ELOG HTTP.png and /dev/null differ
diff --git a/src/icons/Highstock.png b/src/icons/Highstock.png
deleted file mode 100644
index 68bf7a0c5..000000000
Binary files a/src/icons/Highstock.png and /dev/null differ
diff --git a/src/icons/M.R. Inc SiteFrame.png b/src/icons/M.R. Inc SiteFrame.png
deleted file mode 100644
index 1e3e20e1b..000000000
Binary files a/src/icons/M.R. Inc SiteFrame.png and /dev/null differ
diff --git a/src/icons/M.R. Inc Webserver.png b/src/icons/M.R. Inc Webserver.png
deleted file mode 100644
index 1e3e20e1b..000000000
Binary files a/src/icons/M.R. Inc Webserver.png and /dev/null differ
diff --git a/src/icons/M.R. Inc BoxyOS.png b/src/icons/M.R. Inc.png
similarity index 100%
rename from src/icons/M.R. Inc BoxyOS.png
rename to src/icons/M.R. Inc.png
diff --git a/src/icons/gitweb.png b/src/icons/gitweb.png
deleted file mode 100644
index 5ff1d2b09..000000000
Binary files a/src/icons/gitweb.png and /dev/null differ