diff --git a/src/apps.json b/src/apps.json
index f36efb4cf..edeadcc29 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -3764,17 +3764,6 @@
       "script": "apis\\.google\\.com/js/[a-z]*\\.js",
       "website": "http://plus.google.com"
     },
-    "Google Search Appliance": {
-      "cats": [
-        22,
-        29
-      ],
-      "headers": {
-        "Server": "^Google\\sSearch\\sAppliance$"
-      },
-      "icon": "Google Search Appliance.png",
-      "website": "https://enterprise.google.com/search"
-    },
     "Google Sites": {
       "cats": [
         1
@@ -6030,7 +6019,7 @@
       "headers": {
         "Server": "Microsoft-HTTPAPI(?:/([\\d.]+))?\\;version:\\1"
       },
-      "icon": "Microsoft.svg",
+      "icon": "Microsoft.png",
       "website": "http://microsoft.com"
     },
     "Microsoft PowerPoint": {
@@ -10739,7 +10728,7 @@
       "headers": {
         "Server": "\\bWinCE\\b"
       },
-      "icon": "Microsoft.svg",
+      "icon": "Microsoft.png",
       "website": "http://microsoft.com"
     },
     "Windows Server": {
@@ -10749,7 +10738,7 @@
       "headers": {
         "Server": "Win32|Win64"
       },
-      "icon": "Microsoft.svg",
+      "icon": "WindowsServer.png",
       "website": "http://microsoft.com/windowsserver"
     },
     "Wink": {
diff --git a/src/icons/Google Maps.png b/src/icons/Google Maps.png
index 1f90c694b..ecf471ef0 100644
Binary files a/src/icons/Google Maps.png and b/src/icons/Google Maps.png differ
diff --git a/src/icons/Google Search Appliance.png b/src/icons/Google Search Appliance.png
deleted file mode 100644
index 71bb47077..000000000
Binary files a/src/icons/Google Search Appliance.png and /dev/null differ
diff --git a/src/icons/Google Sites.png b/src/icons/Google Sites.png
index 6f74a7a75..3bcb4f4cc 100644
Binary files a/src/icons/Google Sites.png and b/src/icons/Google Sites.png differ
diff --git a/src/icons/Microsoft.png b/src/icons/Microsoft.png
new file mode 100644
index 000000000..d6c37c10f
Binary files /dev/null and b/src/icons/Microsoft.png differ
diff --git a/src/icons/Microsoft.svg b/src/icons/Microsoft.svg
deleted file mode 100644
index ecb0ac592..000000000
--- a/src/icons/Microsoft.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="439" width="439"><path fill="#f3f3f3" d="M0 0h439v439H0z"/><path fill="#f8682c" d="M17 17h194v194H17z"/><path fill="#91c300" d="M228 17h194v194H228z"/><path fill="#00b4f1" d="M17 228h194v194H17z"/><path fill="#ffc300" d="M228 228h194v194H228z"/></svg>
\ No newline at end of file
diff --git a/src/icons/WindowsServer.png b/src/icons/WindowsServer.png
new file mode 100644
index 000000000..31f92d9e8
Binary files /dev/null and b/src/icons/WindowsServer.png differ
diff --git a/src/icons/webdev.png b/src/icons/webdev.png
index 3d4632300..a37ce3ec8 100644
Binary files a/src/icons/webdev.png and b/src/icons/webdev.png differ