PNG images replaced with SVG

Closes #1050
11 years ago · c6312fd196
143 changed files with 1064 additions and 338 deletions
--- a/img/add.png
+++ b/img/add.png
--- a/img/add.svg
+++ 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>
--- a/img/avatar_mask.png
+++ b/img/avatar_mask.png
--- a/img/avatar_mask.svg
+++ 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>
--- a/img/contact.png
+++ b/img/contact.png
--- a/img/contact.svg
+++ 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>
--- a/img/contact_dark.png
+++ b/img/contact_dark.png
--- a/img/contact_dark.svg
+++ 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>
--- a/img/group.png
+++ b/img/group.png
--- a/img/group.svg
+++ 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>
--- a/img/group_2x.png
+++ b/img/group_2x.png
--- a/img/group_button.png
+++ b/img/group_button.png
--- a/img/group_dark.png
+++ b/img/group_dark.png
--- a/img/group_dark.svg
+++ 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>
--- a/img/icon.png
+++ b/img/icon.png
--- a/img/settings.png
+++ b/img/settings.png
--- a/img/settings.svg
+++ 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>
--- a/img/status/dot_away.png
+++ b/img/status/dot_away.png
--- a/img/status/dot_away.svg
+++ 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>
--- a/img/status/dot_away_2x.png
+++ b/img/status/dot_away_2x.png
--- a/img/status/dot_away_notification.png
+++ b/img/status/dot_away_notification.png
--- a/img/status/dot_away_notification.svg
+++ 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>
--- a/img/status/dot_busy.png
+++ b/img/status/dot_busy.png
--- a/img/status/dot_busy.svg
+++ 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>
--- a/img/status/dot_busy_2x.png
+++ b/img/status/dot_busy_2x.png
--- a/img/status/dot_busy_notification.png
+++ b/img/status/dot_busy_notification.png
--- a/img/status/dot_busy_notification.svg
+++ 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>
--- a/img/status/dot_groupchat.png
+++ b/img/status/dot_groupchat.png
--- a/img/status/dot_groupchat.svg
+++ 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>
--- a/img/status/dot_groupchat_newmessages.png
+++ b/img/status/dot_groupchat_newmessages.png
--- a/img/status/dot_groupchat_newmessages.svg
+++ 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>
--- a/img/status/dot_groupchat_notification.png
+++ b/img/status/dot_groupchat_notification.png
--- a/img/status/dot_groupchat_notification.svg
+++ 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>
--- a/img/status/dot_idle.png
+++ b/img/status/dot_idle.png
--- a/img/status/dot_idle_2x.png
+++ b/img/status/dot_idle_2x.png
--- a/img/status/dot_idle_notification.png
+++ b/img/status/dot_idle_notification.png
--- a/img/status/dot_invisible.svg
+++ 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>
--- a/img/status/dot_offline.svg
+++ 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>
--- a/img/status/dot_offline_notification.svg
+++ 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>
--- a/img/status/dot_online.png
+++ b/img/status/dot_online.png
--- a/img/status/dot_online.svg
+++ 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>
--- a/img/status/dot_online_2x.png
+++ b/img/status/dot_online_2x.png
--- a/img/status/dot_online_notification.png
+++ b/img/status/dot_online_notification.png
--- a/img/status/dot_online_notification.svg
+++ 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>
--- 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"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<!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"
+<svg
-	 viewBox="0 0 16.1 16" enable-background="new 0 0 16.1 16" xml:space="preserve">
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
-<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
+   xmlns:cc="http://creativecommons.org/ns#"
-	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
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	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"/>
+   xmlns:svg="http://www.w3.org/2000/svg"
-<g>
+   xmlns="http://www.w3.org/2000/svg"
-	<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
+   version="1.1"
-		 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
+   width="100%"
-		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
+   height="100%"
-		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
+   viewBox="0 0 16.1 16"
-		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
+   id="Layer_1"
-		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
+   xml:space="preserve"><metadata
-		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
+     id="metadata13"><rdf:RDF><cc:Work
-		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
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-		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
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-		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
+     id="defs11" /><path
-		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"/>
+     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"
-</g>
+     id="path3"
-</svg>
+     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>
--- a/img/transfer.png
+++ b/img/transfer.png
--- a/img/transfer.svg
+++ 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>
--- 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/add.svg</file>
-        <file>img/avatar_mask.png</file>
+        <file>img/avatar_mask.svg</file>
-        <file>img/contact.png</file>
+        <file>img/contact.svg</file>
-        <file>img/contact_dark.png</file>
+        <file>img/contact_dark.svg</file>
-        <file>img/group.png</file>
+        <file>img/group.svg</file>
-        <file>img/group_2x.png</file>
+        <file>img/group_dark.svg</file>
-        <file>img/group_button.png</file>
+        <file>img/icons/qtox.svg</file>
-        <file>img/group_dark.png</file>
+        <file>img/settings.svg</file>
        <file>img/icon.png</file>
        <file>img/settings.png</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.svg</file>
-        <file>img/status/dot_away_2x.png</file>
+        <file>img/status/dot_away_notification.svg</file>
-        <file>img/status/dot_away_notification.png</file>
+        <file>img/status/dot_busy.svg</file>
-        <file>img/status/dot_busy.png</file>
+        <file>img/status/dot_busy_notification.svg</file>
-        <file>img/status/dot_busy_2x.png</file>
+        <file>img/status/dot_groupchat.svg</file>
-        <file>img/status/dot_busy_notification.png</file>
+        <file>img/status/dot_groupchat_newmessages.svg</file>
-        <file>img/status/dot_groupchat.png</file>
+        <file>img/status/dot_groupchat_notification.svg</file>
-        <file>img/status/dot_groupchat_newmessages.png</file>
+        <file>img/status/dot_offline.svg</file>
-        <file>img/status/dot_groupchat_notification.png</file>
+        <file>img/status/dot_offline_notification.svg</file>
-        <file>img/status/dot_idle.png</file>
+        <file>img/status/dot_online.svg</file>
-        <file>img/status/dot_idle_2x.png</file>
+        <file>img/status/dot_online_notification.svg</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/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/fileTransferWidget/fileDone.svg</file>
        <file>ui/acceptFileButton/hover.png</file>
        <file>ui/acceptFileButton/pressed.png</file>
        <file>ui/acceptFileButton/style.css</file>
        <file>ui/callButton/callButton.css</file>
-        <file>ui/callButton/callButton.png</file>
+        <file>ui/callButton/callButton.svg</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/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/scrollBarUpArrow.svg</file>
-        <file>ui/chatArea/scrollBarDownArrowHover.png</file>
+        <file>ui/chatArea/scrollBarDownArrow.svg</file>
-        <file>ui/chatArea/scrollBarDownArrowPressed.png</file>
+        <file>ui/chatArea/scrollBarLeftArrow.svg</file>
-        <file>ui/chatArea/scrollBarHandle.png</file>
+        <file>ui/chatArea/scrollBarRightArrow.svg</file>
        <file>ui/chatArea/scrollBarUpArrow.png</file>
        <file>ui/chatArea/scrollBarUpArrowHover.png</file>
        <file>ui/chatArea/scrollBarUpArrowPressed.png</file>
        <file>ui/chatroomWidgets/genericChatroomWidget.css</file>
        <file>ui/emoteButton/emoteButton.css</file>
-        <file>ui/emoteButton/emoteButton.png</file>
+        <file>ui/emoteButton/emoteButton.svg</file>
-        <file>ui/emoteButton/emoteButtonHover.png</file>
+        <file>ui/emoticonWidget/dot_page.svg</file>
-        <file>ui/emoteButton/emoteButtonPressed.png</file>
+        <file>ui/emoticonWidget/dot_page_current.svg</file>
-        <file>ui/emoticonWidget/dot_page.png</file>
+        <file>ui/emoticonWidget/dot_page_hover.svg</file>
        <file>ui/emoticonWidget/dot_page_current.png</file>
        <file>ui/emoticonWidget/dot_page_hover.png</file>
        <file>ui/emoticonWidget/emoticonWidget.css</file>
        <file>ui/fileButton/fileButton.css</file>
-        <file>ui/fileButton/fileButton.png</file>
+        <file>ui/fileButton/fileButton.svg</file>
        <file>ui/fileButton/fileButtonHover.png</file>
        <file>ui/fileButton/fileButtonPressed.png</file>
        <file>ui/fileButton/fileButtonDisabled.png</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/sendButton.svg</file>
        <file>ui/sendButton/sendButtonHover.png</file>
        <file>ui/sendButton/sendButtonPressed.png</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/statusButton/menu_indicator.svg</file>
        <file>ui/stopFileButton/hover.png</file>
        <file>ui/stopFileButton/pressed.png</file>
        <file>ui/stopFileButton/style.css</file>
        <file>ui/videoButton/videoButton.css</file>
-        <file>ui/videoButton/videoButton.png</file>
+        <file>ui/videoButton/videoButton.svg</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/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/acceptCall/acceptCall.svg</file>
-        <file>ui/rejectCall/rejectCall.png</file>
+        <file>ui/rejectCall/rejectCall.svg</file>
        <file>ui/volButton/volButtonDisabled.png</file>
    </qresource>
 </RCC>
--- 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())
--- 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>
--- 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;
 }
--- 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;
--- 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"));
+    accept->setIcon(QIcon(":/ui/acceptCall/acceptCall.svg"));
-    reject->setIcon(QIcon(":/ui/rejectCall/rejectCall.png"));
+    reject->setIcon(QIcon(":/ui/rejectCall/rejectCall.svg"));
    accept->setIconSize(accept->size());
    reject->setIconSize(reject->size());
--- 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)
--- 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);
 }
--- 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();
--- 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");
--- 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()));
--- 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);
+    avatar->setPixmap(QPixmap(":img/contact.svg"), Qt::transparent);
-    statusPic.setPixmap(QPixmap(":img/status/dot_away.png"));
+    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)
--- 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
--- 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);
+    avatar->setPixmap(Style::scaleSvgImage(":img/group.svg", avatar->width(), avatar->height()), Qt::transparent);
-    statusPic.setPixmap(QPixmap(":img/status/dot_online.png"));
+    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)
--- 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();
--- 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 = new MaskablePixmapWidget(this, QSize(40, 40), ":/img/avatar_mask.svg");
-    profilePicture->setPixmap(QPixmap(":/img/contact_dark.png"));
+    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");
+    onStatusSet(Status::Offline);
    Style::repolish(ui->statusButton);
    // 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();
+    beforeDisconnect = getStatusFromString(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;
    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
+    ui->statusButton->setProperty("status", getStatusTitle(status));
-    //prevent the button icon from moving when pressed otherwise
+    ui->statusButton->setIcon(getStatusIcon(status, 10, 10));
    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;
    }
    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;
 }
--- 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();
--- a/ui/acceptCall/acceptCall.png
+++ b/ui/acceptCall/acceptCall.png
--- a/ui/acceptFileButton/default.png
+++ b/ui/acceptFileButton/default.png
--- a/ui/acceptFileButton/hover.png
+++ b/ui/acceptFileButton/hover.png
--- a/ui/acceptFileButton/pressed.png
+++ b/ui/acceptFileButton/pressed.png
--- a/ui/acceptFileButton/style.css
+++ b/ui/acceptFileButton/style.css
@ -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;
 }
--- a/ui/callButton/callButton.css
+++ b/ui/callButton/callButton.css
@ -1,72 +1,83 @@
 QPushButton#green
 {
-    background-color: transparent;
+    background-color: #6bc260;
-    background-image: url(":/ui/callButton/callButton.png");
+    background-image: url(":/ui/callButton/callButton.svg");
-    background-repeat: none;    
+    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-color: #c84e4e;
-    background-image: url(":/ui/callButton/callButtonRed.png");
+    background-image: url(":/ui/callButton/callButton.svg");
-    background-repeat: none;    
+    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-color: #e6e465;
-    background-image: url(":/ui/callButton/callButtonYellow.png");
+    background-image: url(":/ui/callButton/callButton.svg");
-    background-repeat: none;    
+    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-color: #919191;
-    background-image: url(":/ui/callButton/callButtonDisabled.png");
+    background-image: url(":/ui/callButton/callButton.svg");
-    background-repeat: none;    
+    background-repeat: none;
    background-position: center;
    border: none;
    border-radius: 5px;
    width: 50px;
    height: 40px;
 }
-QPushButton:focus {
+QPushButton:focus
 {
    outline: none;
 }
--- a/ui/callButton/callButton.png
+++ b/ui/callButton/callButton.png
--- a/ui/callButton/callButton.svg
+++ 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>
--- a/ui/callButton/callButtonDisabled.png
+++ b/ui/callButton/callButtonDisabled.png
--- a/ui/callButton/callButtonHover.png
+++ b/ui/callButton/callButtonHover.png
--- a/ui/callButton/callButtonPressed.png
+++ b/ui/callButton/callButtonPressed.png
--- a/ui/callButton/callButtonRed.png
+++ b/ui/callButton/callButtonRed.png
--- a/ui/callButton/callButtonRedHover.png
+++ b/ui/callButton/callButtonRedHover.png
--- a/ui/callButton/callButtonRedPressed.png
+++ b/ui/callButton/callButtonRedPressed.png
--- a/ui/callButton/callButtonYellow.png
+++ b/ui/callButton/callButtonYellow.png
--- a/ui/callButton/callButtonYellowHover.png
+++ b/ui/callButton/callButtonYellowHover.png
--- a/ui/callButton/callButtonYellowPressed.png
+++ b/ui/callButton/callButtonYellowPressed.png
--- a/ui/chatArea/scrollBarDownArrow.png
+++ b/ui/chatArea/scrollBarDownArrow.png
--- a/ui/chatArea/scrollBarDownArrow.svg
+++ 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>
--- a/ui/chatArea/scrollBarDownArrowHover.png
+++ b/ui/chatArea/scrollBarDownArrowHover.png
--- a/ui/chatArea/scrollBarDownArrowPressed.png
+++ b/ui/chatArea/scrollBarDownArrowPressed.png
--- a/ui/chatArea/scrollBarHandle.png
+++ b/ui/chatArea/scrollBarHandle.png
--- a/ui/chatArea/scrollBarLeftArrow.svg
+++ 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>
--- a/ui/chatArea/scrollBarRightArrow.svg
+++ 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>
--- a/ui/chatArea/scrollBarUpArrow.png
+++ b/ui/chatArea/scrollBarUpArrow.png
--- a/ui/chatArea/scrollBarUpArrow.svg
+++ 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>
--- a/ui/chatArea/scrollBarUpArrowHover.png
+++ b/ui/chatArea/scrollBarUpArrowHover.png
--- a/ui/chatArea/scrollBarUpArrowPressed.png
+++ b/ui/chatArea/scrollBarUpArrowPressed.png
--- a/ui/emoteButton/emoteButton.css
+++ b/ui/emoteButton/emoteButton.css
@ -1,22 +1,26 @@
 QPushButton
 {
-    background-color: transparent;
+    background-color: #6bc260;
-    background-image: url(":/ui/emoteButton/emoteButton.png");
+    background-image: url(":/ui/emoteButton/emoteButton.svg");
-    background-repeat: none;    
+    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;
 }
--- a/ui/emoteButton/emoteButton.png
+++ b/ui/emoteButton/emoteButton.png
--- a/ui/emoteButton/emoteButton.svg
+++ 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>
--- a/ui/emoteButton/emoteButtonHover.png
+++ b/ui/emoteButton/emoteButtonHover.png
--- a/ui/emoteButton/emoteButtonPressed.png
+++ b/ui/emoteButton/emoteButtonPressed.png
--- a/ui/emoticonWidget/dot_page.png
+++ b/ui/emoticonWidget/dot_page.png
--- a/ui/emoticonWidget/dot_page.svg
+++ 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>
--- a/ui/emoticonWidget/dot_page_current.png
+++ b/ui/emoticonWidget/dot_page_current.png
--- a/Show More
+++ b/Show More