diff --git a/src/apps.json b/src/apps.json
index d437e6aa0..5599b7291 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -1951,7 +1951,7 @@
 				"Server": "Darwin",
 				"X-Powered-By": "Darwin"
 			},
-			"icon": "Darwin.png",
+			"icon": "Apple.svg",
 			"website": "http://opensource.apple.com"
 		},
 		"DataLife Engine": {
@@ -2036,7 +2036,7 @@
 			"cats": [
 				"40"
 			],
-			"icon": "Dell.png",
+			"icon": "Dell.svg",
 			"website": "http://dell.com"
 		},
 		"Deployd": {
@@ -4718,7 +4718,7 @@
 			"headers": {
 				"Server": "^LiteSpeed$"
 			},
-			"icon": "LiteSpeed.png",
+			"icon": "LiteSpeed.svg",
 			"website": "http://litespeedtech.com"
 		},
 		"Lithium": {
@@ -5403,7 +5403,7 @@
 				"12"
 			],
 			"env": "^Modernizr$",
-			"icon": "Modernizr.png",
+			"icon": "Modernizr.svg",
 			"script": "modernizr(?:-([\\d.]*[\\d]))?.*\\.js\\;version:\\1",
 			"website": "http://www.modernizr.com"
 		},
@@ -6274,7 +6274,7 @@
 			],
 			"env": "^IsOwaPremiumBrowser$",
 			"html": "<link\\s[^>]*href=\"[^\"]*?([\\d.]+)/themes/resources/owafont\\.css\\;version:\\1",
-			"icon": "Outlook Web App.png",
+			"icon": "Outlook.svg",
 			"implies": "Microsoft ASP.NET",
 			"url": "/owa/auth/log(?:on|off)\\.aspx",
 			"website": "http://help.outlook.com"
@@ -6385,7 +6385,7 @@
 			],
 			"env": "^PAYPAL$",
 			"html": "<input[^>]+_s-xclick",
-			"icon": "PayPal.png",
+			"icon": "PayPal.svg",
 			"script": "paypalobjects\\.com/js",
 			"website": "http://paypal.com"
 		},
@@ -10166,7 +10166,7 @@
 			"cats": [
 				"47"
 			],
-			"icon": "git.png",
+			"icon": "git.svg",
 			"meta": {
 				"generator": "\bgit/([\\d.]+\\d)\\;version:\\1"
 			},
@@ -10188,7 +10188,7 @@
 				"47"
 			],
 			"html": "<!-- git web interface version ([\\d.]+)?\\;version:\\1",
-			"icon": "git.png",
+			"icon": "git.svg",
 			"implies": [
 				"Perl",
 				"git"
diff --git a/src/icons/Apple.svg b/src/icons/Apple.svg
new file mode 100644
index 000000000..2954f0f52
--- /dev/null
+++ b/src/icons/Apple.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.0" width="747.63776" height="909.28345" id="svg2811">
+  <defs id="defs2813">
+    <clipPath id="clp12">
+      <path d="M 45.315,71.927 L 58.235,71.927 L 58.235,87.794 L 45.315,87.794 L 45.315,71.927 z " id="path184"/>
+    </clipPath>
+    <clipPath id="clp21">
+      <path d="M 123.91,72.178 L 150.14,72.178 L 150.14,87.472 L 123.91,87.472 L 123.91,72.178 z " id="path592"/>
+    </clipPath>
+    <clipPath id="clp9">
+      <path d="M 413.96,49.857 L 445.72,49.857 L 445.72,58.576 L 413.96,58.576 L 413.96,49.857 z " id="path100"/>
+    </clipPath>
+  </defs>
+  <g transform="translate(-1074.235,-1639.219)" id="layer1">
+    <g transform="translate(19.48863,19.49672)" id="g25472">
+      <g transform="matrix(54.85033,0,0,-54.85033,-1411.313,6454.729)" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" clip-path="url(#clp12)" id="g186">
+        <path d="M 56.105,79.364 C 56.087,81.372 57.745,82.336 57.82,82.383 C 56.887,83.748 55.435,83.935 54.917,83.957 C 53.682,84.082 52.506,83.23 51.88,83.23 C 51.254,83.23 50.286,83.939 49.262,83.919 C 47.914,83.899 46.673,83.136 45.979,81.93 C 44.58,79.503 45.622,75.906 46.984,73.936 C 47.651,72.973 48.445,71.888 49.489,71.928 C 50.495,71.968 50.875,72.578 52.089,72.578 C 53.303,72.578 53.645,71.928 54.708,71.947 C 55.789,71.968 56.475,72.931 57.137,73.897 C 57.901,75.015 58.217,76.097 58.235,76.154 C 58.211,76.164 56.127,76.963 56.105,79.364" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" id="path188"/>
+      </g>
+      <path d="M 1556.5087,1778.2074 C 1586.8952,1741.403 1607.4089,1690.2272 1601.7588,1639.2187 C 1557.9852,1640.9758 1505.0032,1668.3995 1473.5732,1705.2039 C 1445.4359,1737.7314 1420.7536,1789.8374 1427.4422,1839.8074 C 1476.2605,1843.5921 1526.1172,1814.9577 1556.5087,1778.2074" style="fill:#b3b3b3;fill-rule:nonzero;stroke:none" id="path190"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/icons/Darwin.png b/src/icons/Darwin.png
deleted file mode 100644
index 65606bf25..000000000
Binary files a/src/icons/Darwin.png and /dev/null differ
diff --git a/src/icons/Dell.png b/src/icons/Dell.png
deleted file mode 100644
index 5803d6385..000000000
Binary files a/src/icons/Dell.png and /dev/null differ
diff --git a/src/icons/Dell.svg b/src/icons/Dell.svg
new file mode 100644
index 000000000..a6863301c
--- /dev/null
+++ b/src/icons/Dell.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg height="72" version="1.1" width="72" xmlns="http://www.w3.org/2000/svg">
+  <path d="m33.479 27.059-8.942 6.879c-0.917-3.44-3.899-5.963-7.568-5.963h-6.4199v15.822h6.4199c3.6688 0 6.8785-2.5234 7.5664-5.9629l8.9434 6.8789 8.9434-6.8789v5.9629h10.088v-3.2109h-6.6484v-12.611h-3.6699v5.9609l-8.4844 6.8809-1.835-1.606 4.129-3.211 4.3555-3.4395-2.5215-2.0625-8.4844 6.6484-1.834-1.6055 8.4844-6.4199-2.5234-2.0625zm-19.49 4.125h2.752c0.57325 0 1.1325 0.13072 1.6484 0.36719 0.51592 0.23647 0.9874 0.57983 1.3887 1.0098 0.40128 0.42994 0.73164 0.94498 0.96094 1.5254s0.35742 1.2262 0.35742 1.9141c0 0.63058-0.11479 1.2467-0.32617 1.8164-0.21139 0.56967-0.51931 1.0928-0.90625 1.5371-0.38694 0.44427-0.85223 0.81007-1.3789 1.0645-0.52667 0.25438-1.1136 0.39648-1.7441 0.39648h-2.752v-9.6309zm49.987 9.4031v3.2102h-10.089v-15.822h3.6688v12.611h6.4204zm-27.976-40.587c-19.72 0-36 16.28-36 36s16.051 36 36 36 36-16.051 36-36-16.28-36-36-36zm0 3.6699c2.2356-0.000025 4.4168 0.22437 6.5234 0.6543 2.1067 0.42993 4.1395 1.064 6.0742 1.8809 1.9347 0.81688 3.7725 1.8177 5.4922 2.9785s3.3214 2.4816 4.7832 3.9434 2.7825 3.0635 3.9434 4.7832c1.1608 1.7197 2.1616 3.5575 2.9785 5.4922 0.81688 1.9347 1.4509 3.9676 1.8809 6.0742 0.42994 2.1067 0.6543 4.2878 0.6543 6.5234s-0.22436 4.4168-0.6543 6.5234c-0.42994 2.1067-1.064 4.1395-1.8809 6.0742-0.81688 1.9347-1.8177 3.7725-2.9785 5.4922s-2.4816 3.3214-3.9434 4.7832-3.0635 2.7825-4.7832 3.9434c-1.7197 1.1608-3.5575 2.1616-5.4922 2.9785-1.9347 0.81688-3.9676 1.4509-6.0742 1.8809-2.1067 0.42994-4.2878 0.6543-6.5234 0.6543s-4.4168-0.22436-6.5234-0.6543c-2.107-0.427-4.14-1.061-6.075-1.878-1.934-0.817-3.772-1.818-5.492-2.979-1.72-1.16-3.321-2.481-4.783-3.943s-2.783-3.063-3.9434-4.783c-1.1608-1.72-2.1616-3.558-2.9785-5.492-0.8169-1.935-1.4509-3.968-1.8809-6.075-0.4299-2.106-0.6543-4.287-0.6543-6.523s0.2244-4.417 0.6543-6.523c0.4299-2.107 1.064-4.14 1.8809-6.075 0.8169-1.934 1.8177-3.772 2.9785-5.492 1.1604-1.72 2.4814-3.321 3.9434-4.783s3.063-2.783 4.783-3.9434c1.72-1.1608 3.558-2.1616 5.492-2.9785 1.935-0.8169 3.968-1.4509 6.075-1.8809 2.106-0.4299 4.287-0.6543 6.523-0.6543z" fill="#007db8" />
+</svg>
diff --git a/src/icons/LiteSpeed.png b/src/icons/LiteSpeed.png
deleted file mode 100644
index 33f30a8aa..000000000
Binary files a/src/icons/LiteSpeed.png and /dev/null differ
diff --git a/src/icons/LiteSpeed.svg b/src/icons/LiteSpeed.svg
new file mode 100644
index 000000000..7c841b8c1
--- /dev/null
+++ b/src/icons/LiteSpeed.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="60"
+   height="60"
+   viewBox="0 0 60 60"
+   enable-background="new 0 0 250 60"
+   xml:space="preserve"
+   sodipodi:docname="LiteSpeed.svg"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata55"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs53"><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath100"><use
+         x="0"
+         y="0"
+         xlink:href="#g96"
+         id="use102"
+         width="100%"
+         height="100%" /></clipPath></defs><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview51"
+     showgrid="false"
+     inkscape:zoom="6.024"
+     inkscape:cx="97.604592"
+     inkscape:cy="3.439575"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g48" /><g
+     id="g12"><path
+       d="m 52.013,22.19 -3.08,3.08 3.095,-3.093 c -0.004,0.002 -0.007,0.005 -0.015,0.013 z"
+       id="path10"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff" /></g><g
+     id="g16"><polygon
+       points="48.933,25.271 46.823,27.38 "
+       id="polygon14"
+       style="fill:#ffffff" /></g><g
+     id="g48"
+     transform="translate(-28)"><g
+       id="g98"
+       clip-path="url(#clipPath100)"><g
+         inkscape:label="Clip"
+         id="g96" /></g><g
+       id="g46"
+       transform="translate(31.623125)"><g
+         id="g24"><path
+           d="m 48.215,29.117 -13.277,-13.276 -5.656,7.178 6.099,6.098 c 0.562,0.563 0.562,1.483 0,2.045 l -1.765,1.765 c 0,0 1.189,1.779 1.244,1.888 0.274,0.55 0.34,1.841 -0.438,2.432 l -13.87,10.646 c -0.003,3.572 -0.007,10.92 -0.002,10.923 0.003,10e-4 27.665,-27.653 27.665,-27.653 0.563,-0.564 0.563,-1.482 0,-2.046 z"
+           id="path20"
+           inkscape:connector-curvature="0"
+           style="fill:#5e8cda" /><path
+           d="m 17.375,30.789 c -0.562,-0.562 -0.562,-1.479 0,-2.043 L 19.141,26.98 17.934,25.245 C 17.358,24.429 17.538,23.27 18.333,22.663 L 32.204,12.015 32.214,1.1 32.205,1.094 32.198,1.084 4.539,28.746 C 3.976,29.31 3.976,30.227 4.54,30.791 l 13.276,13.276 5.657,-7.181 z"
+           id="path22"
+           inkscape:connector-curvature="0"
+           style="fill:#093071" /></g><g
+         id="g28"><polygon
+           points="20.192,45.973 26.611,39.554 "
+           id="polygon26"
+           style="fill:#ffffff" /></g><g
+         id="g44"><g
+           id="g34"><g
+             id="g32"><path
+               d="m 39.195,7.751 c 0.185,0 0.371,0.117 0.453,0.282 0.146,0.302 -0.046,0.585 -0.239,0.828 L 27.254,24.289 c -0.175,0.224 -0.188,0.655 -0.028,0.888 0,0 6.561,9.514 6.787,9.84 0.249,0.359 0.266,1.422 -0.305,1.854 L 14.166,51.873 c -0.278,0.214 -0.436,0.283 -0.629,0.285 -0.175,-0.012 -0.356,-0.131 -0.431,-0.281 -0.146,-0.298 0.047,-0.587 0.238,-0.833 L 25.497,35.619 c 0.176,-0.232 0.191,-0.646 0.029,-0.888 l -6.783,-9.757 c -0.431,-0.612 -0.297,-1.481 0.299,-1.937 L 38.589,8.033 c 0.317,-0.247 0.478,-0.282 0.606,-0.282 m 0,-0.25 c -0.235,0 -0.455,0.096 -0.76,0.334 L 18.891,22.839 c -0.702,0.537 -0.859,1.558 -0.352,2.279 l 6.782,9.755 c 0.1,0.149 0.088,0.447 -0.023,0.594 L 13.147,50.89 c -0.16,0.206 -0.493,0.635 -0.266,1.098 0.114,0.23 0.376,0.402 0.639,0.42 0.306,-0.002 0.523,-0.125 0.798,-0.336 L 33.86,37.068 c 0.676,-0.512 0.678,-1.732 0.358,-2.194 -0.226,-0.326 -6.786,-9.84 -6.786,-9.84 -0.1,-0.144 -0.09,-0.453 0.019,-0.591 L 39.605,9.016 C 39.765,8.814 40.099,8.392 39.873,7.924 39.748,7.671 39.477,7.501 39.195,7.501 Z"
+               id="path30"
+               inkscape:connector-curvature="0"
+               style="fill:#5e8cda" /></g></g><g
+           id="g38"><path
+             d="m 33.517,35.054 c 0.158,0.239 0.299,1.14 -0.096,1.44 L 13.875,51.496 c -0.164,0.128 -0.27,0.188 -0.316,0.185 -0.067,0.004 -0.019,-0.115 0.161,-0.346 L 25.869,35.916 c 0.307,-0.396 0.327,-1.048 0.045,-1.455 l -6.781,-9.759 c 0,0 14.226,10.112 14.384,10.352 z"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#f5cd21" /></g><g
+           id="g42"><path
+             d="m 33.517,35.054 -6.679,-9.607 c -0.283,-0.408 -0.26,-1.061 0.044,-1.449 L 39.032,8.573 c 0.181,-0.23 0.228,-0.346 0.163,-0.346 -0.049,0 -0.156,0.057 -0.317,0.185 L 19.332,23.415 c -0.393,0.301 -0.484,0.883 -0.199,1.288 z"
+             id="path40"
+             inkscape:connector-curvature="0"
+             style="fill:#fddd75" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/icons/Modernizr.png b/src/icons/Modernizr.png
deleted file mode 100644
index 41a2b0db4..000000000
Binary files a/src/icons/Modernizr.png and /dev/null differ
diff --git a/src/icons/Modernizr.svg b/src/icons/Modernizr.svg
new file mode 100644
index 000000000..9253469fc
--- /dev/null
+++ b/src/icons/Modernizr.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   height="78.000298"
+   width="78.002998"
+   id="svg47"
+   version="1.1"
+   viewBox="0 0 78.002998 78.000298">
+  <metadata
+     id="metadata51">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Modernizr logo</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs15">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="23.969999"
+       x2="145.2"
+       y1="77.129997"
+       x1="92.040001"
+       id="a">
+      <stop
+         id="stop10"
+         stop-color="#d81e75"
+         offset="0" />
+      <stop
+         id="stop12"
+         stop-color="#ff5fa8"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <title
+     id="title17">Modernizr logo</title>
+  <g
+     transform="translate(0,-9.9997)"
+     id="g54">
+    <path
+       style="fill:#d81e75"
+       d="m 0,65.33705 v 19.53 a 3.15,3.15 0 0 0 3.26,3.13 h 71.61 a 3,3 0 0 0 3.13,-3.13 v -71.61 A 3.15,3.15 0 0 0 74.87,9.9970503 H 55.34 A 3.33,3.33 0 0 0 52,13.25705 v 19.53 a 3.15,3.15 0 0 1 -3.17,3.21 H 29.3 a 3.33,3.33 0 0 0 -3.3,3.3 v 19.53 a 3.15,3.15 0 0 1 -3.21,3.17 H 3.26 a 3.33,3.33 0 0 0 -3.26,3.34 z"
+       id="path21" />
+  </g>
+  <path
+     style="opacity:0.8;fill:#ff3388"
+     id="path23"
+     d="M 74.87,-0.00264973 H 55.34 A 3.33,3.33 0 0 0 52,3.2573503 V 22.78735 a 3.15,3.15 0 0 1 -3.17,3.21 H 29.3 a 3.33,3.33 0 0 0 -3.3,3.3 v 48.7 h 48.87 a 3,3 0 0 0 3.13,-3.13 V 3.2573503 a 3.15,3.15 0 0 0 -3.13,-3.26000003 z" />
+  <path
+     style="opacity:0.8;fill:#ff5fa8"
+     id="path25"
+     d="M 74.87,-0.00264973 H 55.34 A 3.33,3.33 0 0 0 52,3.2573503 V 77.99735 h 22.87 a 3,3 0 0 0 3.13,-3.13 V 3.2573503 a 3.15,3.15 0 0 0 -3.13,-3.26000003 z" />
+</svg>
diff --git a/src/icons/Outlook Web App.png b/src/icons/Outlook Web App.png
deleted file mode 100644
index e5aaa3250..000000000
Binary files a/src/icons/Outlook Web App.png and /dev/null differ
diff --git a/src/icons/Outlook.svg b/src/icons/Outlook.svg
new file mode 100644
index 000000000..197e79925
--- /dev/null
+++ b/src/icons/Outlook.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="110.03257" height="107.5" viewBox="0 0 88.026056 86" version="1.1" id="svg2" inkscape:version="0.48.3.1 r9886" sodipodi:docname="popwe.svg">
+  <metadata id="metadata126">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs124"/>
+  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1280" inkscape:window-height="960" id="namedview122" showgrid="false" inkscape:zoom="1.0905983" inkscape:cx="258.62288" inkscape:cy="53.75" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="svg2" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0"/>
+  <path d="m 46.01,0 5.98,0 c 0,6.67 0,13.33 0,20 10.36,0.02 20.71,-0.03 31.06,0 2.04,-0.1 4.83,0.49 4.79,3.06 0.38,12.65 0.01,25.33 0.18,37.99 0.04,2.24 -0.03,5.77 -3.08,5.8 -10.97,0.38 -21.97,0.03 -32.95,0.15 0,6.33 0,12.67 0,19 l -6.2,0 C 30.55,83.23 15.27,80.68 0.01,78 0,54.67 0,31.34 0,8.02 15.34,5.33 30.68,2.73 46.01,0 z" id="path18" inkscape:connector-curvature="0" style="fill:#0071c5"/>
+  <path d="m 51.99,23 c 11.08,0.01 22.15,-0.03 33.23,0.02 -0.19,1.31 -0.59,2.6 -1.69,3.42 C 76.91,32.61 70.33,38.81 63.73,45 59.76,41.41 55.9,37.7 51.99,34.05 c 0,-3.69 0,-7.37 0,-11.05 z" id="path64" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+  <path d="m 21.44,26.66 c 5.64,-2.13 12.23,0.86 14.62,6.31 3.26,7.5 2.8,17.76 -3.68,23.43 -5.97,5.11 -15.98,2.2 -18.7,-5.06 -3.58,-8.37 -1.84,-21.25 7.76,-24.68 z" id="path76" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+  <path d="m 66.87,45.89 c 6.01,-5.71 12.07,-11.38 18.11,-17.06 0.03,11.72 0,23.45 0.01,35.17 -11,0 -22,0 -33,0 0,-8.72 -0.01,-17.44 0.01,-26.15 3.73,3.3 7.07,7.06 11.03,10.07 1.63,0.3 2.73,-1.11 3.84,-2.03 z" id="path92" inkscape:connector-curvature="0" style="fill:#ffffff"/>
+  <path d="m 22.41,32.67 c 2.66,-1.27 5.99,0.02 7.24,2.65 2,3.96 1.99,8.79 0.68,12.97 -0.93,2.97 -4.18,5.42 -7.33,4.25 -3.93,-1.24 -5.12,-5.9 -5.16,-9.55 -0.05,-3.78 0.82,-8.49 4.57,-10.32 z" id="path96" inkscape:connector-curvature="0" style="fill:#0071c5"/>
+</svg>
\ No newline at end of file
diff --git a/src/icons/PayPal.png b/src/icons/PayPal.png
deleted file mode 100644
index d935d281b..000000000
Binary files a/src/icons/PayPal.png and /dev/null differ
diff --git a/src/icons/PayPal.svg b/src/icons/PayPal.svg
new file mode 100644
index 000000000..dd55b063d
--- /dev/null
+++ b/src/icons/PayPal.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg14712"
+   viewBox="-1.3557 -1.3557 41.005178 47.901399"
+   height="271"
+   width="232.146"
+   version="1.1">
+  <metadata
+     id="metadata21">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14714" />
+  <path
+     style="fill:#003087;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path14499"
+     d="M 32.60643,3.4075 C 30.51393,1.0225 26.73143,0 21.89268,0 H 7.84893 C 6.85893,0 6.01768,0.72 5.86268,1.69625 L 0.01518001,38.7825 c -0.11625,0.73125 0.45,1.39375 1.19124999,1.39375 h 8.67 l 2.1775,-13.81125 -0.0675,0.4325 c 0.155,-0.97625 0.99,-1.69625 1.97875,-1.69625 h 4.12 c 8.09375,0 14.43125,-3.2875 16.2825,-12.7975 0.055,-0.28125 0.1025,-0.555 0.14375,-0.8225 -0.23375,-0.12375 -0.23375,-0.12375 0,0 0.55125,-3.515 -0.004,-5.9075 -1.905,-8.07375" />
+  <path
+     style="fill:#003087;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path14527"
+     d="M 32.60643,3.4075 C 30.51393,1.0225 26.73143,0 21.89268,0 H 7.84893 C 6.85893,0 6.01768,0.72 5.86268,1.69625 L 0.01518001,38.7825 c -0.11625,0.73125 0.45,1.39375 1.19124999,1.39375 h 8.67 l 2.1775,-13.81125 -0.0675,0.4325 c 0.155,-0.97625 0.99,-1.69625 1.97875,-1.69625 h 4.12 c 8.09375,0 14.43125,-3.2875 16.2825,-12.7975 0.055,-0.28125 0.1025,-0.555 0.14375,-0.8225 -0.23375,-0.12375 -0.23375,-0.12375 0,0 0.55125,-3.515 -0.004,-5.9075 -1.905,-8.07375" />
+  <path
+     style="fill:#002f86;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path14531"
+     d="m 14.39418,11.52788 c 0.0925,-0.5875 0.47,-1.06875 0.9775,-1.3125 0.23125,-0.11 0.48875,-0.17125 0.75875,-0.17125 h 11.01 c 1.30375,0 2.52,0.085 3.63125,0.26375 0.31875,0.0512 0.6275,0.11 0.9275,0.1775 0.3,0.0662 0.59125,0.14125 0.87375,0.22375 0.14125,0.0412 0.28,0.0838 0.41625,0.12875 0.54625,0.1825 1.055,0.395 1.5225,0.64375 0.55125,-3.51625 -0.004,-5.9075 -1.905,-8.07375 -2.09375,-2.385 -5.875,-3.4075 -10.71375,-3.4075 h -14.045 c -0.98875,0 -1.83,0.72 -1.985,1.69625 l -5.84749999,37.085 c -0.11625,0.7325 0.45,1.39375 1.18999999,1.39375 h 8.67125 l 2.1775,-13.81125 z" />
+  <path
+     style="fill:#009cde;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path14535"
+     d="m 34.51168,11.48125 v 0 c -0.0425,0.26875 -0.0888,0.54125 -0.14375,0.8225 -1.85125,9.50875 -8.18875,12.7975 -16.2825,12.7975 h -4.12125 c -0.98875,0 -1.82375,0.72 -1.9775,1.69625 l -2.11,13.3775 -0.59875,3.795 c -0.10125,0.64 0.39375,1.22 1.04125,1.22 h 7.30875 c 0.865,0 1.60125,-0.63 1.73625,-1.48375 l 0.0713,-0.3725 1.3775,-8.73 0.0888,-0.4825 c 0.135,-0.85375 0.87125,-1.48375 1.73625,-1.48375 h 1.09375 c 7.08,0 12.62375,-2.87625 14.24375,-11.195 0.67625,-3.47625 0.32625,-6.37875 -1.4625,-8.4175 -0.5425,-0.6175 -1.21625,-1.1275 -2.00125,-1.54375" />
+  <path
+     style="fill:#012069;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path14539"
+     d="m 32.57331,10.70863 c -0.2825,-0.0825 -0.57375,-0.1575 -0.87375,-0.22375 -0.3,-0.0663 -0.61,-0.125 -0.9275,-0.17625 -1.1125,-0.18 -2.3275,-0.265 -3.6325,-0.265 H 16.13081 c -0.27125,0 -0.52875,0.0613 -0.75875,0.1725 -0.50875,0.24375 -0.885,0.72375 -0.9775,1.3125 l -2.34,14.83625 -0.0675,0.4325 c 0.15375,-0.97625 0.98875,-1.69625 1.9775,-1.69625 h 4.12125 c 8.09375,0 14.43125,-3.2875 16.2825,-12.7975 0.055,-0.28125 0.10125,-0.55375 0.14375,-0.8225 -0.46875,-0.2475 -0.97625,-0.46125 -1.5225,-0.6425 -0.13625,-0.045 -0.275,-0.0888 -0.41625,-0.13" />
+</svg>
diff --git a/src/icons/git.png b/src/icons/git.png
deleted file mode 100644
index 5ff1d2b09..000000000
Binary files a/src/icons/git.png and /dev/null differ
diff --git a/src/icons/git.svg b/src/icons/git.svg
new file mode 100644
index 000000000..6b4299798
--- /dev/null
+++ b/src/icons/git.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 122.52 122.52" height="122.52" width="122.52" xml:space="preserve" id="svg2" version="1.1"><metadata id="metadata8"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs id="defs6"/><g transform="matrix(1.3333333,0,0,-1.3333333,0,122.52)" id="g10"><g transform="scale(0.1)" id="g12"><path id="path14" style="fill:#f03c2e;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 901.543,500.352 500.352,901.527 c -23.094,23.11 -60.567,23.11 -83.692,0 L 333.359,818.211 439.031,712.535 c 24.563,8.293 52.727,2.727 72.297,-16.847 19.688,-19.696 25.203,-48.102 16.699,-72.75 L 629.883,521.094 c 24.648,8.496 53.066,3.004 72.754,-16.711 27.5,-27.492 27.5,-72.059 0,-99.574 -27.52,-27.516 -72.078,-27.516 -99.61,0 -20.683,20.703 -25.8,51.097 -15.312,76.582 l -95,94.992 V 326.414 c 6.699,-3.32 13.027,-7.742 18.613,-13.312 27.5,-27.497 27.5,-72.059 0,-99.598 -27.5,-27.488 -72.09,-27.488 -99.57,0 -27.5,27.539 -27.5,72.101 0,99.598 6.797,6.789 14.668,11.925 23.066,15.363 v 252.281 c -8.398,3.438 -16.25,8.531 -23.066,15.367 -20.828,20.821 -25.84,51.395 -15.156,76.977 L 292.422,777.285 17.3242,502.211 c -23.10545,-23.129 -23.10545,-60.602 0,-83.711 L 418.535,17.3242 c 23.098,-23.10545 60.559,-23.10545 83.692,0 L 901.543,416.641 c 23.113,23.113 23.113,60.605 0,83.711"/></g></g></svg>
\ No newline at end of file
diff --git a/src/icons/iWeb.png b/src/icons/iWeb.png
index 160b433ff..cc7ad0162 100644
Binary files a/src/icons/iWeb.png and b/src/icons/iWeb.png differ