diff --git a/mailnag.png b/mailnag.png
deleted file mode 100644
index 1a0fc09..0000000
Binary files a/mailnag.png and /dev/null differ
diff --git a/mailnag.svg b/mailnag.svg
new file mode 100644
index 0000000..37898e5
--- /dev/null
+++ b/mailnag.svg
@@ -0,0 +1,276 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg7485"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="drawing-1.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs7487">
+    <linearGradient
+       id="linearGradient2378">
+      <stop
+         id="stop2380"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#fefede;stop-opacity:0.91836733;"
+         offset="0.25"
+         id="stop4146" />
+      <stop
+         style="stop-color:#f5f328;stop-opacity:1;"
+         offset="0.5"
+         id="stop2386" />
+      <stop
+         id="stop2382"
+         offset="1"
+         style="stop-color:#f5f32d;stop-opacity:0.12234043;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2378"
+       id="radialGradient11030"
+       gradientUnits="userSpaceOnUse"
+       cx="38.658855"
+       cy="9.3411446"
+       fx="38.658855"
+       fy="9.3411446"
+       r="8.341651" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6934">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0"
+         id="stop6936" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:0"
+         offset="1"
+         id="stop6938" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6934"
+       id="linearGradient11028"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.4e-6,-42.999999)"
+       x1="14.125"
+       y1="79.81311"
+       x2="14.125"
+       y2="75.499176" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6945"
+       id="radialGradient11026"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.6083242,0,0,2.218814,-74.941381,-118.61799)"
+       cx="13.107393"
+       cy="61.48016"
+       fx="13.107393"
+       fy="61.48016"
+       r="18.5" />
+    <linearGradient
+       id="linearGradient7063"
+       inkscape:collect="always">
+      <stop
+         id="stop7065"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop7067"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7063"
+       id="linearGradient11024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.0000014,-0.999999)"
+       x1="12.875"
+       y1="35.314098"
+       x2="12.875"
+       y2="15.75" />
+    <linearGradient
+       id="linearGradient6945"
+       inkscape:collect="always">
+      <stop
+         id="stop6947"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop6949"
+         offset="1"
+         style="stop-color:#d3d7cf;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6945"
+       id="radialGradient11022"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.0135589,0,0,1.7460565,-13.669487,-10.185984)"
+       cx="12.5"
+       cy="15.927882"
+       fx="12.5"
+       fy="15.927882"
+       r="18.5" />
+    <filter
+       inkscape:collect="always"
+       x="-0.08625"
+       width="1.1725"
+       y="-0.11896552"
+       height="1.237931"
+       id="filter12483">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.725"
+         id="feGaussianBlur12485" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="641"
+     inkscape:window-height="690"
+     inkscape:window-x="1037"
+     inkscape:window-y="331" />
+  <metadata
+     id="metadata7490">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g8253">
+      <path
+         transform="translate(1,0)"
+         d="M 7.03125,9.5 C 5.1085549,9.5 3.5,11.108554 3.5,13.03125 L 3.5,34.96875 C 3.5,36.891446 5.1085548,38.5 7.03125,38.5 L 39.96875,38.5 C 41.891445,38.5 43.499998,36.891442 43.5,34.96875 L 43.5,13.03125 C 43.5,11.108552 41.891446,9.5 39.96875,9.5 L 7.03125,9.5 z"
+         id="path10994"
+         style="fill:#fce94f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642;filter:url(#filter12483)"
+         inkscape:original="M 7.03125 11.5 C 6.1813674 11.5 5.5 12.181367 5.5 13.03125 L 5.5 34.96875 C 5.5 35.818633 6.1813677 36.5 7.03125 36.5 L 39.96875 36.5 C 40.818633 36.5 41.499999 35.818633 41.5 34.96875 L 41.5 13.03125 C 41.5 12.181367 40.818631 11.5 39.96875 11.5 L 7.03125 11.5 z "
+         inkscape:radius="2.0072105"
+         sodipodi:type="inkscape:offset" />
+      <g
+         transform="translate(1,0)"
+         id="g10996">
+        <rect
+           style="fill:url(#radialGradient11022);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
+           id="rect10998"
+           width="36"
+           height="25"
+           x="5.4999986"
+           y="11.5"
+           rx="1.5340841"
+           ry="1.5340841" />
+        <path
+           style="opacity:0.23134329;fill:url(#linearGradient11024);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+           d="M 6.9062486,11.937501 C 6.3569706,11.937501 5.9374986,12.356971 5.9374986,12.906251 L 5.9374986,14.312501 L 15.031249,25.906251 L 16.156249,24.656251 C 16.625622,24.186877 17.090599,23.571267 18.124999,23.156251 C 19.159399,22.741235 20.708639,22.500001 23.499999,22.500001 C 26.280131,22.5 27.838453,22.741632 28.874999,23.156251 C 29.911545,23.57087 30.373046,24.185548 30.843749,24.656251 L 31.968749,25.906251 L 41.062499,14.312501 L 41.062499,12.906251 C 41.062499,12.356973 40.643029,11.937501 40.093749,11.937501 L 6.9062486,11.937501 z"
+           id="path11000"
+           sodipodi:nodetypes="cccccssscccccc" />
+        <path
+           style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 5.9999986,36.000001 L 16.156249,24.656251 C 16.625622,24.186877 17.090599,23.571267 18.124999,23.156251 C 19.159399,22.741235 20.708639,22.500001 23.499999,22.500001 C 26.280131,22.5 27.838453,22.741632 28.874999,23.156251 C 29.911545,23.57087 30.373046,24.185548 30.843749,24.656251 L 40.999999,36.000001 L 30.843749,25.656251 C 28.799742,23.686657 26.325502,23.384094 23.499999,23.500001 C 20.829149,23.549541 18.035696,23.499671 16.156249,25.656251 L 5.9999986,36.000001 z"
+           id="path11002"
+           sodipodi:nodetypes="ccssscccccc" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 5.9999986,36.0215 L 16.156249,26.67775 C 18.035696,24.52117 20.829149,24.57104 23.499999,24.5215 C 26.325502,24.405593 28.799742,24.708156 30.843749,26.67775 L 40.999999,36.0215 L 30.843749,25.67775 C 28.799742,23.708156 26.325502,23.405593 23.499999,23.5215 C 20.829149,23.57104 18.035696,23.52117 16.156249,25.67775 L 5.9999986,36.0215 z"
+           id="path11004"
+           sodipodi:nodetypes="ccccccccc" />
+        <path
+           sodipodi:type="inkscape:offset"
+           inkscape:radius="-0.44194174"
+           inkscape:original="M -42.09375 12.5 C -42.877224 12.5 -43.5 13.122774 -43.5 13.90625 L -43.5 15.5 L -32.5 26.5 C -31.5 27.500002 -31.022703 28.5 -25.5 28.5 C -20 28.500002 -19.5 27.5 -18.5 26.5 L -7.5 15.5 L -7.5 13.90625 C -7.5 13.122776 -8.122774 12.5 -8.90625 12.5 L -42.09375 12.5 z "
+           style="fill:url(#radialGradient11026);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path11006"
+           d="M -42.09375,12.9375 C -42.643028,12.9375 -43.0625,13.35697 -43.0625,13.90625 L -43.0625,15.3125 L -32.1875,26.1875 C -31.660276,26.714725 -31.377256,27.12932 -30.53125,27.46875 C -29.685244,27.80818 -28.234677,28.0625 -25.5,28.0625 C -22.776784,28.062501 -21.318209,27.808534 -20.46875,27.46875 C -19.619291,27.128966 -19.338542,26.713542 -18.8125,26.1875 L -7.9375,15.3125 L -7.9375,13.90625 C -7.9375,13.356972 -8.3569702,12.9375 -8.90625,12.9375 L -42.09375,12.9375 z"
+           transform="translate(48.999999,-0.999999)" />
+        <path
+           style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 5.9999986,14.500001 L 16.156249,25.843751 C 16.625622,26.313125 17.090599,26.928735 18.124999,27.343751 C 19.159399,27.758767 20.708639,28.000001 23.499999,28.000001 C 26.280131,28.000002 27.838453,27.75837 28.874999,27.343751 C 29.911545,26.929132 30.373046,26.314454 30.843749,25.843751 L 40.999999,14.500001 L 30.843749,24.843751 C 28.799742,26.813345 26.325502,27.115908 23.499999,27.000001 C 20.829149,26.950461 18.035696,27.000331 16.156249,24.843751 L 5.9999986,14.500001 z"
+           id="path11008"
+           sodipodi:nodetypes="ccssscccccc" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 5.9999986,14.500001 L 16.156249,23.843751 C 18.035696,26.000331 20.829149,25.950461 23.499999,26.000001 C 26.325502,26.115908 28.799742,25.813345 30.843749,23.843751 L 40.999999,14.500001 L 30.843749,24.843751 C 28.799742,26.813345 26.325502,27.115908 23.499999,27.000001 C 20.829149,26.950461 18.035696,27.000331 16.156249,24.843751 L 5.9999986,14.500001 z"
+           id="path11010"
+           sodipodi:nodetypes="ccccccccc" />
+        <path
+           sodipodi:type="inkscape:offset"
+           inkscape:radius="-0.99436891"
+           inkscape:original="M 6.90625 54.5 C 6.1227756 54.5 5.5 55.122774 5.5 55.90625 L 5.5 78.09375 C 5.5 78.877224 6.1227756 79.499998 6.90625 79.5 L 40.09375 79.5 C 40.877224 79.5 41.5 78.877224 41.5 78.09375 L 41.5 55.90625 C 41.5 55.122776 40.877226 54.5 40.09375 54.5 L 6.90625 54.5 z "
+           style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
+           id="path11012"
+           d="M 6.90625,55.5 C 6.6497165,55.5 6.5,55.649715 6.5,55.90625 L 6.5,78.09375 C 6.5,78.350281 6.6497152,78.499999 6.90625,78.5 L 40.09375,78.5 C 40.350281,78.5 40.5,78.350281 40.5,78.09375 L 40.5,55.90625 C 40.5,55.649717 40.350284,55.5 40.09375,55.5 L 6.90625,55.5 z"
+           transform="translate(-1.4e-6,-42.999999)" />
+        <path
+           style="opacity:0.55597014;fill:url(#linearGradient11028);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0.69999992;stroke-opacity:0.99236642"
+           d="M 5.9999986,31.906251 L 5.9999986,35.093751 C 5.9999986,35.614758 6.3852396,36 6.9062486,36.000001 L 40.093749,36.000001 C 40.614759,36.000001 40.999999,35.614758 40.999999,35.093751 L 40.999999,31.906251 L 5.9999986,31.906251 z"
+           id="path11014"
+           sodipodi:nodetypes="ccccccc" />
+      </g>
+      <g
+         id="g11016"
+         transform="matrix(0.9904451,0,0,0.9904451,-3.51131,3.31233)"
+         style="display:inline">
+        <path
+           sodipodi:type="arc"
+           style="fill:url(#radialGradient11030);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+           id="path11018"
+           sodipodi:cx="38.658855"
+           sodipodi:cy="9.3411446"
+           sodipodi:rx="8.341651"
+           sodipodi:ry="8.341651"
+           d="M 47.000506,9.3411446 A 8.341651,8.341651 0 1 1 30.317204,9.3411446 A 8.341651,8.341651 0 1 1 47.000506,9.3411446 z"
+           transform="matrix(1.14985,0,0,1.14985,-6.073881,0.554685)" />
+        <path
+           sodipodi:type="star"
+           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+           id="path11020"
+           sodipodi:sides="5"
+           sodipodi:cx="36.9375"
+           sodipodi:cy="11.125"
+           sodipodi:r1="8.755579"
+           sodipodi:r2="5.0676599"
+           sodipodi:arg1="0.52359878"
+           sodipodi:arg2="1.1519173"
+           inkscape:flatsided="false"
+           inkscape:rounded="0.18352206"
+           inkscape:randomized="0"
+           d="M 44.520054,15.50279 C 44.012883,16.381236 39.925351,15.341967 38.998703,15.754538 C 38.072055,16.167108 36.109289,19.900142 35.117113,19.689249 C 34.124936,19.478355 33.850222,15.26973 33.171495,14.515926 C 32.492767,13.762123 28.335913,13.048993 28.229885,12.040207 C 28.123857,11.031421 32.041607,9.4696164 32.548778,8.5911701 C 33.055949,7.7127238 32.449637,3.5389508 33.376285,3.1263806 C 34.302933,2.7138103 36.998949,5.957187 37.991126,6.1680807 C 38.983302,6.3789743 42.765436,4.5125708 43.444163,5.2663741 C 44.122891,6.0201775 41.871371,9.5864995 41.977399,10.595285 C 42.083426,11.604071 45.027225,14.624343 44.520054,15.50279 z"
+           transform="matrix(0.674116,0.299577,-0.299577,0.674116,16.98558,-7.128679)" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/mailnag_config.desktop.desktop b/mailnag_config.desktop.desktop
index 771e403..d73e4ba 100644
--- a/mailnag_config.desktop.desktop
+++ b/mailnag_config.desktop.desktop
@@ -5,7 +5,7 @@ Name[de]=Mailnag Configuration
 Comment=A notifier for new emails
 Comment[de]=Ein Benachrichtiger für neue Emails
 Exec=/usr/share/mailnag/mailnag_config.sh
-Icon=/usr/share/mailnag/mailnag_icon.png
+Icon=/usr/share/mailnag/mailnag.svg
 Terminal=false
 Type=Application
 Categories=Network;
diff --git a/mailnag_config.glade b/mailnag_config.glade
index 6b0ba29..041d863 100644
--- a/mailnag_config.glade
+++ b/mailnag_config.glade
@@ -16,7 +16,7 @@
     <property name="title" translatable="yes">Mailnag Configuration</property>
     <property name="resizable">False</property>
     <property name="window_position">center</property>
-    <property name="icon">mailnag.png</property>
+    <property name="icon">mailnag.svg</property>
     <signal name="destroy" handler="gtk_main_quit"/>
     <child>
       <object class="GtkVBox" id="vbox">
@@ -32,7 +32,7 @@
                 <child>
                   <object class="GtkImage" id="image_logo">
                     <property name="visible">True</property>
-                    <property name="pixbuf">mailnag.png</property>
+                    <property name="pixbuf">mailnag.svg</property>
                   </object>
                 </child>
                 <child>
diff --git a/mailnag_config.py b/mailnag_config.py
index e4d7de0..e710afb 100644
--- a/mailnag_config.py
+++ b/mailnag_config.py
@@ -1092,7 +1092,7 @@ class DesktopDisplay(gtk.Window):										# displays a transparent frameless wi
 		self.set_app_paintable(True)									# no window border
 		self.set_decorated(False)
 		self.set_position(gtk.WIN_POS_CENTER)
-		pixbuf = gtk.gdk.pixbuf_new_from_file('mailnag.png')				# get icon from png
+		pixbuf = gtk.gdk.pixbuf_new_from_file('mailnag.svg')
 		self.set_icon(pixbuf)											# set window icon
 		pos_x = int(cfg.get('dd', 'pos_x'))
 		pos_y = int(cfg.get('dd', 'pos_y'))
diff --git a/mailnag_icon.png b/mailnag_icon.png
deleted file mode 100644
index 16f1082..0000000
Binary files a/mailnag_icon.png and /dev/null differ
diff --git a/mailnag_keyring.glade b/mailnag_keyring.glade
index 9b75bc3..68a65b7 100644
--- a/mailnag_keyring.glade
+++ b/mailnag_keyring.glade
@@ -10,7 +10,7 @@
     <property name="default_width">250</property>
     <property name="default_height">150</property>
     <property name="destroy_with_parent">True</property>
-    <property name="icon">mailnag_icon.png</property>
+    <property name="icon">mailnag.svg</property>
     <property name="type_hint">dialog</property>
     <property name="urgency_hint">True</property>
     <child internal-child="vbox">