diff --git a/src/apps.json b/src/apps.json
index 5f55e8b59..f1f55f0c9 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -729,20 +729,6 @@
 			},
 			"website": "http://www.methods.co.nz/asciidoc"
 		},
-		"Asymptix PHP Framework": {
-			"cats": [
-				"18"
-			],
-			"headers": {
-				"X-Powered-By": "Asymptix PHP Framework(?:.*)"
-			},
-			"html": [
-				"Powered by <a href=\"http://www.asymptix.com/\" rel=\"external\">Asymptix PHP Framework</a>"
-			],
-			"icon": "Asymptix PHP Framework.png",
-			"implies": "PHP",
-			"website": "http://github.com/Asymptix/Framework"
-		},
 		"Atlassian Bitbucket": {
 			"cats": [
 				"47"
@@ -750,6 +736,7 @@
 			"env": "^bitbucket$",
 			"icon": "Atlassian Bitbucket.svg",
 			"implies": "Python",
+      "html": "<li>Atlassian Bitbucket <span title=\"[a-z0-9]+\" id=\"product-version\" data-commitid=\"[a-z0-9+]\" data-system-build-number=\"[a-z0-9]+\"> v([\\d.]+)<\\;version:\\1</span>",
 			"meta": {
 				"application-name": "Bitbucket"
 			},
@@ -2923,6 +2910,21 @@
 			"implies": "PHP",
 			"script": "gm_javascript\\.js\\.php",
 			"website": "http://gambio.de"
+    },
+    "Gatsby": {
+			"cats": [
+				"12"
+			],
+      "html": [
+        "<div id=\"___gatsby\">",
+        "<style id=\"gatsby-inlined-css\">"
+      ],
+			"icon": "Gatsby.svg",
+			"implies": [
+        "React",
+        "Webpack"
+			],
+			"website": "https://www.gatsbyjs.org/"
 		},
 		"Gauges": {
 			"cats": [
@@ -3817,7 +3819,7 @@
 				"1"
 			],
 			"headers": {
-				"Set-Cookie": "ICMSession[^;]+=",
+				"Set-Cookie": "^ICMSSession[^;]*=",
 				"X-Powered-By": "ImpressCMS"
 			},
 			"icon": "ImpressCMS.png",
@@ -4947,7 +4949,8 @@
 			},
 			"html": [
 				"<script [^>]+data-requiremodule=\"mage/\\;version:2",
-				"<script [^>]+data-requiremodule=\"Magento_\\;version:2"
+				"<script [^>]+data-requiremodule=\"Magento_\\;version:2",
+        "<script type=\"text/x-magento-init\">"
 			],
 			"icon": "Magento.png",
 			"implies": "PHP",
@@ -5814,7 +5817,7 @@
 				"22"
 			],
 			"headers": {
-				"server": "now"
+				"server": "^now$"
 			},
 			"icon": "zeit.svg",
 			"website": "https://zeit.co/now"
@@ -7359,7 +7362,7 @@
 			],
 			"headers": {
 				"Set-Cookie": "^sails\\.sid$",
-				"X-Powered-By": "^Sails$"
+				"X-Powered-By": "^Sails(?:$|[^a-z0-9])"
 			},
 			"icon": "Sails.js.svg",
 			"implies": "Express",
@@ -9029,17 +9032,6 @@
 			"icon": "Vimeo.png",
 			"website": "http://vimeo.com"
 		},
-		"Vinala": {
-			"cats": [
-				"18"
-			],
-			"headers": {
-				"Set-Cookie": "vinala_version"
-			},
-			"icon": "Vinala.png",
-			"implies": "PHP",
-			"website": "https://github.com/vinala/vinala"
-		},
 		"Virata EmWeb": {
 			"cats": [
 				"22"
@@ -10865,16 +10857,6 @@
 			},
 			"website": "http://www.xt-commerce.com"
 		},
-		"xui": {
-			"cats": [
-				"26",
-				"12"
-			],
-			"env": "^xui$",
-			"icon": "xui.png",
-			"script": "[^a-z]xui.*\\.js",
-			"website": "http://xuijs.com"
-		},
     "Raychat": {
       "cats": [
         "52"
@@ -10900,7 +10882,22 @@
     	"icon": "Anetwork.png",
    		"script": "static-cdn\\.anetwork\\.ir/",
     	"website": "https://www.anetwork.ir"
-   	}
+   	},
+		"Akaunting": {
+			"cats": [
+				"55"
+			],
+			"html": [
+				"<link[^>]+akaunting-green\\.css",
+				"Powered By Akaunting: <a [^>]*href=\"https?://(?:www\\.)?akaunting\\.com[^>]+>"
+			],
+			"headers": {
+				"X-Akaunting": "^Free Accounting Software$"
+			},
+			"implies": "Laravel",
+			"icon": "akaunting.svg",
+			"website": "https://akaunting.com"
+		}
 	},
 	"categories": {
 		"1": {
@@ -11118,6 +11115,10 @@
     "54": {
       "name": "SEO",
       "priority": "9"
-    }
+    },
+		"55": {
+			"name": "Accounting",
+			"priority": "1"
+		}
 	}
 }
diff --git a/src/drivers/bookmarklet/driver.js b/src/drivers/bookmarklet/driver.js
index 76c2ea343..5418ddbbc 100644
--- a/src/drivers/bookmarklet/driver.js
+++ b/src/drivers/bookmarklet/driver.js
@@ -93,12 +93,16 @@
           continue;
         }
 
+        var version = detected[app].version,
+          confidence = detected[app].confidence;
+        
         html +=
           '<div class="wappalyzer-app' + ( first ? ' wappalyzer-first' : '' ) + '">' +
             '<a target="_blank" class="wappalyzer-application" href="' + wappalyzer.config.websiteURL + 'applications/' + app.toLowerCase().replace(/ /g, '-').replace(/[^a-z0-9-]/g, '') + '">' +
               '<strong>' +
                 '<img src="' + wappalyzer.config.websiteURL + 'images/icons/' + (wappalyzer.apps[app].icon || 'default.svg') + '" width="16" height="16"/> ' + app +
               '</strong>' +
+              ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ) + 
             '</a>';
 
         for ( let i in wappalyzer.apps[app].cats ) {
diff --git a/src/drivers/webextension/_locales/en/messages.json b/src/drivers/webextension/_locales/en/messages.json
index 1c2484ae9..bac2a4731 100644
--- a/src/drivers/webextension/_locales/en/messages.json
+++ b/src/drivers/webextension/_locales/en/messages.json
@@ -63,5 +63,6 @@
 	"categoryName51":           { "message": "Landing Page Builder" },
 	"categoryName52":           { "message": "Live Chat" },
 	"categoryName53":           { "message": "CRM" },
-  "categoryName54":           { "message": "SEO" }
+  "categoryName54":           { "message": "SEO" },
+	"categoryName55":           { "message": "Accounting" }
 }
diff --git a/src/icons/Asymptix PHP Framework.png b/src/icons/Asymptix PHP Framework.png
deleted file mode 100644
index cc8d5eeac..000000000
Binary files a/src/icons/Asymptix PHP Framework.png and /dev/null differ
diff --git a/src/icons/CloudFlare.svg b/src/icons/CloudFlare.svg
index d3cddf486..7ab2a4ede 100644
--- a/src/icons/CloudFlare.svg
+++ b/src/icons/CloudFlare.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 534.00001 242" height="242" width="534"><defs><radialGradient id="k" spreadMethod="pad" gradientTransform="translate(337.87 976.07) scale(135.27)" gradientUnits="userSpaceOnUse" r="1" cy="0" cx="0" fy="-.181" fx=".62"><stop offset="0" stop-color="#fff"/><stop offset=".001" stop-color="#fff"/><stop offset=".133" stop-color="#f6eb08"/><stop offset=".859" stop-color="#eb821a"/><stop offset="1" stop-color="#eb821a"/></radialGradient><clipPath id="i"><path d="M5212.8 939.52l-18 36.011-20 33.999-28 44-28 36-34 42-34 35.99-40 38.01-38 31.99-42 30-42 26.01-46.5 26-39.5 20-40 16-36 10-36 8-36 6-42 4-2748-6-44-2-44-2-48-6.01-40-7.99-52-12.01-36-11.99-38-14-38-13.5-48-24.5-36-18-46-30-42-32-44-36.01-38-37.99-30-36-32-42-24-42-18-35.999-10-34.011-6.64-28.211h4074.25l-11.61 28.211z"/></clipPath><linearGradient id="j" gradientTransform="matrix(0 -468.741 -468.741 0 3187.29 1381.09)" gradientUnits="userSpaceOnUse" x2="1"><stop offset="0" stop-color="#f57c14"/><stop offset=".061" stop-color="#f57c14"/><stop offset="1" stop-color="#9e3539"/></linearGradient><clipPath id="g"><path d="M5192.46 1066.59c0 268.02-217.19 485.3-485.11 485.3-267.91 0-485.1-217.28-485.1-485.3 0-37.78 4.45-74.5 12.61-109.789h944.98c8.17 35.289 12.62 72.009 12.62 109.789z"/></clipPath><linearGradient id="h" gradientTransform="scale(-453.222 453.222) rotate(-71.161 -2.952 9.265)" gradientUnits="userSpaceOnUse" x2="1"><stop offset="0" stop-color="#fff"/><stop offset=".803" stop-color="#f57d14"/><stop offset="1" stop-color="#f57d14"/></linearGradient><clipPath id="e"><path d="M2223.9 947.762c0 293.878-238.14 532.128-531.91 532.128s-531.92-238.25-531.92-532.128c0-1.043.08-2.051.08-3.082h1063.67c.01 1.031.08 2.039.08 3.082z"/></clipPath><linearGradient id="f" gradientTransform="scale(1751.07 -1751.07) rotate(56.997 1.336 .019)" gradientUnits="userSpaceOnUse" x2="1"><stop offset="0" stop-color="#fff"/><stop offset=".803" stop-color="#f57d14"/><stop offset="1" stop-color="#f57d14"/></linearGradient><clipPath id="c"><path d="M2443.21 1615.69c-49.44-179.67-235.17-285.23-414.85-235.79-179.67 49.44-285.23 235.18-235.79 414.83 49.44 179.68 235.16 285.26 414.83 235.82 179.68-49.45 285.26-235.19 235.81-414.86z"/></clipPath><linearGradient id="d" gradientTransform="scale(356.64 -356.64) rotate(60.384 7.594 1.826)" gradientUnits="userSpaceOnUse" x2="1"><stop offset="0" stop-color="#fff"/><stop offset=".803" stop-color="#f57d14"/><stop offset="1" stop-color="#f57d14"/></linearGradient><linearGradient id="b" gradientTransform="rotate(-90 599.358 311.542) scale(99.12637)" gradientUnits="userSpaceOnUse" x2="1"><stop offset="0" stop-color="#f57d14"/><stop offset="1" stop-color="#fff"/></linearGradient><radialGradient id="a" spreadMethod="pad" gradientTransform="translate(422.72 945.976) scale(101.06288)" gradientUnits="userSpaceOnUse" r="1" cy="0" cx="0" fy=".051" fx="-.024"><stop offset="0" stop-color="#fff"/><stop offset=".002" stop-color="#fff"/><stop offset=".19" stop-color="#f6eb08"/><stop offset=".859" stop-color="#eb821a"/><stop offset="1" stop-color="#eb821a"/></radialGradient></defs><path d="M414.382 881.298l12.002-42 1.749.25 1.25 44 22.5-37.25 2 1-10.5 42.25 31.876-30.25 1.624 1.5-21.5 38.25 38.75-20.5 1.25 1.5-30.75 31.5 42.75-9.75 1 1.75-38 22.25 44 1.625v1.875l-42.5 11.75 42.25 12.5v1.75l-44 .75 37.25 23.25-1 2-42.374-10.75 29.875 31.75-1 1.75-38-21.75 20.375 38.5-1.875 1.5-31.25-30.75 10.25 42.25-2 1.25-22.252-37.75-.686 43.5-2.312.5-12.002-42-12.5 42-2.248-.5v-43.5l-1.25-.5-24.25 36.5 10.5-42.25-32 30-1.75-1.5 21.75-38-39 20.25-1.25-1.5 30.748-31-42.998 9.5-.5-1.75 38-22.25-43.5-1.75-.75-1.75 42.187-12-41.687-12.25.25-2 43.75-.75-37-22.5.25-2 42.875 10.75-30.375-32 1.5-1.75 38.5 21-21-38 1.25-1.5 32.25 30.75-10.502-42.75-.358-.75 25.297 38 .563-44.25h2.5l11.998 42" fill="url(#a)" fill-rule="evenodd" transform="translate(.5 -810.362)"/><path d="M533.563 212.463c0-41.94-33.998-75.938-75.938-75.938-16.94 0-32.583 5.551-45.214 14.929a127.159 127.159 0 0 0 2.401-24.616C414.813 56.94 358.15.275 288.25.275c-55.661 0-102.929 35.933-119.875 85.866a56.701 56.701 0 0 0-34.141-11.366c-31.454 0-56.953 25.499-56.953 56.954 0 4.87.614 9.595 1.764 14.107C35.42 147.106.437 182.844.437 226.775c0 5.11.495 10.103 1.4 14.95h525.874a75.69 75.69 0 0 0 5.851-29.262" fill="#f57c14"/><path d="M399.445 937.266c0 61.651-50.144 100.652-111.795 100.652s-111.463-39-111.463-100.652c0-61.651 49.978-111.629 111.63-111.629 61.65 0 111.628 49.978 111.628 111.629" fill="url(#b)" fill-rule="evenodd" transform="translate(.5 -810.362)"/><path d="M382.848 127.608c0 37.702-42.642 68.266-95.24 68.266-52.598 0-95.237-30.564-95.237-68.266 0-37.703 42.639-68.267 95.238-68.267 52.597 0 95.239 30.564 95.239 68.267" fill="#f57c14" fill-rule="evenodd"/><g clip-path="url(#c)" transform="matrix(.125 0 0 -.125 -130.196 345.136)"><path d="M2443.21 1615.69c-49.44-179.67-235.17-285.23-414.85-235.79-179.67 49.44-285.23 235.18-235.79 414.83 49.44 179.68 235.16 285.26 414.83 235.82 179.68-49.45 285.26-235.19 235.81-414.86" fill="url(#d)"/></g><path d="M168.8 115.904c7.151 12.385-1.79 30.935-19.97 41.431-18.18 10.498-38.716 8.965-45.866-3.42-7.152-12.386 1.789-30.935 19.97-41.431 18.18-10.498 38.715-8.966 45.866 3.42" fill="#f57c14" fill-rule="evenodd"/><g clip-path="url(#e)" transform="matrix(.125 0 0 -.125 -130.196 345.136)"><path d="M2223.9 947.762c0 293.878-238.14 532.128-531.91 532.128s-531.92-238.25-531.92-532.128c0-1.043.08-2.051.08-3.082h1063.67c.01 1.031.08 2.039.08 3.082" fill="url(#f)"/></g><g clip-path="url(#g)" transform="matrix(.125 0 0 -.125 -130.196 345.136)"><path d="M5192.46 1066.59c0 268.02-217.19 485.3-485.11 485.3-267.91 0-485.1-217.28-485.1-485.3 0-37.78 4.45-74.5 12.61-109.789h944.98c8.17 35.289 12.62 72.009 12.62 109.789" fill="url(#h)"/></g><g clip-path="url(#i)" transform="matrix(.125 0 0 -.125 -130.196 345.136)"><path d="M5212.8 939.52l-18 36.011-20 33.999-28 44-28 36-34 42-34 35.99-40 38.01-38 31.99-42 30-42 26.01-46.5 26-39.5 20-40 16-36 10-36 8-36 6-42 4-2748-6-44-2-44-2-48-6.01-40-7.99-52-12.01-36-11.99-38-14-38-13.5-48-24.5-36-18-46-30-42-32-44-36.01-38-37.99-30-36-32-42-24-42-18-35.999-10-34.011-6.64-28.211h4074.25l-11.61 28.211" fill="url(#j)"/></g><path d="M421.924 951.748l45.999 60.25-1.75 1.25-53.75-48.25-206.25 37.5-.25-2 191.75-44-105.5-36 1.25-1.5 128.5 32.75" fill="url(#k)" fill-rule="evenodd" transform="translate(.5 -810.362)"/></svg>
\ No newline at end of file
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 341.2 154.3"><defs><style>.cls-1{fill:#fff}.cls-2{fill:#f38020}.cls-3{fill:#faae40}</style></defs><title>cloud</title><path class="cls-1" d="M312.8 91.7l-42.9-24.6-7.4-3.2L87 65.1v89.1h225.8V91.7z"/><path class="cls-2" d="M234.7 146c2.1-7.2 1.3-13.8-2.2-18.7-3.2-4.5-8.6-7.1-15.1-7.4l-123.1-1.6a2.28 2.28 0 0 1-1.9-1 2.76 2.76 0 0 1-.3-2.2 3.38 3.38 0 0 1 2.9-2.2l124.2-1.6c14.7-.7 30.7-12.6 36.3-27.2l7.1-18.5a4 4 0 0 0 .2-2.4 80.87 80.87 0 0 0-155.5-8.3 36.35 36.35 0 0 0-58 25.4 38.18 38.18 0 0 0 .9 12.7A51.66 51.66 0 0 0 0 144.7a63 63 0 0 0 .5 7.5 2.46 2.46 0 0 0 2.4 2.1h227.2a3.09 3.09 0 0 0 2.9-2.2z"/><path class="cls-3" d="M273.9 66.9c-1.1 0-2.3 0-3.4.1a2 2 0 0 0-1.8 1.4l-4.8 16.7c-2.1 7.2-1.3 13.8 2.2 18.7 3.2 4.5 8.6 7.1 15.1 7.4l26.2 1.6a2.28 2.28 0 0 1 1.9 1 2.82 2.82 0 0 1 .3 2.2 3.38 3.38 0 0 1-2.9 2.2l-27.3 1.6c-14.8.7-30.7 12.6-36.3 27.2l-2 5.1a1.44 1.44 0 0 0 1.4 2h93.8a2.46 2.46 0 0 0 2.4-1.8 68.35 68.35 0 0 0 2.5-18.2 67.37 67.37 0 0 0-67.3-67.2"/></svg>
\ No newline at end of file
diff --git a/src/icons/Gatsby.svg b/src/icons/Gatsby.svg
new file mode 100644
index 000000000..13364f3ba
--- /dev/null
+++ b/src/icons/Gatsby.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 fill="#744c9e" width="1200px" height="1200px" viewBox="0 0 1200 1200" enable-background="new 0 0 1200 1200" xml:space="preserve">
+<g>
+	<g>
+		<path d="M600,28.644C284.449,28.644,28.644,284.448,28.644,600c0,315.553,255.806,571.356,571.356,571.356
+			c315.553,0,571.356-255.804,571.356-571.356C1171.356,284.448,915.553,28.644,600,28.644z M151.414,605.956l442.629,442.63
+			C350.989,1045.418,154.581,849.01,151.414,605.956z M700.417,1037.37L162.63,499.583C208.232,300.142,386.734,151.339,600,151.339
+			c149.077,0,281.147,72.727,362.734,184.616l-62.12,54.812C834.433,295.859,724.478,233.746,600,233.746
+			c-158.485,0-293.447,100.668-344.46,241.545l469.17,469.17c113.938-41.26,201.566-137.44,230.914-256.56H761.152v-87.9h205.102
+			v-0.002h82.407V600C1048.661,813.266,899.859,991.768,700.417,1037.37z"/>
+	</g>
+</g>
+</svg>
diff --git a/src/icons/akaunting.svg b/src/icons/akaunting.svg
new file mode 100644
index 000000000..34315c61e
--- /dev/null
+++ b/src/icons/akaunting.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="1200px" height="1200px" viewBox="0 0 1200 1200" enable-background="new 0 0 1200 1200" xml:space="preserve">
+<g>
+	<path fill="#6DA252" d="M392.296,826.698c-58.699-53.798-96.443-130.089-99.567-215.22H100
+		c3.233,143.609,67.006,272.265,166.8,361.471L392.296,826.698z"/>
+	<path fill="#6DA252" d="M599.931,99.932c-271.909,0-493.127,217.018-499.91,487.29h192.76
+		c6.698-163.856,141.65-294.635,307.15-294.635c169.781,0,307.416,137.633,307.416,307.413
+		c0,114.208-62.285,213.877-154.735,266.879l90.696,170.066C996.438,951.471,1100,787.826,1100,600
+		C1100,323.821,876.108,99.932,599.931,99.932"/>
+	<path fill="#6DA252" d="M731.105,878.093c-39.785,18.799-84.254,29.321-131.175,29.321c-71.32,0-136.971-24.285-189.125-65.041
+		L285.267,988.674c85.932,69.656,195.424,111.395,314.664,111.395c79.704,0,155.051-18.656,221.918-51.822L731.105,878.093z"/>
+	<rect x="907.347" y="600" fill="#6DA252" width="192.653" height="500.068"/>
+</g>
+</svg>
diff --git a/src/icons/raychat.svg b/src/icons/raychat.svg
index a75491199..708303307 100644
--- a/src/icons/raychat.svg
+++ b/src/icons/raychat.svg
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="20.9386" y1="1.0265" x2="11.7312" y2="31.1426">
-	<stop  offset="0" style="stop-color:#D61395"/>
-	<stop  offset="0.2656" style="stop-color:#BB1089"/>
-	<stop  offset="0.8337" style="stop-color:#760769"/>
-	<stop  offset="0.9987" style="stop-color:#61045F"/>
-</linearGradient>
-<circle display="none" fill="url(#SVGID_1_)" cx="16.335" cy="16.085" r="15.742"/>
-<rect fill="#FFFFFF" width="32" height="32"/>
-<g>
-	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="21.3895" y1="2.3882" x2="8.5565" y2="28.6998">
-		<stop  offset="0" style="stop-color:#D61395"/>
-		<stop  offset="0.2656" style="stop-color:#BB1089"/>
-		<stop  offset="0.8337" style="stop-color:#760769"/>
-		<stop  offset="0.9987" style="stop-color:#61045F"/>
-	</linearGradient>
-	<path fill="url(#SVGID_2_)" d="M15.21,16.909c-0.414-0.414-0.414-1.085,0-1.499c0.414-0.414,1.085-0.414,1.499,0
-		c3.125,3.125,8.026,3.415,11.481,0.871c0.174-0.833,0.268-1.695,0.268-2.579c0-1.103-0.143-2.173-0.41-3.192
-		c-0.316,0.713-1.029,1.212-1.859,1.212c-1.123,0-2.033-0.91-2.033-2.033s0.91-2.033,2.033-2.033c0.289,0,0.563,0.061,0.812,0.169
-		c-2.111-3.988-6.3-6.706-11.126-6.706c-6.95,0-12.583,5.634-12.583,12.583c0,6.311,4.646,11.536,10.704,12.443l-1.168,2.624
-		c-0.647,2.232,0.714,3.06,2.542,1.546l8.895-7.176L24.2,23.133c1.217-1.075,2.221-2.383,2.95-3.852
-		C23.179,20.921,18.432,20.131,15.21,16.909z M18.318,7.654c1.123,0,2.033,0.91,2.033,2.033s-0.91,2.033-2.033,2.033
-		c-1.123,0-2.033-0.91-2.033-2.033S17.195,7.654,18.318,7.654z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="20.9386" y1="1.0265" x2="11.7312" y2="31.1426">
+	<stop  offset="0" style="stop-color:#D61395"/>
+	<stop  offset="0.2656" style="stop-color:#BB1089"/>
+	<stop  offset="0.8337" style="stop-color:#760769"/>
+	<stop  offset="0.9987" style="stop-color:#61045F"/>
+</linearGradient>
+<circle display="none" fill="url(#SVGID_1_)" cx="16.335" cy="16.085" r="15.742"/>
+<rect fill="#FFFFFF" width="32" height="32"/>
+<g>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="21.3895" y1="2.3882" x2="8.5565" y2="28.6998">
+		<stop  offset="0" style="stop-color:#D61395"/>
+		<stop  offset="0.2656" style="stop-color:#BB1089"/>
+		<stop  offset="0.8337" style="stop-color:#760769"/>
+		<stop  offset="0.9987" style="stop-color:#61045F"/>
+	</linearGradient>
+	<path fill="url(#SVGID_2_)" d="M15.21,16.909c-0.414-0.414-0.414-1.085,0-1.499c0.414-0.414,1.085-0.414,1.499,0
+		c3.125,3.125,8.026,3.415,11.481,0.871c0.174-0.833,0.268-1.695,0.268-2.579c0-1.103-0.143-2.173-0.41-3.192
+		c-0.316,0.713-1.029,1.212-1.859,1.212c-1.123,0-2.033-0.91-2.033-2.033s0.91-2.033,2.033-2.033c0.289,0,0.563,0.061,0.812,0.169
+		c-2.111-3.988-6.3-6.706-11.126-6.706c-6.95,0-12.583,5.634-12.583,12.583c0,6.311,4.646,11.536,10.704,12.443l-1.168,2.624
+		c-0.647,2.232,0.714,3.06,2.542,1.546l8.895-7.176L24.2,23.133c1.217-1.075,2.221-2.383,2.95-3.852
+		C23.179,20.921,18.432,20.131,15.21,16.909z M18.318,7.654c1.123,0,2.033,0.91,2.033,2.033s-0.91,2.033-2.033,2.033
+		c-1.123,0-2.033-0.91-2.033-2.033S17.195,7.654,18.318,7.654z"/>
+</g>
+</svg>
diff --git a/src/icons/xui.png b/src/icons/xui.png
deleted file mode 100644
index eb4ff5b39..000000000
Binary files a/src/icons/xui.png and /dev/null differ