diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar.xcodeproj/project.pbxproj b/DNSCrypt-Menubar/DNSCrypt-Menubar.xcodeproj/project.pbxproj
index 5d57ba4..ee5e60b 100644
--- a/DNSCrypt-Menubar/DNSCrypt-Menubar.xcodeproj/project.pbxproj
+++ b/DNSCrypt-Menubar/DNSCrypt-Menubar.xcodeproj/project.pbxproj
@@ -8,17 +8,12 @@
 
 /* Begin PBXBuildFile section */
 		091360731C88418E00F308D3 /* dnscrypt.iconset in Resources */ = {isa = PBXBuildFile; fileRef = 091360721C88418E00F308D3 /* dnscrypt.iconset */; };
-		098E725E1905DF4C00C8CC6E /* icon-dnscrypt-active.png in Resources */ = {isa = PBXBuildFile; fileRef = 098E72581905DF4C00C8CC6E /* icon-dnscrypt-active.png */; };
-		098E72601905DF4C00C8CC6E /* icon-dnscrypt-inactive.png in Resources */ = {isa = PBXBuildFile; fileRef = 098E725A1905DF4C00C8CC6E /* icon-dnscrypt-inactive.png */; };
-		098E72621905DF4C00C8CC6E /* icon-no-network.png in Resources */ = {isa = PBXBuildFile; fileRef = 098E725C1905DF4C00C8CC6E /* icon-no-network.png */; };
-		098E72671905E1A700C8CC6E /* icon-dnscrypt-active@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 098E72641905E1A700C8CC6E /* icon-dnscrypt-active@2x.png */; };
-		098E72681905E1A700C8CC6E /* icon-dnscrypt-inactive@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 098E72651905E1A700C8CC6E /* icon-dnscrypt-inactive@2x.png */; };
-		098E72691905E1A700C8CC6E /* icon-no-network@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 098E72661905E1A700C8CC6E /* icon-no-network@2x.png */; };
 		09A13AD2145F3B9000B227A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A13AD1145F3B9000B227A4 /* Cocoa.framework */; };
 		09A13ADC145F3B9000B227A4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 09A13ADA145F3B9000B227A4 /* InfoPlist.strings */; };
 		09A13ADE145F3B9000B227A4 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 09A13ADD145F3B9000B227A4 /* main.m */; };
 		09A13AE5145F3B9000B227A4 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 09A13AE4145F3B9000B227A4 /* AppDelegate.m */; };
 		09A13AE8145F3B9000B227A4 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 09A13AE6145F3B9000B227A4 /* MainMenu.xib */; };
+		F622E21B1C88C76800721313 /* Icons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F622E21A1C88C76800721313 /* Icons.xcassets */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -35,12 +30,6 @@
 
 /* Begin PBXFileReference section */
 		091360721C88418E00F308D3 /* dnscrypt.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; path = dnscrypt.iconset; sourceTree = "<group>"; };
-		098E72581905DF4C00C8CC6E /* icon-dnscrypt-active.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-dnscrypt-active.png"; sourceTree = "<group>"; };
-		098E725A1905DF4C00C8CC6E /* icon-dnscrypt-inactive.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-dnscrypt-inactive.png"; sourceTree = "<group>"; };
-		098E725C1905DF4C00C8CC6E /* icon-no-network.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-no-network.png"; sourceTree = "<group>"; };
-		098E72641905E1A700C8CC6E /* icon-dnscrypt-active@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-dnscrypt-active@2x.png"; sourceTree = "<group>"; };
-		098E72651905E1A700C8CC6E /* icon-dnscrypt-inactive@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-dnscrypt-inactive@2x.png"; sourceTree = "<group>"; };
-		098E72661905E1A700C8CC6E /* icon-no-network@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-no-network@2x.png"; sourceTree = "<group>"; };
 		09A13ACD145F3B9000B227A4 /* DNSCrypt Menubar.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DNSCrypt Menubar.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		09A13AD1145F3B9000B227A4 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		09A13AD4145F3B9000B227A4 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -53,6 +42,7 @@
 		09A13AE3145F3B9000B227A4 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		09A13AE4145F3B9000B227A4 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		09A13AE7145F3B9000B227A4 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
+		F622E21A1C88C76800721313 /* Icons.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Icons.xcassets; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -118,16 +108,11 @@
 			isa = PBXGroup;
 			children = (
 				091360721C88418E00F308D3 /* dnscrypt.iconset */,
+				F622E21A1C88C76800721313 /* Icons.xcassets */,
 				09A13AD9145F3B9000B227A4 /* DNSCrypt-Menubar-Info.plist */,
 				09A13ADA145F3B9000B227A4 /* InfoPlist.strings */,
 				09A13ADD145F3B9000B227A4 /* main.m */,
 				09A13ADF145F3B9000B227A4 /* DNSCrypt-Menubar-Prefix.pch */,
-				098E72581905DF4C00C8CC6E /* icon-dnscrypt-active.png */,
-				098E725A1905DF4C00C8CC6E /* icon-dnscrypt-inactive.png */,
-				098E725C1905DF4C00C8CC6E /* icon-no-network.png */,
-				098E72641905E1A700C8CC6E /* icon-dnscrypt-active@2x.png */,
-				098E72651905E1A700C8CC6E /* icon-dnscrypt-inactive@2x.png */,
-				098E72661905E1A700C8CC6E /* icon-no-network@2x.png */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -183,15 +168,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				098E72681905E1A700C8CC6E /* icon-dnscrypt-inactive@2x.png in Resources */,
 				09A13ADC145F3B9000B227A4 /* InfoPlist.strings in Resources */,
-				098E725E1905DF4C00C8CC6E /* icon-dnscrypt-active.png in Resources */,
 				09A13AE8145F3B9000B227A4 /* MainMenu.xib in Resources */,
-				098E72691905E1A700C8CC6E /* icon-no-network@2x.png in Resources */,
-				098E72601905DF4C00C8CC6E /* icon-dnscrypt-inactive.png in Resources */,
-				098E72621905DF4C00C8CC6E /* icon-no-network.png in Resources */,
+				F622E21B1C88C76800721313 /* Icons.xcassets in Resources */,
 				091360731C88418E00F308D3 /* dnscrypt.iconset in Resources */,
-				098E72671905E1A700C8CC6E /* icon-dnscrypt-active@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m b/DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m
index 4d1ffe0..73c1197 100644
--- a/DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m
+++ b/DNSCrypt-Menubar/DNSCrypt-Menubar/AppDelegate.m
@@ -71,13 +71,13 @@ BOOL appUpdated = FALSE;
     
     switch (currentState) {
         case kDNS_CONFIGURATION_LOCALHOST:
-            led = [NSImage imageNamed: @"icon-dnscrypt-active"];
+            led = [NSImage imageNamed: @"Active"];
             break;
         case kDNS_CONFIGURATION_VANILLA:
-            led = [NSImage imageNamed: @"icon-dnscrypt-inactive"];
+            led = [NSImage imageNamed: @"Inactive"];
             break;
         default:
-            led = [NSImage imageNamed: @"icon-no-network"];
+            led = [NSImage imageNamed: @"No-Network"];
     }
     [led setTemplate:YES];
     _statusItem.image = led;
@@ -138,7 +138,7 @@ BOOL appUpdated = FALSE;
 {
     [self setCheckBoxesEnabled: FALSE];
 
-    NSImage *led = [NSImage imageNamed: @"icon-no-network"];
+    NSImage *led = [NSImage imageNamed: @"No-Network"];
     _statusItem.image = led;
     
     [self fromCommand: @"/bin/csh" withArguments: [NSArray arrayWithObjects: @"-c", @"cd '" kDNSCRIPT_SCRIPTS_BASE_DIR @"' && exec ./gui-push-conf-change.sh prefpane", nil]];
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Active.imageset/Active.pdf b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Active.imageset/Active.pdf
new file mode 100644
index 0000000..7aa6564
Binary files /dev/null and b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Active.imageset/Active.pdf differ
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Active.imageset/Contents.json b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Active.imageset/Contents.json
new file mode 100644
index 0000000..e087fdf
--- /dev/null
+++ b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Active.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "filename" : "Active.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Contents.json b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Contents.json
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Inactive.imageset/Contents.json b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Inactive.imageset/Contents.json
new file mode 100644
index 0000000..506a904
--- /dev/null
+++ b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Inactive.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "filename" : "Inactive.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Inactive.imageset/Inactive.pdf b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Inactive.imageset/Inactive.pdf
new file mode 100644
index 0000000..9d0e969
Binary files /dev/null and b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/Inactive.imageset/Inactive.pdf differ
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/No-Network.imageset/Contents.json b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/No-Network.imageset/Contents.json
new file mode 100644
index 0000000..613fb43
--- /dev/null
+++ b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/No-Network.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "filename" : "No-Network.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/No-Network.imageset/No-Network.pdf b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/No-Network.imageset/No-Network.pdf
new file mode 100644
index 0000000..cd57172
Binary files /dev/null and b/DNSCrypt-Menubar/DNSCrypt-Menubar/Icons.xcassets/No-Network.imageset/No-Network.pdf differ
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-active.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-active.png
deleted file mode 100644
index 0b5151b..0000000
Binary files a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-active.png and /dev/null differ
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-active@2x.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-active@2x.png
deleted file mode 100644
index 8949702..0000000
Binary files a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-active@2x.png and /dev/null differ
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-inactive.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-inactive.png
deleted file mode 100644
index b072e44..0000000
Binary files a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-inactive.png and /dev/null differ
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-inactive@2x.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-inactive@2x.png
deleted file mode 100644
index 61ac341..0000000
Binary files a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-inactive@2x.png and /dev/null differ
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt.inkscape.svg b/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt.inkscape.svg
deleted file mode 100644
index 4b2f701..0000000
--- a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt.inkscape.svg
+++ /dev/null
@@ -1,267 +0,0 @@
-<?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="34"
-   height="34"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="icon-dnscrypt.inkscape.svg"
-   inkscape:export-filename="/Users/avh4/workspace/dnscrypt-osxclient/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-active.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45"
-   style="enable-background:new">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.351258"
-     inkscape:cx="17.323754"
-     inkscape:cy="16.37179"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4162"
-     showgrid="false"
-     inkscape:window-width="1191"
-     inkscape:window-height="822"
-     inkscape:window-x="9"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-object-midpoints="true">
-    <sodipodi:guide
-       orientation="1,0"
-       position="-3.8642648,37.386762"
-       id="guide4115" />
-  </sodipodi:namedview>
-  <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
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Reference no network"
-     style="display:none"
-     sodipodi:insensitive="true"
-     transform="translate(0,-2)">
-    <image
-       style="display:inline"
-       y="0"
-       x="0"
-       id="image4031"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABHNCSVQICAgIfAhkiAAAANtJREFU OI2d1DFKBDEYxfFfZo2QERSbRVjZo3gKK1sPIHoEGyvBWgStPIAH8DCiN9h+bLIyO86MiQ8CX76Q //fyioSU2n3c4RxrdfrCC24XMcZ7XOOoEgKHOENscJGbb1giFK5lvgOXIaW2y5vTbLVGK3xCHxQq IVt10MwcdhX9SdDOtJG6GNR/5tDFaARzjsYuTOb419OKNQeaCrsKNMxkmFmVoy1krP6lvQJASX/H 0Wpu4oR+fosGm1w/q/tG1njK9Sak1D7g6h9u+npcxBjfcYATHFcCPvCKm291ZyCHBno2ewAAAABJ RU5ErkJggg== "
-       height="36"
-       width="36" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Reference failed"
-     sodipodi:insensitive="true"
-     style="display:none"
-     transform="translate(0,-2)">
-    <image
-       y="0"
-       x="0"
-       id="image4099"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABHNCSVQICAgIfAhkiAAAARZJREFU OI2V1DFKA0EYBeBvEzewURQRg6DEJp138BRWth5AvICFCIKgWFkpeAZbwUoQrGysFEVR7FIFrCQW DsmyTHazP/zwZub9jzeP2U2yrN3CEbbQVa++cIWDZpqmJ9jDQk0RmMcm0ga2w+Y1Okim7E6YgZ0k y9rDsFgLVuvUKj6hkduMiRziO/Rx5Hw0k3eURIjP6AXcx1KEMyw6itVjDt+VEauEHibg2kL3OXxT RqzKqInXgNcnaAxhpsLRLy4xqOBVOoLlINgvc1SVURfveMJcGbFKqOU/p1boiZXPqIuPwvkLNvAj frXR36JhHOSF8SsuisU+n16YgUGSZe0z7JbZnqJOm2ma3mIWK1isKfCGc+z/AeH3MRrXRYDWAAAA AElFTkSuQmCC "
-       height="36"
-       width="36" />
-  </g>
-  <g
-     inkscape:label="Reference active"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1018.3622)"
-     style="display:none"
-     sodipodi:insensitive="true">
-    <image
-       y="1016.3622"
-       x="0"
-       id="image3079"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABHNCSVQICAgIfAhkiAAAAXxJREFU OI2Vk79LXEEUhb/duCv3jD8QG0MKERTBzsbSTnB7BUkVEIRUqVUwELYIFmIlCApWVoKVWCn+B4K1 aCNsICBavAkKMin2PXwOszF74RYz3PvNuYc7FTPVgQ3gC/CJ7uIWOAS+f6jVak1gDRjoEgIwBMwC L1VgOVHwCPwApr3PKsAw0AB+An8S9V8rZgrR5Tmw5H32OyVBcuPADjBXfriagDQ6QQC8z65zdYfl +7Kie2DC++y+EyRSVgcugalY0VYZIjmT3K7kWpK7k9x23lwoe6btIwA9JdBJ9OgmsFI6f6Nt9Gqq pzxab/5KoagFjETwX95nH1Ojxma/G5Ibl9yF5J4kdya5sRg0GfUcJDj7wB7tfeoHjoFdAMwU8lwP IVCkmepmaprpJs9mfvcU1fgQwhtQy0x9ZVgqzRRS53izj7zPFjt4Mwg8dPIuNntBcqeFgd1EFYi/ wzxwJbkNyc38L6hipiaw/k7dIzDKP0br4XXNPwNdj1TEX4ehms1FM7oVAAAAAElFTkSuQmCC "
-       height="36"
-       width="36" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Scratch - Target"
-     style="display:none"
-     transform="translate(0,-2)"
-     sodipodi:insensitive="true">
-    <path
-       style="fill:#1a1a1a;fill-opacity:1;stroke:none;display:inline"
-       d="M 5.6666667,2 C 2.5273333,2 0,4.5273333 0,7.6666667 L 0,30.333333 C 0,33.472667 2.5273333,36 5.6666667,36 L 28.333333,36 C 31.472667,36 34,33.472667 34,30.333333 L 34,7.6666667 C 34,4.5273333 31.472667,2 28.333333,2 L 5.6666667,2 z M 17.029514,5.8958333 c 7.409335,0 13.428819,5.9899707 13.428819,13.3993057 0,7.409335 -6.019484,13.428819 -13.428819,13.428819 -7.4093349,0 -13.3993057,-6.019484 -13.3993057,-13.428819 0,-7.409335 5.9899708,-13.3993057 13.3993057,-13.3993057 z"
-       id="rect3854"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
-       id="path3082"
-       sodipodi:cx="18.035715"
-       sodipodi:cy="18.321428"
-       sodipodi:rx="5.7142859"
-       sodipodi:ry="5.7142859"
-       d="m 23.750001,18.321428 a 5.7142859,5.7142859 0 1 1 -11.428572,0 5.7142859,5.7142859 0 1 1 11.428572,0 z"
-       transform="matrix(1.0329861,0,0,1.0329861,-1.5969123,0.37782222)" />
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="Scratch - Large Lock"
-     id="g4144"
-     inkscape:groupmode="layer"
-     transform="translate(0,-2)"
-     sodipodi:insensitive="true">
-    <rect
-       y="17.409853"
-       x="7.7394609"
-       height="13.229342"
-       width="18.521078"
-       id="rect4146"
-       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-    <path
-       inkscape:label="#path3884"
-       sodipodi:nodetypes="csscc"
-       inkscape:connector-curvature="0"
-       id="path4148"
-       d="m 11.487773,20.507275 0,-6.153827 c 0,-3.044319 2.467909,-5.5122266 5.512226,-5.5122266 3.044319,0 5.512668,2.4679076 5.512668,5.5122266 l 0,5.748148"
-       style="fill:none;stroke:#1a1a1a;stroke-width:2.96083331;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  </g>
-  <g
-     style="display:none"
-     inkscape:label="No Network"
-     id="g4162"
-     inkscape:groupmode="layer"
-     transform="translate(0,-2)"
-     sodipodi:insensitive="true">
-    <path
-       inkscape:connector-curvature="0"
-       id="path4164"
-       d="M 5.6666667,2 C 2.5273333,2 0,4.5273333 0,7.6666667 L 0,30.333333 C 0,33.472667 2.5273333,36 5.6666667,36 L 28.333333,36 C 31.472667,36 34,33.472667 34,30.333333 L 34,7.6666667 C 34,4.5273333 31.472667,2 28.333333,2 L 5.6666667,2 z M 17.029514,5.8958333 c 7.409335,0 13.428819,5.9899707 13.428819,13.3993057 0,7.409335 -6.019484,13.428819 -13.428819,13.428819 -7.4093349,0 -13.3993057,-6.019484 -13.3993057,-13.428819 0,-7.409335 5.9899708,-13.3993057 13.3993057,-13.3993057 z"
-       style="fill:#808080;fill-opacity:1;stroke:none;display:inline"
-       inkscape:export-filename="/Users/avh4/workspace/dnscrypt-osxclient/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-no-network@2x.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <path
-       transform="matrix(1.0329861,0,0,1.0329861,-1.5969123,0.37782222)"
-       d="m 23.750001,18.321428 a 5.7142859,5.7142859 0 1 1 -11.428572,0 5.7142859,5.7142859 0 1 1 11.428572,0 z"
-       sodipodi:ry="5.7142859"
-       sodipodi:rx="5.7142859"
-       sodipodi:cy="18.321428"
-       sodipodi:cx="18.035715"
-       id="path4166"
-       style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
-       sodipodi:type="arc"
-       inkscape:export-filename="/Users/avh4/workspace/dnscrypt-osxclient/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-no-network@2x.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer7"
-     inkscape:label="Inactive"
-     style="display:none"
-     transform="translate(0,-2)"
-     sodipodi:insensitive="true">
-    <g
-       style="font-size:30.8449707px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#d40000;fill-opacity:1;stroke:none;font-family:Georgia;-inkscape-font-specification:Georgia Bold"
-       id="text4108"
-       transform="matrix(0.94444444,0,0,0.94444444,0.03393364,2)"
-       inkscape:export-filename="/Users/avh4/workspace/dnscrypt-osxclient/DNSCrypt-Menubar/DNSCrypt-Menubar/g4124.png"
-       inkscape:export-xdpi="45"
-       inkscape:export-ydpi="45">
-      <path
-         d="m 18.843,21.718332 -1.76,0 c -0.27253,-1.907467 -2.121054,-7.471109 -2.049557,-10.033756 0.06071,-2.175835 0.826587,-4.8119882 2.921838,-4.80135 2.15386,0.010936 3.012254,2.384064 2.936899,4.80135 -0.07535,2.417286 -1.739851,8.209756 -2.04918,10.033756 z"
-         style="fill:#d40000;fill-opacity:1"
-         id="path4113"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsszc" />
-    </g>
-    <g
-       id="g4124"
-       style="font-size:30.8449707px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#d40000;fill-opacity:1;stroke:none;font-family:Georgia;-inkscape-font-specification:Georgia Bold"
-       transform="matrix(0.85003413,0,0,0.85003413,1.7309954,4.4841187)"
-       inkscape:export-xdpi="45"
-       inkscape:export-ydpi="45">
-      <path
-         sodipodi:nodetypes="ccscscccc"
-         inkscape:connector-curvature="0"
-         id="path4126"
-         style="fill:#d40000;fill-opacity:1"
-         d="m 20.86206,26.327004 c -9e-6,0.763093 -0.291188,1.420757 -0.873539,1.972994 -0.572326,0.542196 -1.245051,0.813294 -2.018177,0.813295 -0.783178,-10e-7 -1.465944,-0.271099 -2.048299,-0.813295 -0.572322,-0.552237 -0.858481,-1.209901 -0.858478,-1.972994 -3e-6,-0.763089 0.286156,-1.420753 0.858478,-1.972994 0.582355,-0.562273 1.265121,-0.843412 2.048299,-0.843417 0.773126,5e-6 1.445851,0.281144 2.018177,0.843417 0.582351,0.552241 0.87353,1.209905 0.873539,1.972994" />
-    </g>
-    <rect
-       style="fill:none;stroke:#808080;stroke-width:3.77777767;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="rect4105"
-       width="30.222221"
-       height="30.222221"
-       x="1.8888888"
-       y="3.8888888"
-       rx="3.7311382"
-       ry="3.7311382"
-       inkscape:export-filename="/Users/avh4/workspace/dnscrypt-osxclient/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-dnscrypt-inactive.png"
-       inkscape:export-xdpi="45"
-       inkscape:export-ydpi="45" />
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="Active"
-     id="g3056"
-     inkscape:groupmode="layer"
-     transform="translate(0,-2)"
-     sodipodi:insensitive="true">
-    <path
-       style="fill:#1a1a1a;fill-opacity:1;stroke:none;display:inline"
-       d="M 5.6666667,2 C 2.5273333,2 0,4.5273333 0,7.6666667 L 0,30.333333 C 0,33.472667 2.5273333,36 5.6666667,36 l 13.2222223,0 0,-3.423611 c -0.611523,0.08547 -1.224534,0.147569 -1.859375,0.147569 -7.4093349,0 -13.3993057,-6.019484 -13.3993057,-13.428819 0,-7.409335 5.9899708,-13.3993057 13.3993057,-13.3993057 6.846362,0 12.519739,5.1238497 13.340278,11.7465277 1.779019,0.868614 3.125286,2.504502 3.630208,4.456597 L 34,7.6666667 C 34,4.5273333 31.472667,2 28.333333,2 L 5.6666667,2 z"
-       id="path3058"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="matrix(1.0329861,0,0,1.0329861,-1.5969123,0.37782222)"
-       d="m 23.750001,18.321428 a 5.7142859,5.7142859 0 1 1 -11.428572,0 5.7142859,5.7142859 0 1 1 11.428572,0 z"
-       sodipodi:ry="5.7142859"
-       sodipodi:rx="5.7142859"
-       sodipodi:cy="18.321428"
-       sodipodi:cx="18.035715"
-       id="path3060"
-       style="fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
-       sodipodi:type="arc" />
-    <rect
-       style="fill:#1a1a1a;fill-opacity:1;stroke:none;display:inline"
-       id="rect3863"
-       width="13.222222"
-       height="9.4444447"
-       x="20.777779"
-       y="26.555555" />
-    <path
-       style="fill:none;stroke:#1a1a1a;stroke-width:1.57407403;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       d="m 23.453703,28.115447 0,-4.393225 c 0,-2.173342 1.761844,-3.935185 3.935186,-3.935185 2.173343,0 3.9355,1.761843 3.9355,3.935185 l 0,4.103611"
-       id="locktop"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csscc"
-       inkscape:label="#path3884" />
-  </g>
-</svg>
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-no-network.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-no-network.png
deleted file mode 100644
index 24cbbf1..0000000
Binary files a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-no-network.png and /dev/null differ
diff --git a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-no-network@2x.png b/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-no-network@2x.png
deleted file mode 100644
index 829eacc..0000000
Binary files a/DNSCrypt-Menubar/DNSCrypt-Menubar/icon-no-network@2x.png and /dev/null differ
diff --git a/DNSCrypt-Menubar/Icons template.svg b/DNSCrypt-Menubar/Icons template.svg
new file mode 100644
index 0000000..724f578
--- /dev/null
+++ b/DNSCrypt-Menubar/Icons template.svg	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="34px" width="130px" version="1.1" viewBox="0 0 130 34">
+ <g fill-rule="evenodd">
+  <path opacity="0.45" d="m48 6.0003c0-3.3139 2.682-6.0003 6-6.0003h22c3.314 0 6 2.6821 6 6.0003v22c0 3.314-2.682 6-6 6h-22c-3.314 0-6-2.682-6-6v-22zm4 1.0076c0-1.6612 1.343-3.0079 3.008-3.0079h19.984c1.661 0 3.008 1.3431 3.008 3.0079v19.984c0 1.661-1.343 3.008-3.008 3.008h-19.984c-1.661 0-3.008-1.343-3.008-3.008v-19.984zm5.632 5.0301l4.968 4.962-4.968 4.962 2.406 2.406 4.959-4.965 4.965 4.965 2.406-2.406-4.968-4.962 4.968-4.962-2.406-2.4058-4.962 4.9698-4.962-4.9698-2.406 2.4058z"/>
+  <g transform="translate(96)">
+   <path opacity="0.45" d="m0 6.0003c0-3.3139 2.6821-6.0003 6.0003-6.0003h22c3.314 0 6 2.6821 6 6.0003v22c0 3.314-2.682 6-6 6h-22c-3.3136 0-6-2.682-6-6v-22zm4 1.0076c0-1.6612 1.3431-3.0079 3.0079-3.0079h19.984c1.661 0 3.008 1.3431 3.008 3.0079v19.984c0 1.661-1.343 3.008-3.008 3.008h-19.984c-1.6613 0-3.008-1.343-3.008-3.008v-19.984z"/>
+   <path d="m17.83 20.646h-1.662c-0.258-1.802-2.003-7.056-1.936-9.477 0.058-2.0546 0.781-4.5443 2.76-4.5343 2.034 0.0104 2.845 2.2516 2.773 4.5343-0.071 2.283-1.643 7.754-1.935 9.477zm1.634 4.351c0 0.649-0.247 1.208-0.742 1.677-0.487 0.461-1.058 0.691-1.716 0.691-0.665 0-1.246-0.23-1.741-0.691-0.486-0.469-0.729-1.028-0.729-1.677s0.243-1.208 0.729-1.677c0.495-0.478 1.076-0.717 1.741-0.717 0.658 0 1.229 0.239 1.716 0.717 0.495 0.469 0.742 1.028 0.742 1.677z"/>
+  </g>
+  <path d="m34 18.097v-12.097c0-3.3179-2.686-6-6-6h-22c-3.3179 0-6 2.6864-6 6.0003v22c0 3.318 2.6864 6 6.0003 6h12.249c-0.161-0.464-0.249-0.962-0.249-1.479v-1.556c-0.33 0.023-0.664 0.035-1 0.035-7.732 0-14-6.268-14-14s6.268-14 14-14c7.233 0 13.184 5.4847 13.923 12.522 1.228 0.586 2.284 1.477 3.077 2.575zm-1.447 7.042v-2.216c0-2.856-2.26-5.173-5.053-5.173s-5.053 2.317-5.053 5.173v2.216c-0.8 0-1.447 0.66-1.447 1.472v5.91c0 0.812 0.647 1.479 1.447 1.479h10.106c0.8 0 1.447-0.667 1.447-1.479v-5.91c0-0.812-0.647-1.472-1.447-1.472zm-8.087-2.216c0-1.714 1.358-3.104 3.034-3.104s3.034 1.39 3.034 3.104v2.216h-6.068v-2.216zm-1.466-5.923c0 3.314-2.686 6-6 6s-6-2.686-6-6 2.686-6 6-6 6 2.686 6 6z"/>
+ </g>
+</svg>