diff --git a/img/add.png b/img/add.png
deleted file mode 100644
index ec775c74e..000000000
Binary files a/img/add.png and /dev/null differ
diff --git a/img/add.svg b/img/add.svg
new file mode 100644
index 000000000..e9159a2a5
--- /dev/null
+++ b/img/add.svg
@@ -0,0 +1,8 @@
+<?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="15.884px" height="15.883px" viewBox="0 0 15.884 15.883" enable-background="new 0 0 15.884 15.883" xml:space="preserve">
+<polygon fill="#FFFFFF" points="9.563,6.319 9.563,0 6.321,0 6.321,6.321 0,6.321 0,9.563 6.321,9.563 6.321,15.883 9.563,15.883 
+	9.563,9.563 15.884,9.563 15.884,6.319 "/>
+</svg>
diff --git a/img/avatar_mask.png b/img/avatar_mask.png
deleted file mode 100644
index 2527e3365..000000000
Binary files a/img/avatar_mask.png and /dev/null differ
diff --git a/img/avatar_mask.svg b/img/avatar_mask.svg
new file mode 100644
index 000000000..2fb24720e
--- /dev/null
+++ b/img/avatar_mask.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="244"
+   height="244"
+   id="svg2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3769">
+      <stop
+         id="stop3771"
+         style="stop-color:#ff4d4d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3773"
+         style="stop-color:#ff4d4d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="84.852814"
+       y1="163.69287"
+       x2="84.347733"
+       y2="208.64465"
+       id="linearGradient3775"
+       xlink:href="#linearGradient3769"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter3851">
+      <feGaussianBlur
+         id="feGaussianBlur3853"
+         result="result6"
+         stdDeviation="3"
+         in="SourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix3855"
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 "
+         result="result7"
+         in="SourceGraphic" />
+      <feComposite
+         in2="result7"
+         operator="in"
+         in="result6"
+         result="fbSourceGraphic"
+         id="feComposite3857" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix3859" />
+      <feGaussianBlur
+         id="feGaussianBlur3861"
+         result="result6"
+         stdDeviation="3"
+         in="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix3863"
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 "
+         result="result7"
+         in="fbSourceGraphic" />
+      <feComposite
+         in2="result7"
+         operator="in"
+         in="result6"
+         result="fbSourceGraphic"
+         id="feComposite3865" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix3867" />
+      <feGaussianBlur
+         id="feGaussianBlur3869"
+         result="result6"
+         stdDeviation="3"
+         in="fbSourceGraphic" />
+      <feColorMatrix
+         id="feColorMatrix3871"
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 "
+         result="result7"
+         in="fbSourceGraphic" />
+      <feComposite
+         in2="result7"
+         operator="in"
+         in="result6"
+         id="feComposite3873" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     transform="matrix(0.97644164,0,0,0.97644164,4.1582729,-786.52368)"
+     id="layer1">
+    <rect
+       width="230.81985"
+       height="230.81985"
+       ry="32.879269"
+       x="2.6929855"
+       y="808.15778"
+       transform="matrix(1.0255288,0,0,1.0437637,0.52050693,-34.357803)"
+       id="rect2985-3"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3851)" />
+  </g>
+</svg>
diff --git a/img/contact.png b/img/contact.png
deleted file mode 100644
index 3b4950144..000000000
Binary files a/img/contact.png and /dev/null differ
diff --git a/img/contact.svg b/img/contact.svg
new file mode 100644
index 000000000..724b06497
--- /dev/null
+++ b/img/contact.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.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"
+	 viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve">
+<g>
+	<path fill="#FFFFFF" d="M25.8,24.5C42,30.3,36.8,40,36.8,40H2.6c0,0-2.7-10.9,11.9-15.5C14.5,24.5,20.3,29.4,25.8,24.5z"/>
+	<path fill="#FFFFFF" d="M10.3,10.1c0,0,0.9,13.5,9.6,13.5c8.7,0,9.7-12.6,9.7-12.6S30,0,19.9,0C9.9,0,10.3,10.1,10.3,10.1z"/>
+</g>
+</svg>
diff --git a/img/contact_dark.png b/img/contact_dark.png
deleted file mode 100644
index a1c77479a..000000000
Binary files a/img/contact_dark.png and /dev/null differ
diff --git a/img/contact_dark.svg b/img/contact_dark.svg
new file mode 100644
index 000000000..428cd3390
--- /dev/null
+++ b/img/contact_dark.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.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"
+	 viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve">
+<g>
+	<path fill="#414141" d="M25.8,24.5C42,30.3,36.8,40,36.8,40H2.6c0,0-2.7-10.9,11.9-15.5C14.5,24.5,20.3,29.4,25.8,24.5z"/>
+	<path fill="#414141" d="M10.3,10.1c0,0,0.9,13.5,9.6,13.5c8.7,0,9.7-12.6,9.7-12.6S30,0,19.9,0C9.9,0,10.3,10.1,10.3,10.1z"/>
+</g>
+</svg>
diff --git a/img/group.png b/img/group.png
deleted file mode 100644
index 3afec19c0..000000000
Binary files a/img/group.png and /dev/null differ
diff --git a/img/group.svg b/img/group.svg
new file mode 100644
index 000000000..f1b06522c
--- /dev/null
+++ b/img/group.svg
@@ -0,0 +1,20 @@
+<?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="15.402px" height="15.918px" viewBox="0 0 15.402 15.918" enable-background="new 0 0 15.402 15.918" xml:space="preserve">
+<g>
+	<path fill="#FFFFFF" d="M9.429,11.411c4.71,1.681,3.195,4.507,3.195,4.507H2.666c0,0-0.773-3.161,3.465-4.507
+		C6.131,11.411,7.813,12.823,9.429,11.411z"/>
+	<path fill="#FFFFFF" d="M4.92,6.682c0,0,0.27,3.938,2.793,3.938s2.826-3.668,2.826-3.668s0.101-3.194-2.826-3.194
+		S4.92,6.682,4.92,6.682z"/>
+	<path fill="#FFFFFF" d="M3.359,7.276c-0.005-0.092-0.016-0.52,0.093-1.082c-0.521-0.1-0.841-0.336-0.841-0.336
+		c-3.15,1.045-2.569,3.23-2.569,3.23h3.651C3.428,8.178,3.368,7.413,3.361,7.313L3.359,7.276z"/>
+	<path fill="#FFFFFF" d="M12.1,7.522v0.041l-0.004,0.04c-0.035,0.427-0.127,0.944-0.29,1.485h3.554c0,0,0.583-2.186-2.567-3.23
+		c0,0-0.319,0.234-0.835,0.335C12.111,6.877,12.104,7.414,12.1,7.522z"/>
+	<path fill="#FFFFFF" d="M5.904,2.525C5.923,2.403,5.93,2.328,5.93,2.328S6.002,0,3.88,0S1.855,2.131,1.855,2.131
+		s0.18,2.606,1.781,2.85c0.176-0.513,0.461-1.063,0.922-1.545C4.859,3.121,5.297,2.774,5.904,2.525z"/>
+	<path fill="#FFFFFF" d="M11.758,4.99c1.664-0.17,1.869-2.662,1.869-2.662S13.699,0,11.576,0C9.455,0,9.553,2.131,9.553,2.131
+		s0.013,0.183,0.061,0.454c0.519,0.238,0.905,0.548,1.18,0.832C11.262,3.901,11.564,4.459,11.758,4.99z"/>
+</g>
+</svg>
diff --git a/img/group_2x.png b/img/group_2x.png
deleted file mode 100644
index eadc7487b..000000000
Binary files a/img/group_2x.png and /dev/null differ
diff --git a/img/group_button.png b/img/group_button.png
deleted file mode 100644
index 88aa77d35..000000000
Binary files a/img/group_button.png and /dev/null differ
diff --git a/img/group_dark.png b/img/group_dark.png
deleted file mode 100644
index b5875a234..000000000
Binary files a/img/group_dark.png and /dev/null differ
diff --git a/img/group_dark.svg b/img/group_dark.svg
new file mode 100644
index 000000000..0fa6c7ddc
--- /dev/null
+++ b/img/group_dark.svg
@@ -0,0 +1,20 @@
+<?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="15.402px" height="15.918px" viewBox="0 0 15.402 15.918" enable-background="new 0 0 15.402 15.918" xml:space="preserve">
+<g>
+	<path fill="#414141" d="M9.429,11.411c4.71,1.681,3.195,4.507,3.195,4.507H2.666c0,0-0.773-3.161,3.465-4.507
+		C6.131,11.411,7.813,12.823,9.429,11.411z"/>
+	<path fill="#414141" d="M4.92,6.682c0,0,0.27,3.938,2.793,3.938s2.826-3.668,2.826-3.668s0.101-3.194-2.826-3.194
+		S4.92,6.682,4.92,6.682z"/>
+	<path fill="#414141" d="M3.359,7.276c-0.005-0.092-0.016-0.52,0.093-1.082c-0.521-0.1-0.841-0.336-0.841-0.336
+		c-3.15,1.045-2.569,3.23-2.569,3.23h3.651C3.428,8.178,3.368,7.413,3.361,7.313L3.359,7.276z"/>
+	<path fill="#414141" d="M12.1,7.522v0.041l-0.004,0.04c-0.035,0.427-0.127,0.944-0.29,1.485h3.554c0,0,0.583-2.186-2.567-3.23
+		c0,0-0.319,0.234-0.835,0.335C12.111,6.877,12.104,7.414,12.1,7.522z"/>
+	<path fill="#414141" d="M5.904,2.525C5.923,2.403,5.93,2.328,5.93,2.328S6.002,0,3.88,0S1.855,2.131,1.855,2.131
+		s0.18,2.606,1.781,2.85c0.176-0.513,0.461-1.063,0.922-1.545C4.859,3.121,5.297,2.774,5.904,2.525z"/>
+	<path fill="#414141" d="M11.758,4.99c1.664-0.17,1.869-2.662,1.869-2.662S13.699,0,11.576,0C9.455,0,9.553,2.131,9.553,2.131
+		s0.013,0.183,0.061,0.454c0.519,0.238,0.905,0.548,1.18,0.832C11.262,3.901,11.564,4.459,11.758,4.99z"/>
+</g>
+</svg>
diff --git a/img/icon.png b/img/icon.png
deleted file mode 100644
index b9cbe71bf..000000000
Binary files a/img/icon.png and /dev/null differ
diff --git a/img/settings.png b/img/settings.png
deleted file mode 100644
index ed82f2886..000000000
Binary files a/img/settings.png and /dev/null differ
diff --git a/img/settings.svg b/img/settings.svg
new file mode 100644
index 000000000..fc0aba07d
--- /dev/null
+++ b/img/settings.svg
@@ -0,0 +1,19 @@
+<?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="15.615px" height="15.616px" viewBox="0 0 15.615 15.616" enable-background="new 0 0 15.615 15.616" xml:space="preserve">
+<path fill="#FFFFFF" d="M15.615,7.034c0-0.197-0.163-0.358-0.358-0.358h-0.66c-0.199,0-0.407-0.154-0.462-0.345l-0.896-2.092
+	c-0.095-0.171-0.064-0.425,0.075-0.567l0.446-0.445c0.14-0.14,0.14-0.367,0-0.507l-1.073-1.074c-0.139-0.14-0.367-0.14-0.51,0
+	L11.694,2.13c-0.142,0.142-0.399,0.18-0.574,0.09L9.3,1.49c-0.19-0.053-0.348-0.259-0.348-0.458V0.357C8.952,0.162,8.791,0,8.596,0
+	h-1.52C6.879,0,6.717,0.162,6.717,0.357v0.675c0,0.199-0.156,0.406-0.344,0.465L4.263,2.4c-0.17,0.099-0.422,0.066-0.563-0.072
+	L3.225,1.854c-0.138-0.139-0.367-0.139-0.506,0L1.645,2.929c-0.141,0.14-0.141,0.367,0,0.507l0.515,0.519
+	c0.143,0.14,0.181,0.396,0.089,0.57L1.531,6.33C1.478,6.521,1.272,6.676,1.073,6.676H0.357C0.16,6.676,0,6.837,0,7.034v1.519
+	c0,0.198,0.16,0.36,0.357,0.36h0.716c0.199,0,0.407,0.154,0.464,0.344l0.882,2.076c0.101,0.171,0.065,0.425-0.072,0.564L1.853,12.39
+	c-0.139,0.14-0.139,0.367,0,0.507l1.076,1.074c0.14,0.14,0.368,0.14,0.505,0l0.528-0.525c0.141-0.14,0.394-0.177,0.57-0.083
+	l1.841,0.734c0.188,0.055,0.344,0.262,0.344,0.458v0.702c0,0.198,0.162,0.359,0.359,0.359h1.52c0.195,0,0.356-0.161,0.356-0.359
+	v-0.702c0-0.196,0.156-0.403,0.348-0.461l2.059-0.874c0.172-0.097,0.422-0.063,0.564,0.075l0.465,0.468
+	c0.139,0.139,0.368,0.139,0.507,0l1.076-1.076c0.139-0.139,0.139-0.368,0-0.506l-0.497-0.495c-0.137-0.14-0.176-0.396-0.082-0.57
+	l0.746-1.857c0.052-0.19,0.26-0.345,0.459-0.347h0.66c0.195,0,0.358-0.161,0.358-0.358V7.034z M7.808,10.36
+	c-1.411,0-2.552-1.143-2.552-2.553s1.141-2.552,2.552-2.552c1.409,0,2.554,1.142,2.554,2.552S9.217,10.36,7.808,10.36z"/>
+</svg>
diff --git a/img/status/dot_away.png b/img/status/dot_away.png
deleted file mode 100644
index a4c75723e..000000000
Binary files a/img/status/dot_away.png and /dev/null differ
diff --git a/img/status/dot_away.svg b/img/status/dot_away.svg
new file mode 100644
index 000000000..241f9a318
--- /dev/null
+++ b/img/status/dot_away.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.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"
+	 viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#CDBE41" d="M5,1.5c1.9,0,3.5,1.6,3.5,3.5h-7C1.5,3.1,3.1,1.5,5,1.5 M5,0C2.2,0,0,2.2,0,5s2.2,5,5,5c2.8,0,5-2.2,5-5
+			S7.8,0,5,0z"/>
+	</g>
+</g>
+</svg>
diff --git a/img/status/dot_away_2x.png b/img/status/dot_away_2x.png
deleted file mode 100644
index c5e4d81c2..000000000
Binary files a/img/status/dot_away_2x.png and /dev/null differ
diff --git a/img/status/dot_away_notification.png b/img/status/dot_away_notification.png
deleted file mode 100644
index 2e62cb511..000000000
Binary files a/img/status/dot_away_notification.png and /dev/null differ
diff --git a/img/status/dot_away_notification.svg b/img/status/dot_away_notification.svg
new file mode 100644
index 000000000..640810a61
--- /dev/null
+++ b/img/status/dot_away_notification.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.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"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g>
+	<g>
+		<path fill="#CDBE41" d="M8,4.5c1.9,0,3.5,1.6,3.5,3.5h-7C4.5,6.1,6.1,4.5,8,4.5 M8,3C5.2,3,3,5.2,3,8s2.2,5,5,5c2.8,0,5-2.2,5-5
+			S10.8,3,8,3z"/>
+	</g>
+</g>
+<g>
+	<path fill="#CDBE41" d="M8,1.5c3.6,0,6.5,2.9,6.5,6.5s-2.9,6.5-6.5,6.5S1.5,11.6,1.5,8S4.4,1.5,8,1.5 M8,0C3.6,0,0,3.6,0,8
+		s3.6,8,8,8s8-3.6,8-8S12.4,0,8,0z"/>
+</g>
+</svg>
diff --git a/img/status/dot_busy.png b/img/status/dot_busy.png
deleted file mode 100644
index 7207a884c..000000000
Binary files a/img/status/dot_busy.png and /dev/null differ
diff --git a/img/status/dot_busy.svg b/img/status/dot_busy.svg
new file mode 100644
index 000000000..39f6919a3
--- /dev/null
+++ b/img/status/dot_busy.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.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"
+	 viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<path fill="#C94F50" d="M8.5,1.5c-2-2-5.1-2-7.1,0s-2,5.1,0,7.1s5.1,2,7.1,0S10.5,3.4,8.5,1.5z M2.5,2.5c1.2-1.2,3-1.3,4.4-0.5
+	L2.1,6.9C1.2,5.5,1.3,3.7,2.5,2.5z M3.1,7.9l4.8-4.8c0.9,1.4,0.7,3.2-0.5,4.4S4.5,8.8,3.1,7.9z"/>
+</svg>
diff --git a/img/status/dot_busy_2x.png b/img/status/dot_busy_2x.png
deleted file mode 100644
index a9aaf6ad3..000000000
Binary files a/img/status/dot_busy_2x.png and /dev/null differ
diff --git a/img/status/dot_busy_notification.png b/img/status/dot_busy_notification.png
deleted file mode 100644
index 7d57d0de3..000000000
Binary files a/img/status/dot_busy_notification.png and /dev/null differ
diff --git a/img/status/dot_busy_notification.svg b/img/status/dot_busy_notification.svg
new file mode 100644
index 000000000..f939423b7
--- /dev/null
+++ b/img/status/dot_busy_notification.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.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"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path fill="#C94F50" d="M11.5,4.5c-2-2-5.1-2-7.1,0s-2,5.1,0,7.1s5.1,2,7.1,0S13.5,6.4,11.5,4.5z M5.5,5.5c1.2-1.2,3-1.3,4.4-0.5
+	L5.1,9.9C4.2,8.5,4.3,6.7,5.5,5.5z M6.1,10.9l4.8-4.8c0.9,1.4,0.7,3.2-0.5,4.4S7.5,11.8,6.1,10.9z"/>
+<g>
+	<path fill="#C94F50" d="M8,1.5c3.6,0,6.5,2.9,6.5,6.5s-2.9,6.5-6.5,6.5S1.5,11.6,1.5,8S4.4,1.5,8,1.5 M8,0C3.6,0,0,3.6,0,8
+		s3.6,8,8,8s8-3.6,8-8S12.4,0,8,0z"/>
+</g>
+</svg>
diff --git a/img/status/dot_groupchat.png b/img/status/dot_groupchat.png
deleted file mode 100644
index 0b902dd8e..000000000
Binary files a/img/status/dot_groupchat.png and /dev/null differ
diff --git a/img/status/dot_groupchat.svg b/img/status/dot_groupchat.svg
new file mode 100644
index 000000000..6dd2cf6a1
--- /dev/null
+++ b/img/status/dot_groupchat.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.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"
+	 viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<circle fill="#82d5d5" cx="5" cy="5" r="5"/>
+</svg>
diff --git a/img/status/dot_groupchat_newmessages.png b/img/status/dot_groupchat_newmessages.png
deleted file mode 100644
index 65aa3d030..000000000
Binary files a/img/status/dot_groupchat_newmessages.png and /dev/null differ
diff --git a/img/status/dot_groupchat_newmessages.svg b/img/status/dot_groupchat_newmessages.svg
new file mode 100644
index 000000000..926540845
--- /dev/null
+++ b/img/status/dot_groupchat_newmessages.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.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"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<circle fill="#82d5d5" cx="8" cy="8" r="5"/>
+<g>
+	<path fill="#82d5d5" d="M8,1.5c3.6,0,6.5,2.9,6.5,6.5s-2.9,6.5-6.5,6.5S1.5,11.6,1.5,8S4.4,1.5,8,1.5 M8,0C3.6,0,0,3.6,0,8
+		s3.6,8,8,8s8-3.6,8-8S12.4,0,8,0z"/>
+</g>
+</svg>
diff --git a/img/status/dot_groupchat_notification.png b/img/status/dot_groupchat_notification.png
deleted file mode 100644
index 9bdc3dff3..000000000
Binary files a/img/status/dot_groupchat_notification.png and /dev/null differ
diff --git a/img/status/dot_groupchat_notification.svg b/img/status/dot_groupchat_notification.svg
new file mode 100644
index 000000000..762d324bc
--- /dev/null
+++ b/img/status/dot_groupchat_notification.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.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"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<circle fill="#82d5d5" cx="8" cy="8" r="5"/>
+<g>
+	<path fill="#e0dda3" d="M8,1.5c3.6,0,6.5,2.9,6.5,6.5s-2.9,6.5-6.5,6.5S1.5,11.6,1.5,8S4.4,1.5,8,1.5 M8,0C3.6,0,0,3.6,0,8
+		s3.6,8,8,8s8-3.6,8-8S12.4,0,8,0z"/>
+</g>
+</svg>
diff --git a/img/status/dot_idle.png b/img/status/dot_idle.png
deleted file mode 100644
index 1b38b4339..000000000
Binary files a/img/status/dot_idle.png and /dev/null differ
diff --git a/img/status/dot_idle_2x.png b/img/status/dot_idle_2x.png
deleted file mode 100644
index 0693bb21a..000000000
Binary files a/img/status/dot_idle_2x.png and /dev/null differ
diff --git a/img/status/dot_idle_notification.png b/img/status/dot_idle_notification.png
deleted file mode 100644
index 9ddf5623f..000000000
Binary files a/img/status/dot_idle_notification.png and /dev/null differ
diff --git a/img/status/dot_invisible.svg b/img/status/dot_invisible.svg
new file mode 100644
index 000000000..2bec7e773
--- /dev/null
+++ b/img/status/dot_invisible.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.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"
+	 viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<path fill="#FFFFFF" d="M5,0C2.2,0,0,2.2,0,5c0,2.8,2.2,5,5,5s5-2.2,5-5S7.8,0,5,0z M1.5,5c0-1.7,1.2-3.1,2.8-3.4v6.8
+	C2.7,8.1,1.5,6.7,1.5,5z M5.7,8.4V1.6C7.3,1.9,8.5,3.3,8.5,5S7.3,8.1,5.7,8.4z"/>
+</svg>
diff --git a/img/status/dot_offline.svg b/img/status/dot_offline.svg
new file mode 100644
index 000000000..7d17422f5
--- /dev/null
+++ b/img/status/dot_offline.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.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"
+	 viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<g>
+	<path fill="#C94F50" d="M5,1.5c1.9,0,3.5,1.6,3.5,3.5S6.9,8.5,5,8.5C3.1,8.5,1.5,6.9,1.5,5S3.1,1.5,5,1.5 M5,0C2.2,0,0,2.2,0,5
+		s2.2,5,5,5c2.8,0,5-2.2,5-5S7.8,0,5,0z"/>
+</g>
+</svg>
diff --git a/img/status/dot_offline_notification.svg b/img/status/dot_offline_notification.svg
new file mode 100644
index 000000000..24eb6cdd4
--- /dev/null
+++ b/img/status/dot_offline_notification.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.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"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<g>
+	<path fill="#C94F50" d="M8,4.5c1.9,0,3.5,1.6,3.5,3.5S9.9,11.5,8,11.5c-1.9,0-3.5-1.6-3.5-3.5S6.1,4.5,8,4.5 M8,3C5.2,3,3,5.2,3,8
+		s2.2,5,5,5c2.8,0,5-2.2,5-5S10.8,3,8,3z"/>
+</g>
+<g>
+	<path fill="#C94F50" d="M8,1.5c3.6,0,6.5,2.9,6.5,6.5s-2.9,6.5-6.5,6.5S1.5,11.6,1.5,8S4.4,1.5,8,1.5 M8,0C3.6,0,0,3.6,0,8
+		s3.6,8,8,8s8-3.6,8-8S12.4,0,8,0z"/>
+</g>
+</svg>
diff --git a/img/status/dot_online.png b/img/status/dot_online.png
deleted file mode 100644
index d96b35d4a..000000000
Binary files a/img/status/dot_online.png and /dev/null differ
diff --git a/img/status/dot_online.svg b/img/status/dot_online.svg
new file mode 100644
index 000000000..07d63fac6
--- /dev/null
+++ b/img/status/dot_online.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.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"
+	 viewBox="0 0 10 10" enable-background="new 0 0 10 10" xml:space="preserve">
+<circle fill="#6FC062" cx="5" cy="5" r="5"/>
+</svg>
diff --git a/img/status/dot_online_2x.png b/img/status/dot_online_2x.png
deleted file mode 100644
index 43f0dee2d..000000000
Binary files a/img/status/dot_online_2x.png and /dev/null differ
diff --git a/img/status/dot_online_notification.png b/img/status/dot_online_notification.png
deleted file mode 100644
index 2e213e43f..000000000
Binary files a/img/status/dot_online_notification.png and /dev/null differ
diff --git a/img/status/dot_online_notification.svg b/img/status/dot_online_notification.svg
new file mode 100644
index 000000000..9d1549817
--- /dev/null
+++ b/img/status/dot_online_notification.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.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"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<circle fill="#6FC062" cx="8" cy="8" r="5"/>
+<g>
+	<path fill="#6FC062" d="M8,1.5c3.6,0,6.5,2.9,6.5,6.5s-2.9,6.5-6.5,6.5S1.5,11.6,1.5,8S4.4,1.5,8,1.5 M8,0C3.6,0,0,3.6,0,8
+		s3.6,8,8,8s8-3.6,8-8S12.4,0,8,0z"/>
+</g>
+</svg>
diff --git a/img/taskbar/dark/taskbar_offline.svg b/img/taskbar/dark/taskbar_offline.svg
index c1c144149..a21dab3cc 100644
--- a/img/taskbar/dark/taskbar_offline.svg
+++ b/img/taskbar/dark/taskbar_offline.svg
@@ -1,22 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.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"
-	 viewBox="0 0 16.1 16" enable-background="new 0 0 16.1 16" xml:space="preserve">
-<path fill="#252325" d="M8,0C6.1,0,4.2,1.3,4.2,3.9v1.9h-1c-1.1,0-1.8,0.8-1.8,1.9v6.5c0,1.1,0.7,1.9,1.9,1.9l9.6,0
-	c1.1,0,1.9-0.8,1.9-1.9V7.6c0-1.1-0.8-1.9-1.9-1.9h-0.9l0-1.9C11.9,1.3,10,0,8,0z M8,1.6c1.3,0,2.2,1,2.2,2.2C10.3,5,9.8,6.2,8,6.9
-	c0.3-0.5,0.4-0.7,0.5-1.2C6.7,5.9,5.8,4.9,5.8,3.8S6.7,1.6,8,1.6z"/>
-<g>
-	<path fill="#C94F50" d="M8,7.7c-1.8,0-3.3,1.5-3.3,3.3c0,1.8,1.5,3.3,3.3,3.3c1.8,0,3.3-1.5,3.3-3.3C11.3,9.2,9.8,7.7,8,7.7z
-		 M8,13.4c-1.3,0-2.4-1.1-2.4-2.4c0-0.7,0.3-1.3,0.7-1.7c0,0,0,0,0,0c0,0,0,0,0.1-0.1c0,0,0,0,0,0c0,0,0,0,0.1-0.1c0,0,0,0,0,0
-		C6.6,9.1,6.7,9,6.8,8.9c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0
-		c0,0,0,0,0.1,0c0,0,0,0,0.1,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0
-		c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0l0,0l0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0
-		c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0.1,0,0.1,0c0,0,0,0,0,0
-		c0,0,0.1,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0.1,0
-		c0,0,0,0,0,0c0,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0.1,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0
-		c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0.1,0.1,0.2,0.1,0.2c0,0,0,0,0,0c0,0,0,0,0,0.1
-		c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0,0,0l0,0c0,0.2,0.1,0.4,0.1,0.6C10.4,12.3,9.3,13.4,8,13.4z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 16.1 16"
+   id="Layer_1"
+   xml:space="preserve"><metadata
+     id="metadata13"><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="defs11" /><path
+     d="M 8,0 C 6.1,0 4.2,1.3 4.2,3.9 v 1.9 h -1 C 2.1,5.8 1.4,6.6 1.4,7.7 v 6.5 c 0,1.1 0.7,1.9 1.9,1.9 l 9.6,0 c 1.1,0 1.9,-0.8 1.9,-1.9 V 7.6 C 14.8,6.5 14,5.7 12.9,5.7 H 12 L 12,3.8 C 11.9,1.3 10,0 8,0 z m 0,1.6 c 1.3,0 2.2,1 2.2,2.2 C 10.3,5 9.8,6.2 8,6.9 8.3,6.4 8.4,6.2 8.5,5.7 6.7,5.9 5.8,4.9 5.8,3.8 5.8,2.7 6.7,1.6 8,1.6 z"
+     id="path3"
+     style="fill:#252325" /><g
+     transform="translate(19.990072,1.0868021)"
+     id="g3027"><path
+       d="m -11.983551,6.6340045 c -1.815987,0 -3.28125,1.4652629 -3.28125,3.28125 0,1.8159875 1.465263,3.2812505 3.28125,3.2812505 1.815987,0 3.3124995,-1.465263 3.3124995,-3.2812505 0,-1.8159871 -1.4965125,-3.28125 -3.3124995,-3.28125 z m 0,0.90625 c 1.319867,0 2.4062495,1.0551331 2.4062495,2.375 0,1.3198675 -1.0863825,2.3750005 -2.4062495,2.3750005 -1.319867,0 -2.375,-1.055133 -2.375,-2.3750005 0,-1.3198669 1.055133,-2.375 2.375,-2.375 z"
+       id="path3000"
+       style="fill:#c94f50;fill-opacity:1" /></g></svg>
\ No newline at end of file
diff --git a/img/transfer.png b/img/transfer.png
deleted file mode 100644
index 13b4af62d..000000000
Binary files a/img/transfer.png and /dev/null differ
diff --git a/img/transfer.svg b/img/transfer.svg
new file mode 100644
index 000000000..12c60859e
--- /dev/null
+++ b/img/transfer.svg
@@ -0,0 +1,18 @@
+<?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="15.604px" height="15.604px" viewBox="0 0 15.604 15.604" enable-background="new 0 0 15.604 15.604" xml:space="preserve">
+<g>
+	<path fill="#FFFFFF" d="M6.303,15.588c-0.104-0.018-0.24-0.057-0.317-0.15s-0.149-0.301-0.119-0.604L6.482,8.78
+		c0.023-0.23,0.115-0.492,0.297-0.461c0.133,0.023,0.34,0.164,0.552,0.375l1.4,1.4l4.144-4.145c0.076-0.076,0.191-0.105,0.321-0.084
+		c0.131,0.023,0.263,0.096,0.37,0.203l1.828,1.828c0.223,0.223,0.277,0.533,0.117,0.691l-4.143,4.143l1.4,1.4
+		c0.293,0.293,0.387,0.508,0.377,0.602s-0.138,0.215-0.463,0.248l-6.055,0.615C6.513,15.608,6.402,15.606,6.303,15.588L6.303,15.588
+		z"/>
+	<path fill="#FFFFFF" d="M9.303,0.015c0.102,0.018,0.24,0.057,0.316,0.15C9.696,0.259,9.77,0.467,9.738,0.77L9.122,6.825
+		C9.1,7.055,9.006,7.315,8.825,7.284C8.691,7.26,8.484,7.122,8.273,6.911l-1.4-1.4L2.729,9.655C2.652,9.731,2.539,9.76,2.408,9.737
+		C2.277,9.715,2.146,9.645,2.037,9.536L0.209,7.708c-0.223-0.223-0.275-0.533-0.117-0.693l4.143-4.143l-1.4-1.4
+		c-0.292-0.291-0.385-0.505-0.375-0.6c0.01-0.094,0.137-0.215,0.462-0.247l6.056-0.617C9.092-0.005,9.201-0.002,9.303,0.015
+		L9.303,0.015z"/>
+</g>
+</svg>
diff --git a/res.qrc b/res.qrc
index 760e0e265..06bd0f8cb 100644
--- a/res.qrc
+++ b/res.qrc
@@ -8,35 +8,29 @@
     <qresource prefix="/">
         <file>audio/notification.pcm</file>
         <file>audio/ToxicIncomingCall.pcm</file>
-        <file>img/add.png</file>
-        <file>img/avatar_mask.png</file>
-        <file>img/contact.png</file>
-        <file>img/contact_dark.png</file>
-        <file>img/group.png</file>
-        <file>img/group_2x.png</file>
-        <file>img/group_button.png</file>
-        <file>img/group_dark.png</file>
-        <file>img/icon.png</file>
-        <file>img/settings.png</file>
+        <file>img/add.svg</file>
+        <file>img/avatar_mask.svg</file>
+        <file>img/contact.svg</file>
+        <file>img/contact_dark.svg</file>
+        <file>img/group.svg</file>
+        <file>img/group_dark.svg</file>
+        <file>img/icons/qtox.svg</file>
+        <file>img/settings.svg</file>
         <file>img/settings/av.png</file>
         <file>img/settings/general.png</file>
         <file>img/settings/identity.png</file>
         <file>img/settings/privacy.png</file>
-        <file>img/status/dot_away.png</file>
-        <file>img/status/dot_away_2x.png</file>
-        <file>img/status/dot_away_notification.png</file>
-        <file>img/status/dot_busy.png</file>
-        <file>img/status/dot_busy_2x.png</file>
-        <file>img/status/dot_busy_notification.png</file>
-        <file>img/status/dot_groupchat.png</file>
-        <file>img/status/dot_groupchat_newmessages.png</file>
-        <file>img/status/dot_groupchat_notification.png</file>
-        <file>img/status/dot_idle.png</file>
-        <file>img/status/dot_idle_2x.png</file>
-        <file>img/status/dot_idle_notification.png</file>
-        <file>img/status/dot_online.png</file>
-        <file>img/status/dot_online_2x.png</file>
-        <file>img/status/dot_online_notification.png</file>
+        <file>img/status/dot_away.svg</file>
+        <file>img/status/dot_away_notification.svg</file>
+        <file>img/status/dot_busy.svg</file>
+        <file>img/status/dot_busy_notification.svg</file>
+        <file>img/status/dot_groupchat.svg</file>
+        <file>img/status/dot_groupchat_newmessages.svg</file>
+        <file>img/status/dot_groupchat_notification.svg</file>
+        <file>img/status/dot_offline.svg</file>
+        <file>img/status/dot_offline_notification.svg</file>
+        <file>img/status/dot_online.svg</file>
+        <file>img/status/dot_online_notification.svg</file>
         <file>img/taskbar/dark/taskbar_online.svg</file>
         <file>img/taskbar/dark/taskbar_away.svg</file>
         <file>img/taskbar/dark/taskbar_busy.svg</file>
@@ -47,7 +41,7 @@
         <file>img/taskbar/light/taskbar_busy.svg</file>
         <file>img/taskbar/light/taskbar_offline.svg</file>
         <file>img/taskbar/light/taskbar_event.svg</file>
-        <file>img/transfer.png</file>
+        <file>img/transfer.svg</file>
         <file>translations/bg.qm</file>
         <file>translations/de.qm</file>
         <file>translations/es.qm</file>
@@ -66,45 +60,25 @@
         <file>translations/sv.qm</file>
         <file>translations/uk.qm</file>
         <file>translations/zh.qm</file>
-        <file>ui/acceptFileButton/default.png</file>
-        <file>ui/acceptFileButton/hover.png</file>
-        <file>ui/acceptFileButton/pressed.png</file>
-        <file>ui/acceptFileButton/style.css</file>
+        <file>ui/fileTransferWidget/fileDone.svg</file>
         <file>ui/callButton/callButton.css</file>
-        <file>ui/callButton/callButton.png</file>
-        <file>ui/callButton/callButtonDisabled.png</file>
-        <file>ui/callButton/callButtonHover.png</file>
-        <file>ui/callButton/callButtonPressed.png</file>
-        <file>ui/callButton/callButtonRed.png</file>
-        <file>ui/callButton/callButtonRedHover.png</file>
-        <file>ui/callButton/callButtonRedPressed.png</file>
-        <file>ui/callButton/callButtonYellow.png</file>
-        <file>ui/callButton/callButtonYellowHover.png</file>
-        <file>ui/callButton/callButtonYellowPressed.png</file>
+        <file>ui/callButton/callButton.svg</file>
         <file>ui/chatArea/chatArea.css</file>
         <file>ui/chatArea/chatHead.css</file>
         <file>ui/chatArea/innerStyle.css</file>
-        <file>ui/chatArea/scrollBarDownArrow.png</file>
-        <file>ui/chatArea/scrollBarDownArrowHover.png</file>
-        <file>ui/chatArea/scrollBarDownArrowPressed.png</file>
-        <file>ui/chatArea/scrollBarHandle.png</file>
-        <file>ui/chatArea/scrollBarUpArrow.png</file>
-        <file>ui/chatArea/scrollBarUpArrowHover.png</file>
-        <file>ui/chatArea/scrollBarUpArrowPressed.png</file>
+        <file>ui/chatArea/scrollBarUpArrow.svg</file>
+        <file>ui/chatArea/scrollBarDownArrow.svg</file>
+        <file>ui/chatArea/scrollBarLeftArrow.svg</file>
+        <file>ui/chatArea/scrollBarRightArrow.svg</file>
         <file>ui/chatroomWidgets/genericChatroomWidget.css</file>
         <file>ui/emoteButton/emoteButton.css</file>
-        <file>ui/emoteButton/emoteButton.png</file>
-        <file>ui/emoteButton/emoteButtonHover.png</file>
-        <file>ui/emoteButton/emoteButtonPressed.png</file>
-        <file>ui/emoticonWidget/dot_page.png</file>
-        <file>ui/emoticonWidget/dot_page_current.png</file>
-        <file>ui/emoticonWidget/dot_page_hover.png</file>
+        <file>ui/emoteButton/emoteButton.svg</file>
+        <file>ui/emoticonWidget/dot_page.svg</file>
+        <file>ui/emoticonWidget/dot_page_current.svg</file>
+        <file>ui/emoticonWidget/dot_page_hover.svg</file>
         <file>ui/emoticonWidget/emoticonWidget.css</file>
         <file>ui/fileButton/fileButton.css</file>
-        <file>ui/fileButton/fileButton.png</file>
-        <file>ui/fileButton/fileButtonHover.png</file>
-        <file>ui/fileButton/fileButtonPressed.png</file>
-        <file>ui/fileButton/fileButtonDisabled.png</file>
+        <file>ui/fileButton/fileButton.svg</file>
         <file>ui/fileTransferWidget/fileTransferWidget.css</file>
         <file>ui/friendList/friendList.css</file>
         <file>ui/micButton/micButton.css</file>
@@ -113,38 +87,18 @@
         <file>ui/micButton/micButtonHover.png</file>
         <file>ui/micButton/micButtonPressed.png</file>
         <file>ui/msgEdit/msgEdit.css</file>
-        <file>ui/pauseFileButton/default.png</file>
-        <file>ui/pauseFileButton/hover.png</file>
-        <file>ui/pauseFileButton/pressed.png</file>
-        <file>ui/pauseFileButton/style.css</file>
         <file>ui/sendButton/sendButton.css</file>
-        <file>ui/sendButton/sendButton.png</file>
-        <file>ui/sendButton/sendButtonHover.png</file>
-        <file>ui/sendButton/sendButtonPressed.png</file>
+        <file>ui/sendButton/sendButton.svg</file>
         <file>ui/settings/mainContent.css</file>
         <file>ui/settings/mainHead.css</file>
-        <file>ui/statusButton/menu_indicator.png</file>
         <file>ui/statusButton/statusButton.css</file>
-        <file>ui/stopFileButton/default.png</file>
-        <file>ui/stopFileButton/hover.png</file>
-        <file>ui/stopFileButton/pressed.png</file>
-        <file>ui/stopFileButton/style.css</file>
+        <file>ui/statusButton/menu_indicator.svg</file>
         <file>ui/videoButton/videoButton.css</file>
-        <file>ui/videoButton/videoButton.png</file>
-        <file>ui/videoButton/videoButtonDisabled.png</file>
-        <file>ui/videoButton/videoButtonHover.png</file>
-        <file>ui/videoButton/videoButtonPressed.png</file>
-        <file>ui/videoButton/videoButtonRed.png</file>
-        <file>ui/videoButton/videoButtonRedHover.png</file>
-        <file>ui/videoButton/videoButtonRedPressed.png</file>
-        <file>ui/videoButton/videoButtonYellow.png</file>
-        <file>ui/videoButton/videoButtonYellowHover.png</file>
-        <file>ui/videoButton/videoButtonYellowPressed.png</file>
+        <file>ui/videoButton/videoButton.svg</file>
         <file>ui/volButton/volButton.png</file>
         <file>ui/volButton/volButtonHover.png</file>
         <file>ui/volButton/volButtonPressed.png</file>
         <file>ui/volButton/volButton.css</file>
-        <file>ui/window/applicationIcon.png</file>
         <file>ui/window/statusPanel.css</file>
         <file>ui/window/window.css</file>
         <file>ui/chatArea/info.svg</file>
@@ -158,8 +112,8 @@
         <file>ui/fileTransferInstance/arrow_white.svg</file>
         <file>ui/fileTransferInstance/browse.svg</file>
         <file>ui/fileTransferInstance/filetransferWidget.css</file>
-        <file>ui/acceptCall/acceptCall.png</file>
-        <file>ui/rejectCall/rejectCall.png</file>
+        <file>ui/acceptCall/acceptCall.svg</file>
+        <file>ui/rejectCall/rejectCall.svg</file>
         <file>ui/volButton/volButtonDisabled.png</file>
     </qresource>
 </RCC>
diff --git a/src/core.cpp b/src/core.cpp
index 38726c44a..b15e38d25 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -1307,7 +1307,7 @@ void Core::switchConfiguration(const QString& profile)
     toxTimer->stop();
     deadifyTox();
 
-    emit selfAvatarChanged(QPixmap(":/img/contact_dark.png"));
+    emit selfAvatarChanged(QPixmap(":/img/contact_dark.svg"));
     emit blockingClearContacts(); // we need this to block, but signals are required for thread safety
 
     if (profile.isEmpty())
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index b7a79f566..daa685c5d 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -21,7 +21,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="../res.qrc">
-    <normaloff>:/img/icon.png</normaloff>:/img/icon.png</iconset>
+    <normaloff>:/img/icons/qtox.svg</normaloff>:/img/icons/qtox.svg</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -983,10 +983,6 @@ QSplitter:handle{
                <property name="text">
                 <string/>
                </property>
-               <property name="icon">
-                <iconset resource="../res.qrc">
-                 <normaloff>:/img/status/dot_away_2x.png</normaloff>:/img/status/dot_away_2x.png</iconset>
-               </property>
                <property name="iconSize">
                 <size>
                  <width>10</width>
@@ -1109,7 +1105,13 @@ QSplitter:handle{
              </property>
              <property name="icon">
               <iconset resource="../res.qrc">
-               <normaloff>:/img/add.png</normaloff>:/img/add.png</iconset>
+               <normaloff>:/img/add.svg</normaloff>:/img/add.svg</iconset>
+             </property>
+             <property name="iconSize">
+              <size>
+               <width>15</width>
+               <height>15</height>
+              </size>
              </property>
              <property name="checkable">
               <bool>false</bool>
@@ -1144,7 +1146,13 @@ QSplitter:handle{
              </property>
              <property name="icon">
               <iconset resource="../res.qrc">
-               <normaloff>:/img/group_button.png</normaloff>:/img/group_button.png</iconset>
+               <normaloff>:/img/group.svg</normaloff>:/img/group.svg</iconset>
+             </property>
+             <property name="iconSize">
+              <size>
+               <width>15</width>
+               <height>15</height>
+              </size>
              </property>
              <property name="flat">
               <bool>true</bool>
@@ -1176,7 +1184,13 @@ QSplitter:handle{
              </property>
              <property name="icon">
               <iconset resource="../res.qrc">
-               <normaloff>:/img/transfer.png</normaloff>:/img/transfer.png</iconset>
+               <normaloff>:/img/transfer.svg</normaloff>:/img/transfer.svg</iconset>
+             </property>
+             <property name="iconSize">
+              <size>
+               <width>15</width>
+               <height>15</height>
+              </size>
              </property>
              <property name="flat">
               <bool>true</bool>
@@ -1208,7 +1222,13 @@ QSplitter:handle{
              </property>
              <property name="icon">
               <iconset resource="../res.qrc">
-               <normaloff>:/img/settings.png</normaloff>:/img/settings.png</iconset>
+               <normaloff>:/img/settings.svg</normaloff>:/img/settings.svg</iconset>
+             </property>
+             <property name="iconSize">
+              <size>
+               <width>15</width>
+               <height>15</height>
+              </size>
              </property>
              <property name="flat">
               <bool>true</bool>
diff --git a/src/misc/style.cpp b/src/misc/style.cpp
index ea1318fd7..4a03148cf 100644
--- a/src/misc/style.cpp
+++ b/src/misc/style.cpp
@@ -25,6 +25,8 @@
 #include <QWidget>
 #include <QStyle>
 #include <QFontInfo>
+#include <QSvgRenderer>
+#include <QPainter>
 
 // helper functions
 QFont appFont(int pixelSize, int weight)
@@ -201,3 +203,13 @@ void Style::applyTheme()
 {
     GUI::reloadTheme();
 }
+
+QPixmap Style::scaleSvgImage(const QString& path, uint32_t width, uint32_t height)
+{
+    QSvgRenderer render(path);
+    QPixmap pixmap(width, height);
+    pixmap.fill(QColor(0, 0, 0, 0));
+    QPainter painter(&pixmap);
+    render.render(&painter, pixmap.rect());
+    return pixmap;
+}
diff --git a/src/misc/style.h b/src/misc/style.h
index 87412387c..984927645 100644
--- a/src/misc/style.h
+++ b/src/misc/style.h
@@ -63,6 +63,7 @@ public:
     static void setThemeColor(int color);
     static void setThemeColor(QColor color); ///< Pass an invalid QColor to reset to defaults
     static void applyTheme(); ///< Reloads some CCS
+    static QPixmap scaleSvgImage(const QString& path, uint32_t width, uint32_t height);
 
     static QStringList themeColorNames;
     static QList<QColor> themeColorColors;
diff --git a/src/widget/callconfirmwidget.cpp b/src/widget/callconfirmwidget.cpp
index 5de8855f3..73d312f35 100644
--- a/src/widget/callconfirmwidget.cpp
+++ b/src/widget/callconfirmwidget.cpp
@@ -34,8 +34,8 @@ CallConfirmWidget::CallConfirmWidget(const QWidget *Anchor) :
     reject->setFlat(true);
     accept->setStyleSheet("QPushButton{border:none;}");
     reject->setStyleSheet("QPushButton{border:none;}");
-    accept->setIcon(QIcon(":/ui/acceptCall/acceptCall.png"));
-    reject->setIcon(QIcon(":/ui/rejectCall/rejectCall.png"));
+    accept->setIcon(QIcon(":/ui/acceptCall/acceptCall.svg"));
+    reject->setIcon(QIcon(":/ui/rejectCall/rejectCall.svg"));
     accept->setIconSize(accept->size());
     reject->setIconSize(reject->size());
 
diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
index 7a74391e5..14388f735 100644
--- a/src/widget/form/chatform.cpp
+++ b/src/widget/form/chatform.cpp
@@ -51,7 +51,7 @@ ChatForm::ChatForm(Friend* chatFriend)
 {
     nameLabel->setText(f->getDisplayedName());
 
-    avatar->setPixmap(QPixmap(":/img/contact_dark.png"), Qt::transparent);
+    avatar->setPixmap(QPixmap(":/img/contact_dark.svg"), Qt::transparent);
 
     statusMessageLabel = new CroppingLabel();
     statusMessageLabel->setObjectName("statusLabel");
@@ -792,7 +792,7 @@ void ChatForm::onAvatarRemoved(int FriendId)
     if (FriendId != f->getFriendID())
         return;
 
-    avatar->setPixmap(QPixmap(":/img/contact_dark.png"), Qt::transparent);
+    avatar->setPixmap(QPixmap(":/img/contact_dark.svg"), Qt::transparent);
 }
 
 void ChatForm::loadHistory(QDateTime since, bool processUndelivered)
diff --git a/src/widget/form/filesform.cpp b/src/widget/form/filesform.cpp
index 5a108fcf6..b1c875ee9 100644
--- a/src/widget/form/filesform.cpp
+++ b/src/widget/form/filesform.cpp
@@ -20,6 +20,7 @@
 #include <QFileInfo>
 #include <QUrl>
 #include <QDebug>
+#include <QPainter>
 
 FilesForm::FilesForm()
     : QObject()
@@ -60,14 +61,14 @@ void FilesForm::show(Ui::MainWindow& ui)
 
 void FilesForm::onFileDownloadComplete(const QString& path)
 {
-    ListWidgetItem* tmp = new ListWidgetItem(QIcon(":/ui/acceptFileButton/default.png"), QFileInfo(path).fileName());
+    ListWidgetItem* tmp = new ListWidgetItem(QIcon(":/ui/fileTransferWidget/fileDone.svg"), QFileInfo(path).fileName());
     tmp->path = path;
     recvd->addItem(tmp);
 }
 
 void FilesForm::onFileUploadComplete(const QString& path)
 {
-    ListWidgetItem* tmp = new ListWidgetItem(QIcon(":/ui/acceptFileButton/default.png"), QFileInfo(path).fileName());
+    ListWidgetItem* tmp = new ListWidgetItem(QIcon(":/ui/fileTransferWidget/fileDone.svg"), QFileInfo(path).fileName());
     tmp->path = path;
     sent->addItem(tmp);
 }
diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp
index 387335693..760c028e4 100644
--- a/src/widget/form/genericchatform.cpp
+++ b/src/widget/form/genericchatform.cpp
@@ -51,7 +51,7 @@ GenericChatForm::GenericChatForm(QWidget *parent)
     nameLabel->setEditable(true);
     nameLabel->setTextFormat(Qt::PlainText);   
 
-    avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
+    avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.svg");
     QHBoxLayout *mainFootLayout = new QHBoxLayout(),
                 *headLayout = new QHBoxLayout();
     
diff --git a/src/widget/form/groupchatform.cpp b/src/widget/form/groupchatform.cpp
index 32bed5cc5..503fe3064 100644
--- a/src/widget/form/groupchatform.cpp
+++ b/src/widget/form/groupchatform.cpp
@@ -57,7 +57,7 @@ GroupChatForm::GroupChatForm(Group* chatGroup)
     nusersLabel->setText(GroupChatForm::tr("%1 users in chat","Number of users in chat").arg(group->getPeersCount()));
     nusersLabel->setObjectName("statusLabel");
 
-    avatar->setPixmap(QPixmap(":/img/group_dark.png"), Qt::transparent);
+    avatar->setPixmap(Style::scaleSvgImage(":/img/group_dark.svg", avatar->width(), avatar->height()), Qt::transparent);
 
     msgEdit->setObjectName("group");
 
diff --git a/src/widget/form/profileform.cpp b/src/widget/form/profileform.cpp
index 5bf2d4d7d..1d5048f1d 100644
--- a/src/widget/form/profileform.cpp
+++ b/src/widget/form/profileform.cpp
@@ -79,7 +79,7 @@ ProfileForm::ProfileForm(QWidget *parent) :
     
     bodyUI->toxGroup->layout()->addWidget(toxId);
 
-    profilePicture = new MaskablePixmapWidget(this, QSize(64, 64), ":/img/avatar_mask.png");
+    profilePicture = new MaskablePixmapWidget(this, QSize(64, 64), ":/img/avatar_mask.svg");
     profilePicture->setPixmap(QPixmap(":/img/contact_dark.png"));
     profilePicture->setClickable(true);
     connect(profilePicture, SIGNAL(clicked()), this, SLOT(onAvatarClicked()));
diff --git a/src/widget/friendwidget.cpp b/src/widget/friendwidget.cpp
index 4883f6cc4..9717273c4 100644
--- a/src/widget/friendwidget.cpp
+++ b/src/widget/friendwidget.cpp
@@ -42,8 +42,8 @@ FriendWidget::FriendWidget(int FriendId, QString id)
     , isDefaultAvatar{true}
     , historyLoaded{false}
 {
-    avatar->setPixmap(QPixmap(":img/contact.png"), Qt::transparent);
-    statusPic.setPixmap(QPixmap(":img/status/dot_away.png"));
+    avatar->setPixmap(QPixmap(":img/contact.svg"), Qt::transparent);
+    statusPic.setPixmap(QPixmap(":img/status/dot_offline.svg"));
     nameLabel->setText(id);
     nameLabel->setTextFormat(Qt::PlainText);
     statusMessageLabel->setTextFormat(Qt::PlainText);
@@ -128,7 +128,7 @@ void FriendWidget::setAsActiveChatroom()
     setActive(true);
 
     if (isDefaultAvatar)
-        avatar->setPixmap(QPixmap(":img/contact_dark.png"), Qt::transparent);
+        avatar->setPixmap(QPixmap(":img/contact_dark.svg"), Qt::transparent);
 
     if(!historyLoaded)
     {
@@ -146,7 +146,7 @@ void FriendWidget::setAsInactiveChatroom()
     setActive(false);
 
     if (isDefaultAvatar)
-        avatar->setPixmap(QPixmap(":img/contact.png"), Qt::transparent);
+        avatar->setPixmap(QPixmap(":img/contact.svg"), Qt::transparent);
 }
 
 void FriendWidget::updateStatusLight()
@@ -155,21 +155,21 @@ void FriendWidget::updateStatusLight()
     Status status = f->getStatus();
 
     if (status == Status::Online && f->getEventFlag() == 0)
-        statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
+        statusPic.setPixmap(QPixmap(":img/status/dot_online.svg"));
     else if (status == Status::Online && f->getEventFlag() == 1)
-        statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png"));
+        statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.svg"));
     else if (status == Status::Away && f->getEventFlag() == 0)
-        statusPic.setPixmap(QPixmap(":img/status/dot_idle.png"));
+        statusPic.setPixmap(QPixmap(":img/status/dot_away.svg"));
     else if (status == Status::Away && f->getEventFlag() == 1)
-        statusPic.setPixmap(QPixmap(":img/status/dot_idle_notification.png"));
+        statusPic.setPixmap(QPixmap(":img/status/dot_away_notification.svg"));
     else if (status == Status::Busy && f->getEventFlag() == 0)
-        statusPic.setPixmap(QPixmap(":img/status/dot_busy.png"));
+        statusPic.setPixmap(QPixmap(":img/status/dot_busy.svg"));
     else if (status == Status::Busy && f->getEventFlag() == 1)
-        statusPic.setPixmap(QPixmap(":img/status/dot_busy_notification.png"));
+        statusPic.setPixmap(QPixmap(":img/status/dot_busy_notification.svg"));
     else if (status == Status::Offline && f->getEventFlag() == 0)
-        statusPic.setPixmap(QPixmap(":img/status/dot_away.png"));
+        statusPic.setPixmap(QPixmap(":img/status/dot_offline.svg"));
     else if (status == Status::Offline && f->getEventFlag() == 1)
-        statusPic.setPixmap(QPixmap(":img/status/dot_away_notification.png"));
+        statusPic.setPixmap(QPixmap(":img/status/dot_offline_notification.svg"));
 }
 
 void FriendWidget::setChatForm(Ui::MainWindow &ui)
@@ -202,9 +202,9 @@ void FriendWidget::onAvatarRemoved(int FriendId)
     isDefaultAvatar = true;
 
     if (isActive())
-        avatar->setPixmap(QPixmap(":img/contact_dark.png"), Qt::transparent);
+        avatar->setPixmap(QPixmap(":img/contact_dark.svg"), Qt::transparent);
     else
-        avatar->setPixmap(QPixmap(":img/contact.png"), Qt::transparent);
+        avatar->setPixmap(QPixmap(":img/contact.svg"), Qt::transparent);
 }
 
 void FriendWidget::mousePressEvent(QMouseEvent *ev)
diff --git a/src/widget/genericchatroomwidget.cpp b/src/widget/genericchatroomwidget.cpp
index 84def4083..1b394234f 100644
--- a/src/widget/genericchatroomwidget.cpp
+++ b/src/widget/genericchatroomwidget.cpp
@@ -30,11 +30,11 @@ GenericChatroomWidget::GenericChatroomWidget(QWidget *parent)
     // avatar
     if (property("compact").toBool())
     {
-        avatar = new MaskablePixmapWidget(this, QSize(20,20), ":/img/avatar_mask.png");
+        avatar = new MaskablePixmapWidget(this, QSize(20,20), ":/img/avatar_mask.svg");
     }
     else
     {
-        avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.png");
+        avatar = new MaskablePixmapWidget(this, QSize(40,40), ":/img/avatar_mask.svg");
     }
 
     // status text
diff --git a/src/widget/groupwidget.cpp b/src/widget/groupwidget.cpp
index b180fc3c0..95d288d6d 100644
--- a/src/widget/groupwidget.cpp
+++ b/src/widget/groupwidget.cpp
@@ -31,11 +31,12 @@
 
 #include "ui_mainwindow.h"
 
+
 GroupWidget::GroupWidget(int GroupId, QString Name)
     : groupId{GroupId}
 {
-    avatar->setPixmap(QPixmap(":img/group.png"), Qt::transparent);
-    statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
+    avatar->setPixmap(Style::scaleSvgImage(":img/group.svg", avatar->width(), avatar->height()), Qt::transparent);
+    statusPic.setPixmap(QPixmap(":img/status/dot_online.svg"));
     nameLabel->setText(Name);
 
     Group* g = GroupList::findGroup(groupId);
@@ -86,13 +87,13 @@ void GroupWidget::onUserListChanged()
 void GroupWidget::setAsActiveChatroom()
 {
     setActive(true);
-    avatar->setPixmap(QPixmap(":img/group_dark.png"), Qt::transparent);
+    avatar->setPixmap(Style::scaleSvgImage(":img/group_dark.svg", avatar->width(), avatar->height()), Qt::transparent);
 }
 
 void GroupWidget::setAsInactiveChatroom()
 {
     setActive(false);
-    avatar->setPixmap(QPixmap(":img/group.png"), Qt::transparent);
+    avatar->setPixmap(Style::scaleSvgImage(":img/group.svg", avatar->width(), avatar->height()), Qt::transparent);
 }
 
 void GroupWidget::updateStatusLight()
@@ -100,9 +101,9 @@ void GroupWidget::updateStatusLight()
     Group *g = GroupList::findGroup(groupId);
 
     if (!g->getEventFlag())
-        statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
+        statusPic.setPixmap(QPixmap(":img/status/dot_online.svg"));
     else
-        statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.png"));
+        statusPic.setPixmap(QPixmap(":img/status/dot_online_notification.svg"));
 }
 
 void GroupWidget::setChatForm(Ui::MainWindow &ui)
diff --git a/src/widget/maskablepixmapwidget.cpp b/src/widget/maskablepixmapwidget.cpp
index 282ff9e27..acd975dfd 100644
--- a/src/widget/maskablepixmapwidget.cpp
+++ b/src/widget/maskablepixmapwidget.cpp
@@ -78,7 +78,7 @@ void MaskablePixmapWidget::setPixmap(const QPixmap &pmap, QColor background)
     if (!pmap.isNull())
     {
         unscaled = pmap;
-        pixmap = pmap.scaled(width(), height(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+        pixmap = pmap.scaled(width() - 2, height() - 2, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
         backgroundColor = background;
         manualColor = true;
         update();
@@ -90,7 +90,7 @@ void MaskablePixmapWidget::setPixmap(const QPixmap &pmap)
     if (!pmap.isNull())
     {
         unscaled = pmap;
-        pixmap = pmap.scaled(width(), height(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+        pixmap = pmap.scaled(width() - 2, height() - 2, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
         autopickBackground();
         update();
     }
@@ -113,7 +113,7 @@ void MaskablePixmapWidget::setSize(QSize size)
 
     if (!unscaled.isNull())
     {
-        pixmap = unscaled.scaled(width(), height(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
+        pixmap = unscaled.scaled(width() - 2, height() - 2, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
         if (!manualColor)
             autopickBackground();
         update();
diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp
index 33fa2e8bc..07468722b 100644
--- a/src/widget/widget.cpp
+++ b/src/widget/widget.cpp
@@ -103,13 +103,13 @@ void Widget::init()
     ui->mainSplitter->restoreState(Settings::getInstance().getSplitterState());
 
     statusOnline = new QAction(tr("Online", "Button to set your status to 'Online'"), this);
-    statusOnline->setIcon(QIcon(":img/status/dot_online.png"));
+    statusOnline->setIcon(getStatusIcon(Status::Online, 10, 10));
     connect(statusOnline, SIGNAL(triggered()), this, SLOT(setStatusOnline()));
     statusAway = new QAction(tr("Away", "Button to set your status to 'Away'"), this);
-    statusAway->setIcon(QIcon(":img/status/dot_idle.png"));
+    statusAway->setIcon(getStatusIcon(Status::Away, 10, 10));
     connect(statusAway, SIGNAL(triggered()), this, SLOT(setStatusAway()));
     statusBusy = new QAction(tr("Busy", "Button to set your status to 'Busy'"), this);
-    statusBusy->setIcon(QIcon(":img/status/dot_busy.png"));
+    statusBusy->setIcon(getStatusIcon(Status::Busy, 10, 10));
     connect(statusBusy, SIGNAL(triggered()), this, SLOT(setStatusBusy()));
 
     ui->statusbar->hide();
@@ -118,8 +118,8 @@ void Widget::init()
     layout()->setContentsMargins(0, 0, 0, 0);
     ui->friendList->setStyleSheet(Style::resolve(Style::getStylesheet(":ui/friendList/friendList.css")));
 
-    profilePicture = new MaskablePixmapWidget(this, QSize(40, 40), ":/img/avatar_mask.png");
-    profilePicture->setPixmap(QPixmap(":/img/contact_dark.png"));
+    profilePicture = new MaskablePixmapWidget(this, QSize(40, 40), ":/img/avatar_mask.svg");
+    profilePicture->setPixmap(QPixmap(":/img/contact_dark.svg"));
     profilePicture->setClickable(true);
     ui->myProfile->insertWidget(0, profilePicture);
     ui->myProfile->insertSpacing(1, 7);
@@ -161,8 +161,7 @@ void Widget::init()
     ui->mainSplitter->setStretchFactor(0,0);
     ui->mainSplitter->setStretchFactor(1,1);
 
-    ui->statusButton->setProperty("status", "offline");
-    Style::repolish(ui->statusButton);
+    onStatusSet(Status::Offline);
 
     // Disable some widgets until we're connected to the DHT
     ui->statusButton->setEnabled(false);
@@ -225,6 +224,9 @@ void Widget::setTranslation()
 
 void Widget::updateIcons()
 {
+    if (!icon)
+        return;
+
     QString status;
     if (eventIcon)
         status = "event";
@@ -334,16 +336,7 @@ void Widget::onConnected()
 
 void Widget::onDisconnected()
 {
-    QString stat = ui->statusButton->property("status").toString();
-    if      (stat == "online")
-        beforeDisconnect = Status::Online;
-    else if (stat == "busy")
-        beforeDisconnect = Status::Busy;
-    else if (stat == "away")
-        beforeDisconnect = Status::Away;
-    else
-        beforeDisconnect = Status::Offline;
-
+    beforeDisconnect = getStatusFromString(ui->statusButton->property("status").toString());
     ui->statusButton->setEnabled(false);
     emit statusSet(Status::Offline);
 }
@@ -369,27 +362,8 @@ void Widget::onBadProxyCore()
 
 void Widget::onStatusSet(Status status)
 {
-    //We have to use stylesheets here, there's no way to
-    //prevent the button icon from moving when pressed otherwise
-    switch (status)
-    {
-    case Status::Online:
-        ui->statusButton->setProperty("status" ,"online");
-        ui->statusButton->setIcon(QIcon(":img/status/dot_online_2x.png"));
-        break;
-    case Status::Away:
-        ui->statusButton->setProperty("status" ,"away");
-        ui->statusButton->setIcon(QIcon(":img/status/dot_idle_2x.png"));
-        break;
-    case Status::Busy:
-        ui->statusButton->setProperty("status" ,"busy");
-        ui->statusButton->setIcon(QIcon(":img/status/dot_busy_2x.png"));
-        break;
-    case Status::Offline:
-        ui->statusButton->setProperty("status" ,"offline");
-        ui->statusButton->setIcon(QIcon(":img/status/dot_away_2x.png"));
-        break;
-    }
+    ui->statusButton->setProperty("status", getStatusTitle(status));
+    ui->statusButton->setIcon(getStatusIcon(status, 10, 10));
     updateIcons();
 }
 
@@ -1190,3 +1164,62 @@ void Widget::previousContact()
 {
     qDebug() << "previous contact";
 }
+
+QString Widget::getStatusIconPath(Status status)
+{
+    switch (status)
+    {
+    case Status::Online:
+        return ":img/status/dot_online.svg";
+    case Status::Away:
+        return ":img/status/dot_away.svg";
+    case Status::Busy:
+        return ":img/status/dot_busy.svg";
+    case Status::Offline:
+    default:
+        return ":img/status/dot_offline.svg";
+    }
+}
+
+inline QIcon Widget::getStatusIcon(Status status, uint32_t w/*=0*/, uint32_t h/*=0*/)
+{
+    if (w > 0 && h > 0)
+        return getStatusIconPixmap(status, w, h);
+    else
+        return QIcon(getStatusIconPath(status));
+}
+
+QPixmap Widget::getStatusIconPixmap(Status status, uint32_t w, uint32_t h)
+{
+    QPixmap pix(w, h);
+    pix.load(getStatusIconPath(status));
+    return pix;
+}
+
+QString Widget::getStatusTitle(Status status)
+{
+    switch (status)
+    {
+    case Status::Online:
+        return "online";
+    case Status::Away:
+        return "away";
+    case Status::Busy:
+        return "busy";
+    case Status::Offline:
+    default:
+        return "offline";
+    }
+}
+
+Status Widget::getStatusFromString(QString status)
+{
+    if (status == "online")
+        return Status::Online;
+    else if (status == "busy")
+        return Status::Busy;
+    else if (status == "away")
+        return Status::Away;
+    else
+        return Status::Offline;
+}
diff --git a/src/widget/widget.h b/src/widget/widget.h
index 9be484659..90688d195 100644
--- a/src/widget/widget.h
+++ b/src/widget/widget.h
@@ -76,6 +76,11 @@ public:
     void reloadHistory();
 
     void reloadTheme();
+    static QString getStatusIconPath(Status status);
+    static inline QIcon getStatusIcon(Status status, uint32_t w=0, uint32_t h=0);
+    static QPixmap getStatusIconPixmap(Status status, uint32_t w, uint32_t h);
+    static QString getStatusTitle(Status status);
+    static Status getStatusFromString(QString status);
 
 public slots:
     void onSettingsClicked();
diff --git a/ui/acceptCall/acceptCall.png b/ui/acceptCall/acceptCall.png
deleted file mode 100644
index c892aba9b..000000000
Binary files a/ui/acceptCall/acceptCall.png and /dev/null differ
diff --git a/ui/acceptFileButton/default.png b/ui/acceptFileButton/default.png
deleted file mode 100644
index 59c6bbefc..000000000
Binary files a/ui/acceptFileButton/default.png and /dev/null differ
diff --git a/ui/acceptFileButton/hover.png b/ui/acceptFileButton/hover.png
deleted file mode 100644
index af4a66e34..000000000
Binary files a/ui/acceptFileButton/hover.png and /dev/null differ
diff --git a/ui/acceptFileButton/pressed.png b/ui/acceptFileButton/pressed.png
deleted file mode 100644
index 571103b31..000000000
Binary files a/ui/acceptFileButton/pressed.png and /dev/null differ
diff --git a/ui/acceptFileButton/style.css b/ui/acceptFileButton/style.css
deleted file mode 100644
index ed55c86d6..000000000
--- a/ui/acceptFileButton/style.css
+++ /dev/null
@@ -1,22 +0,0 @@
-QPushButton
-{
-    background-color: transparent;
-    background-image: url(":/ui/acceptFileButton/default.png");
-    background-repeat: none;    
-    border: none;
-    width: 24px;
-    height: 24px;
-}
-QPushButton:hover
-{
-   background-image: url(":/ui/acceptFileButton/hover.png");
-}
-
-QPushButton:pressed
-{
-   background-image: url(":/ui/acceptFileButton/pressed.png");
-}
-
-QPushButton:focus {
-    outline: none;
-}
diff --git a/ui/callButton/callButton.css b/ui/callButton/callButton.css
index 9af99cf77..4aaf2fddb 100644
--- a/ui/callButton/callButton.css
+++ b/ui/callButton/callButton.css
@@ -1,72 +1,83 @@
 QPushButton#green
 {
-    background-color: transparent;
-    background-image: url(":/ui/callButton/callButton.png");
-    background-repeat: none;    
+    background-color: #6bc260;
+    background-image: url(":/ui/callButton/callButton.svg");
+    background-repeat: none;
+    background-position: center;
     border: none;
+    border-radius: 5px;
     width: 50px;
     height: 40px;
 }
 
 QPushButton#green:hover
 {
-   background-image: url(":/ui/callButton/callButtonHover.png");
+    background-color: #79c76f;
 }
 
 QPushButton#green:pressed
 {
-   background-image: url(":/ui/callButton/callButtonPressed.png");
+    background-color: #51b244;
 }
 
 QPushButton#red
 {
-    background-color: transparent;
-    background-image: url(":/ui/callButton/callButtonRed.png");
-    background-repeat: none;    
+    background-color: #c84e4e;
+    background-image: url(":/ui/callButton/callButton.svg");
+    background-repeat: none;
+    background-position: center;
     border: none;
+    border-radius: 5px;
     width: 50px;
     height: 40px;
 }
+
 QPushButton#red:hover
 {
-   background-image: url(":/ui/callButton/callButtonRedHover.png");
+    background-color: #e87474;
 }
 
 QPushButton#red:pressed
 {
-   background-image: url(":/ui/callButton/callButtonRedPressed.png");
+    background-color: #df3b3b;
 }
 
 QPushButton#yellow
 {
-    background-color: transparent;
-    background-image: url(":/ui/callButton/callButtonYellow.png");
-    background-repeat: none;    
+    background-color: #e6e465;
+    background-image: url(":/ui/callButton/callButton.svg");
+    background-repeat: none;
+    background-position: center;
     border: none;
+    border-radius: 5px;
     width: 50px;
     height: 40px;
 }
+
 QPushButton#yellow:hover
 {
-   background-image: url(":/ui/callButton/callButtonYellowHover.png");
+    background-color: #e8e774;
 }
 
 QPushButton#yellow:pressed
 {
-   background-image: url(":/ui/callButton/callButtonYellowPressed.png");
+    background-color: #e3e155;
 }
 
 QPushButton#grey
 {
-    background-color: transparent;
-    background-image: url(":/ui/callButton/callButtonDisabled.png");
-    background-repeat: none;    
+    background-color: #919191;
+    background-image: url(":/ui/callButton/callButton.svg");
+    background-repeat: none;
+    background-position: center;
     border: none;
+    border-radius: 5px;
     width: 50px;
     height: 40px;
 }
 
-QPushButton:focus {
+QPushButton:focus
+{
     outline: none;
 }
 
diff --git a/ui/callButton/callButton.png b/ui/callButton/callButton.png
deleted file mode 100644
index 8e06507c5..000000000
Binary files a/ui/callButton/callButton.png and /dev/null differ
diff --git a/ui/callButton/callButton.svg b/ui/callButton/callButton.svg
new file mode 100644
index 000000000..ce48974b7
--- /dev/null
+++ b/ui/callButton/callButton.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 25 23"
+   id="Layer_1"
+   xml:space="preserve"><metadata
+     id="metadata9"><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="defs7" /><path
+     d="m 19.546776,-0.03791866 c 0,0 -0.585151,-0.1170302 -0.819211,0.58515098 L 16.621021,5.4625006 c 0,0 -0.35109,0.7021812 0.234061,1.4043624 l 1.521392,1.9895133 c 0,0 0.585151,0.4681208 0.11703,1.1703017 -0.46812,0.585151 -2.691694,4.681208 -8.426174,7.255873 0,0 -0.702181,0.46812 -1.287332,-0.234061 C 8.3118772,16.346309 6.6734545,13.771645 5.6201827,14.239765 L 0.35382383,16.6974 c 0,0 -0.46812079,0 -0.35109059,0.936241 0.1170302,0.936242 0,5.266359 6.20260046,5.266359 7.3729023,0 18.6078013,-10.649748 18.6078013,-17.3204692 0,0 0,-5.61744946 -3.510906,-5.61744946 h -1.755453 z"
+     id="path3"
+     style="fill:#ffffff" /></svg>
\ No newline at end of file
diff --git a/ui/callButton/callButtonDisabled.png b/ui/callButton/callButtonDisabled.png
deleted file mode 100644
index bf540a170..000000000
Binary files a/ui/callButton/callButtonDisabled.png and /dev/null differ
diff --git a/ui/callButton/callButtonHover.png b/ui/callButton/callButtonHover.png
deleted file mode 100644
index 2e9953ea3..000000000
Binary files a/ui/callButton/callButtonHover.png and /dev/null differ
diff --git a/ui/callButton/callButtonPressed.png b/ui/callButton/callButtonPressed.png
deleted file mode 100644
index 45f3d0f4a..000000000
Binary files a/ui/callButton/callButtonPressed.png and /dev/null differ
diff --git a/ui/callButton/callButtonRed.png b/ui/callButton/callButtonRed.png
deleted file mode 100644
index 9f306f16b..000000000
Binary files a/ui/callButton/callButtonRed.png and /dev/null differ
diff --git a/ui/callButton/callButtonRedHover.png b/ui/callButton/callButtonRedHover.png
deleted file mode 100644
index 835325d50..000000000
Binary files a/ui/callButton/callButtonRedHover.png and /dev/null differ
diff --git a/ui/callButton/callButtonRedPressed.png b/ui/callButton/callButtonRedPressed.png
deleted file mode 100644
index 3beac4e2b..000000000
Binary files a/ui/callButton/callButtonRedPressed.png and /dev/null differ
diff --git a/ui/callButton/callButtonYellow.png b/ui/callButton/callButtonYellow.png
deleted file mode 100644
index 1fde0c461..000000000
Binary files a/ui/callButton/callButtonYellow.png and /dev/null differ
diff --git a/ui/callButton/callButtonYellowHover.png b/ui/callButton/callButtonYellowHover.png
deleted file mode 100644
index 0c19c09dc..000000000
Binary files a/ui/callButton/callButtonYellowHover.png and /dev/null differ
diff --git a/ui/callButton/callButtonYellowPressed.png b/ui/callButton/callButtonYellowPressed.png
deleted file mode 100644
index 8200b1f2f..000000000
Binary files a/ui/callButton/callButtonYellowPressed.png and /dev/null differ
diff --git a/ui/chatArea/scrollBarDownArrow.png b/ui/chatArea/scrollBarDownArrow.png
deleted file mode 100644
index 0650e7944..000000000
Binary files a/ui/chatArea/scrollBarDownArrow.png and /dev/null differ
diff --git a/ui/chatArea/scrollBarDownArrow.svg b/ui/chatArea/scrollBarDownArrow.svg
new file mode 100644
index 000000000..6c1713ffc
--- /dev/null
+++ b/ui/chatArea/scrollBarDownArrow.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="10"
+   height="10"
+   viewBox="0 0 10 10"
+   id="Layer_1"
+   xml:space="preserve"><metadata
+     id="metadata9"><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="defs7" /><polygon
+     points="0,0 7.145,0 3.572,6.187 "
+     transform="matrix(1.3925994,0,0,1.6101695,0,0.0378813)"
+     id="polygon3"
+     style="fill:#d1d1d1;fill-opacity:1" /></svg>
\ No newline at end of file
diff --git a/ui/chatArea/scrollBarDownArrowHover.png b/ui/chatArea/scrollBarDownArrowHover.png
deleted file mode 100644
index 54ae2cf6a..000000000
Binary files a/ui/chatArea/scrollBarDownArrowHover.png and /dev/null differ
diff --git a/ui/chatArea/scrollBarDownArrowPressed.png b/ui/chatArea/scrollBarDownArrowPressed.png
deleted file mode 100644
index 986e4ab70..000000000
Binary files a/ui/chatArea/scrollBarDownArrowPressed.png and /dev/null differ
diff --git a/ui/chatArea/scrollBarHandle.png b/ui/chatArea/scrollBarHandle.png
deleted file mode 100644
index fe755bb00..000000000
Binary files a/ui/chatArea/scrollBarHandle.png and /dev/null differ
diff --git a/ui/chatArea/scrollBarLeftArrow.svg b/ui/chatArea/scrollBarLeftArrow.svg
new file mode 100644
index 000000000..90406d516
--- /dev/null
+++ b/ui/chatArea/scrollBarLeftArrow.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="10"
+   height="10"
+   viewBox="0 0 10 10"
+   id="Layer_1"
+   xml:space="preserve"><metadata
+     id="metadata9"><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="defs7" /><polygon
+     points="7.145,0 3.572,6.187 0,0 "
+     transform="matrix(0,1.3925994,-1.6101695,0,9.9561207,0.04387929)"
+     id="polygon3"
+     style="fill:#d1d1d1;fill-opacity:1" /></svg>
\ No newline at end of file
diff --git a/ui/chatArea/scrollBarRightArrow.svg b/ui/chatArea/scrollBarRightArrow.svg
new file mode 100644
index 000000000..4d63e65cb
--- /dev/null
+++ b/ui/chatArea/scrollBarRightArrow.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="10"
+   height="10"
+   viewBox="0 0 10 10"
+   id="Layer_1"
+   xml:space="preserve"><metadata
+     id="metadata9"><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="defs7" /><polygon
+     points="3.572,6.187 0,0 7.145,0 "
+     transform="matrix(0,-1.3925994,1.6101695,0,-0.005998,9.994002)"
+     id="polygon3"
+     style="fill:#d1d1d1;fill-opacity:1" /></svg>
\ No newline at end of file
diff --git a/ui/chatArea/scrollBarUpArrow.png b/ui/chatArea/scrollBarUpArrow.png
deleted file mode 100644
index fcf1b9fad..000000000
Binary files a/ui/chatArea/scrollBarUpArrow.png and /dev/null differ
diff --git a/ui/chatArea/scrollBarUpArrow.svg b/ui/chatArea/scrollBarUpArrow.svg
new file mode 100644
index 000000000..da4930657
--- /dev/null
+++ b/ui/chatArea/scrollBarUpArrow.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="10"
+   height="10"
+   viewBox="0 0 10 10"
+   id="Layer_1"
+   xml:space="preserve"><metadata
+     id="metadata9"><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="defs7" /><polygon
+     points="7.145,0 3.572,6.187 0,0 "
+     transform="matrix(-1.3925994,0,0,-1.6101695,9.9501227,10)"
+     id="polygon3"
+     style="fill:#d1d1d1;fill-opacity:1" /></svg>
\ No newline at end of file
diff --git a/ui/chatArea/scrollBarUpArrowHover.png b/ui/chatArea/scrollBarUpArrowHover.png
deleted file mode 100644
index b6f9ce109..000000000
Binary files a/ui/chatArea/scrollBarUpArrowHover.png and /dev/null differ
diff --git a/ui/chatArea/scrollBarUpArrowPressed.png b/ui/chatArea/scrollBarUpArrowPressed.png
deleted file mode 100644
index 401f903ce..000000000
Binary files a/ui/chatArea/scrollBarUpArrowPressed.png and /dev/null differ
diff --git a/ui/emoteButton/emoteButton.css b/ui/emoteButton/emoteButton.css
index 6ca825094..237e3cc31 100644
--- a/ui/emoteButton/emoteButton.css
+++ b/ui/emoteButton/emoteButton.css
@@ -1,22 +1,26 @@
 QPushButton
 {
-    background-color: transparent;
-    background-image: url(":/ui/emoteButton/emoteButton.png");
-    background-repeat: none;    
+    background-color: #6bc260;
+    background-image: url(":/ui/emoteButton/emoteButton.svg");
+    background-repeat: none;
+    background-position: center;
+    border-top-right-radius: 5px;
     border: none;
     width: 24px;
     height: 24px;
 }
+
 QPushButton:hover
 {
-   background-image: url(":/ui/emoteButton/emoteButtonHover.png");
+    background-color: #79c76f;
 }
 
 QPushButton:pressed
 {
-   background-image: url(":/ui/emoteButton/emoteButtonPressed.png");
+    background-color: #51b244;
 }
 
-QPushButton:focus {
+QPushButton:focus
+{
     outline: none;
 }
diff --git a/ui/emoteButton/emoteButton.png b/ui/emoteButton/emoteButton.png
deleted file mode 100644
index 390c92a26..000000000
Binary files a/ui/emoteButton/emoteButton.png and /dev/null differ
diff --git a/ui/emoteButton/emoteButton.svg b/ui/emoteButton/emoteButton.svg
new file mode 100644
index 000000000..d5844c42c
--- /dev/null
+++ b/ui/emoteButton/emoteButton.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 17 17"
+   id="Layer_1"
+   xml:space="preserve"><metadata
+     id="metadata15"><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="defs13" /><g
+     transform="matrix(1.6827488,0,0,1.654661,0,0.02245763)"
+     id="g3"><path
+       d="M 3.4,1.5 C 3.4,2.3 2.7,3 1.9,3 1.1,3 0.4,2.3 0.4,1.5 0.4,0.7 1.1,0 1.9,0 2.7,0 3.4,0.7 3.4,1.5 z m 6,0 C 9.4,2.3 8.7,3 7.9,3 7.1,3 6.4,2.3 6.4,1.5 6.4,0.7 7.1,0 7.9,0 8.7,0 9.4,0.7 9.4,1.5 z"
+       id="path5"
+       style="fill:#ffffff" /><g
+       id="g7"><path
+         d="M 0.7,6.6 C 0.7,6.6 0.8,6.7 1,6.9 1.2,7.1 1.5,7.4 1.8,7.7 2.2,8 2.7,8.2 3.2,8.4 3.5,8.5 3.8,8.5 4.1,8.6 4.3,8.7 4.7,8.7 5,8.7 5.4,8.7 5.7,8.7 6,8.6 6.3,8.6 6.6,8.5 6.9,8.4 7.4,8.2 7.9,8 8.3,7.7 9.1,7.1 9.4,6.5 9.4,6.6 l 0.7,0.2 c 0,0 0,0.2 -0.2,0.5 C 9.6,7.7 9.4,8.2 9,8.6 8.8,8.9 8.5,9.1 8.3,9.3 8,9.5 7.6,9.7 7.3,9.8 6.9,9.9 6.6,10.1 6.2,10.1 5.8,10.2 5.4,10.2 5.1,10.2 4.6,10.2 4.3,10.2 3.9,10.1 3.4,10.1 3,10 2.7,9.8 2.3,9.7 2,9.5 1.7,9.3 1.4,9.1 1.2,8.9 1,8.6 0.2,7.7 0,6.9 0,6.9 L 0.7,6.6 z"
+         id="path9"
+         style="fill:#ffffff" /></g></g></svg>
\ No newline at end of file
diff --git a/ui/emoteButton/emoteButtonHover.png b/ui/emoteButton/emoteButtonHover.png
deleted file mode 100644
index 16c355bd1..000000000
Binary files a/ui/emoteButton/emoteButtonHover.png and /dev/null differ
diff --git a/ui/emoteButton/emoteButtonPressed.png b/ui/emoteButton/emoteButtonPressed.png
deleted file mode 100644
index 28b4208f7..000000000
Binary files a/ui/emoteButton/emoteButtonPressed.png and /dev/null differ
diff --git a/ui/emoticonWidget/dot_page.png b/ui/emoticonWidget/dot_page.png
deleted file mode 100644
index e74d514e2..000000000
Binary files a/ui/emoticonWidget/dot_page.png and /dev/null differ
diff --git a/ui/emoticonWidget/dot_page.svg b/ui/emoticonWidget/dot_page.svg
new file mode 100644
index 000000000..470860765
--- /dev/null
+++ b/ui/emoticonWidget/dot_page.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="10"
+   height="10"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     transform="translate(0,-1042.3622)"
+     id="layer1">
+    <rect
+       width="9.9910402"
+       height="9.9910402"
+       ry="4.9955201"
+       x="0.015783412"
+       y="1042.3553"
+       id="rect2985"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  </g>
+</svg>
diff --git a/ui/emoticonWidget/dot_page_current.png b/ui/emoticonWidget/dot_page_current.png
deleted file mode 100644
index 7b18c42c2..000000000
Binary files a/ui/emoticonWidget/dot_page_current.png and /dev/null differ
diff --git a/ui/emoticonWidget/dot_page_current.svg b/ui/emoticonWidget/dot_page_current.svg
new file mode 100644
index 000000000..c0a960492
--- /dev/null
+++ b/ui/emoticonWidget/dot_page_current.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="10"
+   height="10"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     transform="translate(0,-1042.3622)"
+     id="layer1">
+    <rect
+       width="9.9910402"
+       height="9.9910402"
+       ry="4.9955201"
+       x="0.015783412"
+       y="1042.3553"
+       id="rect2985"
+       style="fill:#93d38b;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  </g>
+</svg>
diff --git a/ui/emoticonWidget/dot_page_hover.png b/ui/emoticonWidget/dot_page_hover.png
deleted file mode 100644
index 822dbb6c6..000000000
Binary files a/ui/emoticonWidget/dot_page_hover.png and /dev/null differ
diff --git a/ui/emoticonWidget/dot_page_hover.svg b/ui/emoticonWidget/dot_page_hover.svg
new file mode 100644
index 000000000..09d9e56ac
--- /dev/null
+++ b/ui/emoticonWidget/dot_page_hover.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="10"
+   height="10"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     transform="translate(0,-1042.3622)"
+     id="layer1">
+    <rect
+       width="9.9910402"
+       height="9.9910402"
+       ry="4.9955201"
+       x="0.015783412"
+       y="1042.3553"
+       id="rect2985"
+       style="fill:#d8d8d8;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  </g>
+</svg>
diff --git a/ui/emoticonWidget/emoticonWidget.css b/ui/emoticonWidget/emoticonWidget.css
index a36a616a7..703cee370 100644
--- a/ui/emoticonWidget/emoticonWidget.css
+++ b/ui/emoticonWidget/emoticonWidget.css
@@ -15,22 +15,22 @@ QRadioButton::indicator
 
 QRadioButton::indicator::unchecked 
 {
-     image: url(:/ui/emoticonWidget/dot_page.png);
+     image: url(:/ui/emoticonWidget/dot_page.svg);
 }
 
 QRadioButton::indicator:unchecked:hover 
 {
-     image: url(:/ui/emoticonWidget/dot_page_hover.png);
+     image: url(:/ui/emoticonWidget/dot_page_hover.svg);
 }
 
 QRadioButton::indicator:unchecked:pressed 
 {
-     image: url(:/ui/emoticonWidget/dot_page_hover.png);
+     image: url(:/ui/emoticonWidget/dot_page_hover.svg);
 }
 
 QRadioButton::indicator::checked 
 {
-     image: url(:/ui/emoticonWidget/dot_page_current.png);
+     image: url(:/ui/emoticonWidget/dot_page_current.svg);
 }
 
 QMenu
diff --git a/ui/fileButton/fileButton.css b/ui/fileButton/fileButton.css
index fd06c6f0e..32d9c9ee2 100644
--- a/ui/fileButton/fileButton.css
+++ b/ui/fileButton/fileButton.css
@@ -1,27 +1,31 @@
 QPushButton
 {
-    background-color: transparent;
-    background-image: url(":/ui/fileButton/fileButton.png");
-    background-repeat: none;    
+    background-color: #6bc260;
+    background-image: url(":/ui/fileButton/fileButton.svg");
+    background-repeat: none;
+    background-position: center;
+    border-bottom-right-radius: 5px;
     border: none;
     width: 24px;
     height: 24px;
 }
+
 QPushButton:hover
 {
-   background-image: url(":/ui/fileButton/fileButtonHover.png");
+    background-color: #79c76f;
 }
 
 QPushButton:pressed
 {
-   background-image: url(":/ui/fileButton/fileButtonPressed.png");
+    background-color: #51b244;
 }
 
 QPushButton[enabled="false"]
 {
-   background-image: url(":/ui/fileButton/fileButtonDisabled.png");
+    background-color: #919191;
 }
 
-QPushButton:focus {
+QPushButton:focus
+{
     outline: none;
 }
diff --git a/ui/fileButton/fileButton.png b/ui/fileButton/fileButton.png
deleted file mode 100644
index edf0043ab..000000000
Binary files a/ui/fileButton/fileButton.png and /dev/null differ
diff --git a/ui/fileButton/fileButton.svg b/ui/fileButton/fileButton.svg
new file mode 100644
index 000000000..284cd5cdd
--- /dev/null
+++ b/ui/fileButton/fileButton.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="Layer_1"
+   xml:space="preserve"><metadata
+     id="metadata13"><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="defs11" /><g
+     transform="matrix(1.1649174,0,0,1.1610052,0,0.08477933)"
+     id="g3"><path
+       d="M 13.629,2.874 C 13.567,2.619 13.48,2.38 13.373,2.158 13.185,1.77 12.935,1.439 12.655,1.166 12.445,0.96 12.217,0.784 11.983,0.639 11.63,0.418 11.263,0.262 10.905,0.158 10.726,0.105 10.55,0.067 10.377,0.04 10.204,0.014 10.036,0 9.872,0 9.446,0 9.068,0.061 8.744,0.156 8.501,0.228 8.29,0.317 8.107,0.413 7.835,0.558 7.632,0.713 7.49,0.84 7.396,0.926 7.33,0.996 7.291,1.043 L 1.279,6.974 1.278,6.977 C 1.12,7.134 0.962,7.315 0.812,7.523 0.587,7.834 0.383,8.206 0.235,8.636 0.089,9.066 0,9.556 0,10.099 c 0.001,0.216 0.028,0.432 0.079,0.645 0.088,0.371 0.246,0.734 0.461,1.075 0.161,0.256 0.354,0.5 0.578,0.724 0.336,0.336 0.743,0.626 1.211,0.834 0.233,0.104 0.482,0.187 0.743,0.244 0.262,0.057 0.536,0.088 0.82,0.088 0.27,0 0.529,-0.042 0.774,-0.108 0.214,-0.06 0.418,-0.138 0.609,-0.229 0.338,-0.16 0.642,-0.357 0.914,-0.562 0.406,-0.306 0.738,-0.629 0.976,-0.878 0.235,-0.25 0.374,-0.426 0.384,-0.439 l -1.109,-0.871 0,0 0.51,0.399 -0.51,-0.4 0.453,0.356 -0.452,-0.356 H 6.44 l 0,0 v 10e-4 l 0,0 C 6.438,10.626 6.347,10.738 6.194,10.904 6.078,11.03 5.925,11.185 5.747,11.345 5.614,11.466 5.467,11.59 5.31,11.703 5.077,11.878 4.825,12.031 4.58,12.136 4.457,12.19 4.337,12.23 4.221,12.257 c -0.115,0.027 -0.225,0.04 -0.328,0.04 -0.185,0 -0.36,-0.021 -0.527,-0.058 C 3.073,12.176 2.805,12.057 2.563,11.903 2.382,11.788 2.217,11.65 2.073,11.5 1.856,11.273 1.686,11.019 1.574,10.77 1.518,10.645 1.476,10.524 1.45,10.41 1.424,10.296 1.41,10.19 1.41,10.099 1.41,9.839 1.438,9.606 1.485,9.394 1.557,9.077 1.671,8.806 1.81,8.571 1.948,8.337 2.112,8.138 2.276,7.974 L 8.341,1.988 8.364,1.958 C 8.373,1.948 8.406,1.91 8.468,1.858 8.564,1.778 8.72,1.667 8.948,1.576 9.063,1.53 9.195,1.489 9.348,1.459 9.501,1.429 9.674,1.411 9.872,1.411 c 0.1,0 0.219,0.01 0.348,0.032 0.226,0.038 0.48,0.116 0.727,0.232 0.186,0.089 0.366,0.198 0.53,0.329 0.124,0.097 0.238,0.207 0.34,0.327 0.152,0.182 0.277,0.388 0.366,0.629 0.09,0.241 0.143,0.518 0.144,0.848 0,0.151 -0.02,0.297 -0.053,0.436 -0.053,0.21 -0.139,0.407 -0.248,0.59 C 11.917,5.017 11.785,5.182 11.65,5.32 L 11.649,5.322 8.609,8.496 C 8.604,8.5 8.586,8.519 8.553,8.542 8.501,8.579 8.418,8.63 8.306,8.671 8.194,8.712 8.052,8.744 7.869,8.744 7.818,8.744 7.771,8.738 7.728,8.728 7.653,8.711 7.588,8.681 7.526,8.638 7.48,8.608 7.437,8.567 7.396,8.52 7.336,8.449 7.284,8.359 7.248,8.257 7.213,8.155 7.192,8.043 7.192,7.926 7.192,7.815 7.213,7.71 7.247,7.612 7.271,7.537 7.305,7.467 7.341,7.405 7.396,7.31 7.455,7.231 7.498,7.183 7.52,7.156 7.537,7.14 7.546,7.13 7.55,7.127 7.553,7.125 7.554,7.123 L 7.562,7.115 9.917,4.789 8.925,3.786 6.593,6.09 C 6.568,6.114 6.521,6.16 6.463,6.224 6.348,6.352 6.185,6.558 6.043,6.842 5.973,6.983 5.907,7.146 5.86,7.328 5.813,7.51 5.781,7.711 5.781,7.926 c 0.001,0.281 0.05,0.557 0.143,0.814 0.069,0.193 0.164,0.376 0.282,0.545 0.09,0.126 0.193,0.243 0.31,0.349 0.176,0.158 0.38,0.289 0.609,0.381 0.229,0.091 0.482,0.141 0.744,0.141 0.273,0 0.521,-0.04 0.735,-0.1 C 8.765,10.011 8.908,9.953 9.031,9.894 9.217,9.803 9.359,9.704 9.46,9.623 9.55,9.553 9.606,9.495 9.634,9.467 l 3.03,-3.166 c 0.268,-0.277 0.53,-0.623 0.732,-1.041 0.101,-0.209 0.186,-0.436 0.245,-0.679 0.061,-0.242 0.095,-0.503 0.095,-0.772 0,-0.33 -0.037,-0.642 -0.107,-0.935 z M 8.362,1.96 l 0,0 0,0 0,0 z"
+       id="path5"
+       style="fill:#ffffff" /><polygon
+       points="12.664,6.301 12.666,6.299 12.664,6.301 "
+       id="polygon7"
+       style="fill:#ffffff" /></g></svg>
\ No newline at end of file
diff --git a/ui/fileButton/fileButtonDisabled.png b/ui/fileButton/fileButtonDisabled.png
deleted file mode 100644
index ed024e2df..000000000
Binary files a/ui/fileButton/fileButtonDisabled.png and /dev/null differ
diff --git a/ui/fileButton/fileButtonHover.png b/ui/fileButton/fileButtonHover.png
deleted file mode 100644
index e0efb229d..000000000
Binary files a/ui/fileButton/fileButtonHover.png and /dev/null differ
diff --git a/ui/fileButton/fileButtonPressed.png b/ui/fileButton/fileButtonPressed.png
deleted file mode 100644
index 51ae12fd2..000000000
Binary files a/ui/fileButton/fileButtonPressed.png and /dev/null differ
diff --git a/ui/fileTransferWidget/fileDone.svg b/ui/fileTransferWidget/fileDone.svg
new file mode 100644
index 000000000..5bc56410a
--- /dev/null
+++ b/ui/fileTransferWidget/fileDone.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="25"
+   height="28"
+   viewBox="0 0 25 27.999999"
+   id="Layer_1"
+   xml:space="preserve"><metadata
+     id="metadata9"><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="defs7" /><rect
+     width="24.985352"
+     height="27.983137"
+     ry="4.4019279"
+     x="-0.014393898"
+     y="0.027552454"
+     id="rect2983"
+     style="fill:#6bc260;fill-opacity:1;fill-rule:nonzero;stroke:none" /><polygon
+     points="4.24,10.029 4.241,10.029 5.902,8.369 12.608,1.662 10.946,0 4.24,6.707 1.661,4.127 0,5.789 "
+     transform="matrix(1.0235938,0,0,1,6.2711864,8.8184576)"
+     id="polygon3"
+     style="fill:#ffffff" /></svg>
\ No newline at end of file
diff --git a/ui/pauseFileButton/default.png b/ui/pauseFileButton/default.png
deleted file mode 100644
index 4faa47e52..000000000
Binary files a/ui/pauseFileButton/default.png and /dev/null differ
diff --git a/ui/pauseFileButton/hover.png b/ui/pauseFileButton/hover.png
deleted file mode 100644
index e7941eb75..000000000
Binary files a/ui/pauseFileButton/hover.png and /dev/null differ
diff --git a/ui/pauseFileButton/pressed.png b/ui/pauseFileButton/pressed.png
deleted file mode 100644
index 39de23b1d..000000000
Binary files a/ui/pauseFileButton/pressed.png and /dev/null differ
diff --git a/ui/pauseFileButton/style.css b/ui/pauseFileButton/style.css
deleted file mode 100644
index 9e501c2b6..000000000
--- a/ui/pauseFileButton/style.css
+++ /dev/null
@@ -1,22 +0,0 @@
-QPushButton
-{
-    background-color: transparent;
-    background-image: url(":/ui/pauseFileButton/default.png");
-    background-repeat: none;    
-    border: none;
-    width: 24px;
-    height: 24px;
-}
-QPushButton:hover
-{
-   background-image: url(":/ui/pauseFileButton/hover.png");
-}
-
-QPushButton:pressed
-{
-   background-image: url(":/ui/pauseFileButton/pressed.png");
-}
-
-QPushButton:focus {
-    outline: none;
-}
diff --git a/ui/rejectCall/rejectCall.png b/ui/rejectCall/rejectCall.png
deleted file mode 100644
index a0480be5c..000000000
Binary files a/ui/rejectCall/rejectCall.png and /dev/null differ
diff --git a/ui/sendButton/sendButton.css b/ui/sendButton/sendButton.css
index 087b182c9..d3b9998a8 100644
--- a/ui/sendButton/sendButton.css
+++ b/ui/sendButton/sendButton.css
@@ -1,22 +1,26 @@
 QPushButton
 {
-    background-color: transparent;
-    background-image: url(":/ui/sendButton/sendButton.png");
-    background-repeat: none;    
+    background-color: #6bc260;
+    background-image: url(":/ui/sendButton/sendButton.svg");
+    background-repeat: none;
+    background-position: center;
     border: none;
+    border-radius: 5px;
     width: 50px;
     height: 50px;
 }
+
 QPushButton:hover
 {
-   background-image: url(":/ui/sendButton/sendButtonHover.png");
+    background-color: #79c76f;
 }
 
 QPushButton:pressed
 {
-   background-image: url(":/ui/sendButton/sendButtonPressed.png");
+    background-color: #51b244;
 }
 
-QPushButton:focus {
+QPushButton:focus
+{
     outline: none;
 }
diff --git a/ui/sendButton/sendButton.png b/ui/sendButton/sendButton.png
deleted file mode 100644
index 4a1b87a47..000000000
Binary files a/ui/sendButton/sendButton.png and /dev/null differ
diff --git a/ui/sendButton/sendButton.svg b/ui/sendButton/sendButton.svg
new file mode 100644
index 000000000..3699eb11b
--- /dev/null
+++ b/ui/sendButton/sendButton.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="27"
+   height="32"
+   viewBox="0 0 26.999999 31.999999"
+   id="Layer_1"
+   xml:space="preserve"><metadata
+     id="metadata9"><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="defs7" /><path
+     d="M 5.0774179,2.9032355 C 2.9746346,4.3950939 1.3168041,6.548619 0.57798838,9.0267615 -0.36459081,12.040868 -0.16637195,15.423795 1.2627444,18.256944 c 1.4623839,2.960234 4.1778437,5.214598 7.2744936,6.326585 2.585162,0.998716 5.460029,1.140995 8.151924,0.504193 -0.321586,2.479524 -1.397235,4.780853 -2.664173,6.912277 3.971308,-2.573456 7.23984,-6.100043 9.904013,-9.983019 1.96001,-2.927081 3.262987,-6.41361 3.099422,-9.971968 C 26.884265,8.9176349 25.349801,5.9408249 23.075136,3.812164 20.611955,1.5122157 17.268571,0.20269558 13.900236,0.11428916 10.752299,-0.00174427 7.6029757,1.0411752 5.0774179,2.9032355 z"
+     id="path3"
+     style="fill:#ffffff" /></svg>
\ No newline at end of file
diff --git a/ui/sendButton/sendButtonHover.png b/ui/sendButton/sendButtonHover.png
deleted file mode 100644
index bdeb81217..000000000
Binary files a/ui/sendButton/sendButtonHover.png and /dev/null differ
diff --git a/ui/sendButton/sendButtonPressed.png b/ui/sendButton/sendButtonPressed.png
deleted file mode 100644
index 791218571..000000000
Binary files a/ui/sendButton/sendButtonPressed.png and /dev/null differ
diff --git a/ui/settings/mainContent.css b/ui/settings/mainContent.css
index 76fcef3b4..49fdff15d 100644
--- a/ui/settings/mainContent.css
+++ b/ui/settings/mainContent.css
@@ -110,14 +110,14 @@ QScrollBar::handle:vertical:pressed  {
 }
 
 QScrollBar::add-line:vertical {
-    background: url(":ui/chatArea/scrollBarDownArrow.png") center;
+    background: url(":ui/chatArea/scrollBarDownArrow.svg") center;
     height: 0px;
     subcontrol-position: bottom;
     subcontrol-origin: margin;
 }
 
 QScrollBar::sub-line:vertical {
-    background: url(":ui/chatArea/scrollBarUpArrow.png") center;
+    background: url(":ui/chatArea/scrollBarUpArrow.svg") center;
     height: 0px;
     subcontrol-position: top;
     subcontrol-origin: margin;
@@ -161,14 +161,14 @@ QScrollBar::handle:horizontal:pressed  {
 }
 
 QScrollBar::add-line:horizontal {
-    background: url(":ui/chatArea/scrollBarRightArrow.png") center;
+    background: url(":ui/chatArea/scrollBarRightArrow.svg") center;
     width: 0px;
     subcontrol-position: right;
     subcontrol-origin: margin;
 }
 
 QScrollBar::sub-line:horizontal {
-    background: url(":ui/chatArea/scrollBarLeftArrow.png") center;
+    background: url(":ui/chatArea/scrollBarLeftArrow.svg") center;
     width: 0px;
     subcontrol-position: left;
     subcontrol-origin: margin;
diff --git a/ui/statusButton/menu_indicator.png b/ui/statusButton/menu_indicator.png
deleted file mode 100644
index 92abefa55..000000000
Binary files a/ui/statusButton/menu_indicator.png and /dev/null differ
diff --git a/ui/statusButton/menu_indicator.svg b/ui/statusButton/menu_indicator.svg
new file mode 100644
index 000000000..36d6c3cd7
--- /dev/null
+++ b/ui/statusButton/menu_indicator.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="9"
+   height="6.1869998"
+   viewBox="0 0 9 6.187"
+   id="Layer_1"
+   xml:space="preserve"><metadata
+     id="metadata9"><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="defs7" /><polygon
+     points="0,0 7.145,0 3.572,6.187 "
+     transform="scale(1.2531716,1)"
+     id="polygon3"
+     style="fill:#636365" /></svg>
\ No newline at end of file
diff --git a/ui/statusButton/statusButton.css b/ui/statusButton/statusButton.css
index 03c1377c3..ddb0653f2 100644
--- a/ui/statusButton/statusButton.css
+++ b/ui/statusButton/statusButton.css
@@ -32,7 +32,7 @@ QPushButton::menu-indicator {image: none;}
 
 QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open 
 {
-  image: url(":ui/statusButton/menu_indicator.png");
+  image: url(":ui/statusButton/menu_indicator.svg");
   subcontrol-origin: padding;
   subcontrol-position: bottom center;
   position: relative;
diff --git a/ui/stopFileButton/default.png b/ui/stopFileButton/default.png
deleted file mode 100644
index 950fd3b17..000000000
Binary files a/ui/stopFileButton/default.png and /dev/null differ
diff --git a/ui/stopFileButton/hover.png b/ui/stopFileButton/hover.png
deleted file mode 100644
index 023822a5b..000000000
Binary files a/ui/stopFileButton/hover.png and /dev/null differ
diff --git a/ui/stopFileButton/pressed.png b/ui/stopFileButton/pressed.png
deleted file mode 100644
index bb18f999a..000000000
Binary files a/ui/stopFileButton/pressed.png and /dev/null differ
diff --git a/ui/stopFileButton/style.css b/ui/stopFileButton/style.css
deleted file mode 100644
index 7cb6abfc6..000000000
--- a/ui/stopFileButton/style.css
+++ /dev/null
@@ -1,22 +0,0 @@
-QPushButton
-{
-    background-color: transparent;
-    background-image: url(":/ui/stopFileButton/default.png");
-    background-repeat: none;    
-    border: none;
-    width: 24px;
-    height: 24px;
-}
-QPushButton:hover
-{
-   background-image: url(":/ui/stopFileButton/hover.png");
-}
-
-QPushButton:pressed
-{
-   background-image: url(":/ui/stopFileButton/pressed.png");
-}
-
-QPushButton:focus {
-    outline: none;
-}
diff --git a/ui/videoButton/videoButton.css b/ui/videoButton/videoButton.css
index 7bcfe93d0..6b7c95972 100644
--- a/ui/videoButton/videoButton.css
+++ b/ui/videoButton/videoButton.css
@@ -1,71 +1,82 @@
 QPushButton#green
 {
-    background-color: transparent;
-    background-image: url(":/ui/videoButton/videoButton.png");
-    background-repeat: none;    
+    background-color: #6bc260;
+    background-image: url(":/ui/videoButton/videoButton.svg");
+    background-repeat: none;
+    background-position: center;
     border: none;
+    border-radius: 5px;
     width: 50px;
     height: 40px;
 }
 
 QPushButton#green:hover
 {
-   background-image: url(":/ui/videoButton/videoButtonHover.png");
+    background-color: #79c76f;
 }
 
 QPushButton#green:pressed
 {
-   background-image: url(":/ui/videoButton/videoButtonPressed.png");
+    background-color: #51b244;
 }
 
 QPushButton#red
 {
-    background-color: transparent;
-    background-image: url(":/ui/videoButton/videoButtonRed.png");
-    background-repeat: none;    
+    background-color: #c84e4e;
+    background-image: url(":/ui/videoButton/videoButton.svg");
+    background-repeat: none;
+    background-position: center;
     border: none;
+    border-radius: 5px;
     width: 50px;
     height: 40px;
 }
+
 QPushButton#red:hover
 {
-   background-image: url(":/ui/videoButton/videoButtonRedHover.png");
+    background-color: #e87474;
 }
 
 QPushButton#red:pressed
 {
-   background-image: url(":/ui/videoButton/videoButtonRedPressed.png");
+    background-color: #df3b3b;
 }
 
 QPushButton#yellow
 {
-    background-color: transparent;
-    background-image: url(":/ui/videoButton/videoButtonYellow.png");
-    background-repeat: none;    
+    background-color: #e6e465;
+    background-image: url(":/ui/videoButton/videoButton.svg");
+    background-repeat: none;
+    background-position: center;
     border: none;
+    border-radius: 5px;
     width: 50px;
     height: 40px;
 }
+
 QPushButton#yellow:hover
 {
-   background-image: url(":/ui/videoButton/videoButtonYellowHover.png");
+    background-color: #e8e774;
 }
 
 QPushButton#yellow:pressed
 {
-   background-image: url(":/ui/videoButton/videoButtonYellowPressed.png");
+    background-color: #e3e155;
 }
 
 QPushButton#grey
 {
-    background-color: transparent;
-    background-image: url(":/ui/videoButton/videoButtonDisabled.png");
-    background-repeat: none;    
+    background-color: #919191;
+    background-image: url(":/ui/videoButton/videoButton.svg");
+    background-repeat: none;
+    background-position: center;
     border: none;
+    border-radius: 5px;
     width: 50px;
     height: 40px;
 }
 
-QPushButton:focus {
+QPushButton:focus
+{
     outline: none;
 }
diff --git a/ui/videoButton/videoButton.png b/ui/videoButton/videoButton.png
deleted file mode 100644
index 1003411f4..000000000
Binary files a/ui/videoButton/videoButton.png and /dev/null differ
diff --git a/ui/videoButton/videoButton.svg b/ui/videoButton/videoButton.svg
new file mode 100644
index 000000000..9d243f378
--- /dev/null
+++ b/ui/videoButton/videoButton.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   version="1.1"
+   width="25"
+   height="15"
+   viewBox="0 0 25 15"
+   id="Layer_1"
+   xml:space="preserve"><metadata
+     id="metadata13"><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="defs11" /><g
+     transform="matrix(1.1065089,0,0,1.0395229,0,0.03502821)"
+     id="g3"><path
+       d="m 8.845,2 c 0,-1.1 0.9,-2 2,-2 h 9.78 c 1.1,0 2,0.9 2,2 v 10.396 c 0,1.1 -0.9,2 -2,2 h -9.78 c -1.1,0 -2,-0.9 -2,-2 V 2 z"
+       id="path5"
+       style="fill:#ffffff" /><polygon
+       points="0,12.916 7.509,8.581 7.509,5.814 0,1.48 "
+       id="polygon7"
+       style="fill:#ffffff" /></g></svg>
\ No newline at end of file
diff --git a/ui/videoButton/videoButtonDisabled.png b/ui/videoButton/videoButtonDisabled.png
deleted file mode 100644
index af801d302..000000000
Binary files a/ui/videoButton/videoButtonDisabled.png and /dev/null differ
diff --git a/ui/videoButton/videoButtonHover.png b/ui/videoButton/videoButtonHover.png
deleted file mode 100644
index aeb364120..000000000
Binary files a/ui/videoButton/videoButtonHover.png and /dev/null differ
diff --git a/ui/videoButton/videoButtonPressed.png b/ui/videoButton/videoButtonPressed.png
deleted file mode 100644
index 64bf78c39..000000000
Binary files a/ui/videoButton/videoButtonPressed.png and /dev/null differ
diff --git a/ui/videoButton/videoButtonRed.png b/ui/videoButton/videoButtonRed.png
deleted file mode 100644
index 0599d252f..000000000
Binary files a/ui/videoButton/videoButtonRed.png and /dev/null differ
diff --git a/ui/videoButton/videoButtonRedHover.png b/ui/videoButton/videoButtonRedHover.png
deleted file mode 100644
index e535a8cf2..000000000
Binary files a/ui/videoButton/videoButtonRedHover.png and /dev/null differ
diff --git a/ui/videoButton/videoButtonRedPressed.png b/ui/videoButton/videoButtonRedPressed.png
deleted file mode 100644
index 4fbaac701..000000000
Binary files a/ui/videoButton/videoButtonRedPressed.png and /dev/null differ
diff --git a/ui/videoButton/videoButtonYellow.png b/ui/videoButton/videoButtonYellow.png
deleted file mode 100644
index 71b5410b4..000000000
Binary files a/ui/videoButton/videoButtonYellow.png and /dev/null differ
diff --git a/ui/videoButton/videoButtonYellowHover.png b/ui/videoButton/videoButtonYellowHover.png
deleted file mode 100644
index f1bd79884..000000000
Binary files a/ui/videoButton/videoButtonYellowHover.png and /dev/null differ
diff --git a/ui/videoButton/videoButtonYellowPressed.png b/ui/videoButton/videoButtonYellowPressed.png
deleted file mode 100644
index 8c92af789..000000000
Binary files a/ui/videoButton/videoButtonYellowPressed.png and /dev/null differ
diff --git a/ui/window/applicationIcon.png b/ui/window/applicationIcon.png
deleted file mode 100644
index b9cbe71bf..000000000
Binary files a/ui/window/applicationIcon.png and /dev/null differ
diff --git a/ui/window/statusPanel.css b/ui/window/statusPanel.css
index 536c50918..158eae70e 100644
--- a/ui/window/statusPanel.css
+++ b/ui/window/statusPanel.css
@@ -39,26 +39,6 @@ QLineEdit
     height: 40px;
 }
 
-#statusPanel > #statusHead > #statusButton[status="online"]
-{
-  image: url(":ui/statusButton/dot_online.png") center center;
-}
-
-#statusPanel > #statusHead > #statusButton[status="away"]
-{
-  image: url(":ui/statusButton/dot_idle.png") center center;
-}
-
-#statusPanel > #statusHead > #statusButton[status="busy"]
-{
-  image: url(":ui/statusButton/dot_busy.png") center center;
-}
-
-#statusPanel > #statusHead > #statusButton[status="offline"]
-{
-  image: url(":ui/statusButton/dot_away.png") center center;
-}
-
 /*Bugged in Qt, but it's probably better to leave enabled so that users can tell it's clickable*/
 #statusPanel > #statusHead > #statusButton:hover 
 {