diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3287235..c001874 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.microg.nlp"
-    android:versionName="1.1.3"
-    android:versionCode="1103">
+    android:versionName="1.2.0"
+    android:versionCode="1200">
 
     <uses-sdk
         android:minSdkVersion="9"
@@ -20,7 +20,7 @@
     <uses-permission android:name="org.microg.permission.FORCE_COARSE_LOCATION" />
 
     <application
-        android:icon="@drawable/nlp_app_icon"
+        android:icon="@drawable/ic_nlp_app"
         android:theme="@style/AppTheme"
         android:allowBackup="true"
         android:label="@string/nlp_app_name">
@@ -80,7 +80,8 @@
         </service>
 
         <activity android:name=".ui.SettingsActivity"
-            android:label="@string/nlp_settings_label">
+            android:icon="@drawable/ic_nlp_settings"
+            android:label="@string/nlp_app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/build.gradle b/build.gradle
index 6ec2545..b7c7f53 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,8 +18,8 @@ if (buildNlpAsLib) {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:21.0.2'
-    compile 'com.android.support:appcompat-v7:21.0.2'
+    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:appcompat-v7:21.0.3'
     compile project(':UnifiedNlpApi')
 }
 
@@ -54,12 +54,8 @@ android {
     lintOptions.abortOnError false
 
     sourceSets {
-        main {
-            if (buildNlpAsLib) {
-                manifest.srcFile 'EmptyAndroidManifest.xml'
-            } else {
-                manifest.srcFile 'AndroidManifest.xml'
-            }
+        main { 
+            manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']
             aidl.srcDirs = ['src']
             res.srcDirs = ['res']
diff --git a/ic_nlp_settings.svg b/ic_nlp_settings.svg
new file mode 100644
index 0000000..cabec67
--- /dev/null
+++ b/ic_nlp_settings.svg
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns: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="256"
+   height="256"
+   viewBox="0 0 256 256"
+   id="svg3059"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ic_nlp_settings.svg"
+   inkscape:export-filename="/home/marvin/Pictures/icons/nlp/ic_nlp_settings_72.png"
+   inkscape:export-xdpi="25.3125"
+   inkscape:export-ydpi="25.3125">
+  <metadata
+     id="metadata3069">
+    <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="defs3067">
+    <linearGradient
+       id="linearGradient3847">
+      <stop
+         style="stop-color:#6a8592;stop-opacity:1;"
+         offset="0"
+         id="stop3853" />
+      <stop
+         id="stop3851"
+         offset="1"
+         style="stop-color:#627f8d;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3847"
+       id="linearGradient3845"
+       x1="11.978406"
+       y1="2.0046263"
+       x2="11.978406"
+       y2="21.906435"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(10.666667,10.666667)" />
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter4067"
+       x="-0.5"
+       y="-0.5"
+       width="2"
+       height="2">
+      <feFlood
+         flood-opacity="1"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4069" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4071" />
+      <feGaussianBlur
+         in="composite"
+         stdDeviation="6"
+         result="blur"
+         id="feGaussianBlur4073" />
+      <feComponentTransfer
+         id="feComponentTransfer13">
+        <feFuncA
+           type="linear"
+           slope="0.2"
+           id="feFuncA15" />
+      </feComponentTransfer>
+      <feOffset
+         dx="0"
+         dy="6"
+         result="offset"
+         id="feOffset4075"
+         stdDeviation="8" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite4077" />
+    </filter>
+    <filter
+       inkscape:label="Edge Tint/Shade"
+       inkscape:menu="Shadows and Glows"
+       inkscape:menu-tooltip="Adds a colorizable drop shadow inside"
+       color-interpolation-filters="sRGB"
+       id="filter4119">
+      <feOffset
+         dx="0"
+         dy="5"
+         result="result11"
+         id="feOffset4123"
+         in="SourceGraphic" />
+      <feComposite
+         id="feComposite4151"
+         operator="in"
+         in="SourceGraphic"
+         result="result6"
+         in2="result11" />
+      <feFlood
+         id="feFlood4153"
+         flood-color="rgb(255,255,255)"
+         flood-opacity="0.20000000000000001"
+         result="result10" />
+      <feBlend
+         id="feBlend4157"
+         mode="normal"
+         in="result6"
+         result="result13"
+         in2="result10" />
+      <feComposite
+         id="feComposite4159"
+         in2="SourceGraphic"
+         operator="in"
+         result="result2" />
+      <feBlend
+         result="result12"
+         in2="SourceGraphic"
+         mode="normal"
+         id="feBlend4161"
+         blend="normal" />
+      <feOffset
+         id="feOffset4149"
+         result="result11"
+         dy="-5"
+         dx="0"
+         in="SourceGraphic" />
+      <feComposite
+         result="result6"
+         in="result12"
+         operator="in"
+         in2="result11"
+         id="feComposite4125" />
+      <feFlood
+         result="result10"
+         in="result6"
+         flood-opacity="0.20000000000000001"
+         flood-color="rgb(0,0,0)"
+         id="feFlood4127" />
+      <feBlend
+         mode="normal"
+         in2="result10"
+         id="feBlend4129"
+         in="result6" />
+      <feComposite
+         result="result2"
+         operator="in"
+         in2="result12"
+         id="feComposite4131" />
+      <feBlend
+         blend="normal"
+         id="feBlend4133"
+         in="result2"
+         mode="normal"
+         in2="result12"
+         result="result12" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     id="namedview3065"
+     showgrid="false"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="5.0676199"
+     inkscape:cy="116.50473"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3059" />
+  <path
+     sodipodi:nodetypes="csccccccccssccccccccsccccccccsscccccccc"
+     inkscape:connector-curvature="0"
+     style="fill:url(#linearGradient3845);fill-opacity:1;filter:url(#filter4067)"
+     id="path3085"
+     d="M 207.25333,138.45333 C 207.68,135.04 208,131.62667 208,128 c 0,-3.62667 -0.32,-7.04 -0.74667,-10.45333 L 229.76,99.946667 c 2.02667,-1.6 2.56,-4.48 1.28,-6.826667 L 209.70667,56.213333 c -1.28,-2.346666 -4.16,-3.2 -6.50667,-2.346666 L 176.64,64.533333 C 171.09333,60.266667 165.12,56.746667 158.61333,54.08 L 154.56,25.813333 c -0.32,-2.56 -2.56,-4.48 -5.22667,-4.48 l -42.66666,0 c -2.66667,0 -4.90667,1.92 -5.22667,4.48 L 97.386667,54.08 C 90.88,56.746667 84.906667,60.373333 79.36,64.533333 L 52.8,53.866667 c -2.453333,-0.96 -5.226667,0 -6.506667,2.346666 L 24.96,93.12 c -1.386667,2.346667 -0.746667,5.226667 1.28,6.826667 L 48.746667,117.54667 C 48.32,120.96 48,124.48 48,128 c 0,3.52 0.32,7.04 0.746667,10.45333 l -22.506667,17.6 c -2.026667,1.6 -2.56,4.48 -1.28,6.82667 l 21.333333,36.90667 c 1.28,2.34666 4.16,3.2 6.506667,2.34666 l 26.56,-10.66666 c 5.546667,4.26666 11.52,7.78666 18.026667,10.45333 L 101.44,230.18667 c 0.32,2.56 2.56,4.48 5.22667,4.48 l 42.66666,0 c 2.66667,0 4.90667,-1.92 5.22667,-4.48 L 158.61333,201.92 c 6.50667,-2.66667 12.48,-6.29333 18.02667,-10.45333 l 26.56,10.66666 c 2.45333,0.96 5.22667,0 6.50667,-2.34666 L 231.04,162.88 c 1.28,-2.34667 0.74667,-5.22667 -1.28,-6.82667 z" />
+  <path
+     d="M 0,0 H 256 V 256 H 0 z"
+     id="path3061"
+     inkscape:connector-curvature="0"
+     style="fill:none" />
+  <path
+     d="M 207.25333,138.45333 C 207.68,135.04 208,131.62667 208,128 c 0,-3.62667 -0.32,-7.04 -0.74667,-10.45333 L 229.76,99.946667 c 2.02667,-1.6 2.56,-4.48 1.28,-6.826667 L 209.70667,56.213333 c -1.28,-2.346666 -4.16,-3.2 -6.50667,-2.346666 L 176.64,64.533333 C 171.09333,60.266667 165.12,56.746667 158.61333,54.08 L 154.56,25.813333 c -0.32,-2.56 -2.56,-4.48 -5.22667,-4.48 l -42.66666,0 c -2.66667,0 -4.90667,1.92 -5.22667,4.48 L 97.386667,54.08 C 90.88,56.746667 84.906667,60.373333 79.36,64.533333 L 52.8,53.866667 c -2.453333,-0.96 -5.226667,0 -6.506667,2.346666 L 24.96,93.12 c -1.386667,2.346667 -0.746667,5.226667 1.28,6.826667 L 48.746667,117.54667 C 48.32,120.96 48,124.48 48,128 c 0,3.52 0.32,7.04 0.746667,10.45333 l -22.506667,17.6 c -2.026667,1.6 -2.56,4.48 -1.28,6.82667 l 21.333333,36.90667 c 1.28,2.34666 4.16,3.2 6.506667,2.34666 l 26.56,-10.66666 c 5.546667,4.26666 11.52,7.78666 18.026667,10.45333 L 101.44,230.18667 c 0.32,2.56 2.56,4.48 5.22667,4.48 l 42.66666,0 c 2.66667,0 4.90667,-1.92 5.22667,-4.48 L 158.61333,201.92 c 6.50667,-2.66667 12.48,-6.29333 18.02667,-10.45333 l 26.56,10.66666 c 2.45333,0.96 5.22667,0 6.50667,-2.34666 L 231.04,162.88 c 1.28,-2.34667 0.74667,-5.22667 -1.28,-6.82667 z"
+     id="path3063"
+     style="fill:url(#linearGradient3845);fill-opacity:1;filter:url(#filter4119)"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="csccccccccssccccccccsccccccccsscccccccc" />
+  <path
+     style="fill:#000000;fill-opacity:0.0627451"
+     d="m 152.125,87.8125 -42.08969,16.5136 18.01439,73.78924 29.66905,29.97841 0.90625,-6.1875 c 6.50667,-2.66667 12.45333,-6.2775 18,-10.4375 l 26.5625,10.65625 c 2.45333,0.96 5.25125,0.003 6.53125,-2.34375 l 19.9375,-34.5 z"
+     id="rect4273"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccc" />
+  <path
+     inkscape:connector-curvature="0"
+     d="m 128,69.546667 c -22.62142,0 -40.917299,18.295893 -40.917299,40.917333 0,30.688 40.917299,75.98923 40.917299,75.98923 0,0 40.9173,-45.30123 40.9173,-75.98923 0,-22.62144 -18.29588,-40.917333 -40.9173,-40.917333 z m 0,55.530663 c -8.06655,0 -14.61332,-6.54677 -14.61332,-14.61333 0,-8.06656 6.54677,-14.613333 14.61332,-14.613333 8.06655,0 14.61332,6.546773 14.61332,14.613333 0,8.06656 -6.54677,14.61333 -14.61332,14.61333 z"
+     id="path3049"
+     style="fill:#ffffff;fill-opacity:1;filter:url(#filter4067)"
+     transform="matrix(0.85382845,0,0,0.85382845,18.709959,18.709951)" />
+</svg>
diff --git a/res/drawable-hdpi/ic_nlp_app.png b/res/drawable-hdpi/ic_nlp_app.png
new file mode 100644
index 0000000..6c46ad6
Binary files /dev/null and b/res/drawable-hdpi/ic_nlp_app.png differ
diff --git a/res/drawable-hdpi/ic_nlp_settings.png b/res/drawable-hdpi/ic_nlp_settings.png
new file mode 100644
index 0000000..c08d3f6
Binary files /dev/null and b/res/drawable-hdpi/ic_nlp_settings.png differ
diff --git a/res/drawable-hdpi/nlp_app_icon.png b/res/drawable-hdpi/nlp_app_icon.png
deleted file mode 100644
index 1654d9c..0000000
Binary files a/res/drawable-hdpi/nlp_app_icon.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_nlp_app.png b/res/drawable-mdpi/ic_nlp_app.png
new file mode 100644
index 0000000..6d21455
Binary files /dev/null and b/res/drawable-mdpi/ic_nlp_app.png differ
diff --git a/res/drawable-mdpi/ic_nlp_settings.png b/res/drawable-mdpi/ic_nlp_settings.png
new file mode 100644
index 0000000..6d3adc6
Binary files /dev/null and b/res/drawable-mdpi/ic_nlp_settings.png differ
diff --git a/res/drawable-mdpi/nlp_app_icon.png b/res/drawable-mdpi/nlp_app_icon.png
deleted file mode 100644
index 2c1b3c5..0000000
Binary files a/res/drawable-mdpi/nlp_app_icon.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_nlp_app.png b/res/drawable-xhdpi/ic_nlp_app.png
new file mode 100644
index 0000000..cb1f109
Binary files /dev/null and b/res/drawable-xhdpi/ic_nlp_app.png differ
diff --git a/res/drawable-xhdpi/ic_nlp_settings.png b/res/drawable-xhdpi/ic_nlp_settings.png
new file mode 100644
index 0000000..35034cd
Binary files /dev/null and b/res/drawable-xhdpi/ic_nlp_settings.png differ
diff --git a/res/drawable-xhdpi/nlp_app_icon.png b/res/drawable-xhdpi/nlp_app_icon.png
deleted file mode 100644
index a793bac..0000000
Binary files a/res/drawable-xhdpi/nlp_app_icon.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_nlp_app.png b/res/drawable-xxhdpi/ic_nlp_app.png
new file mode 100644
index 0000000..10b2984
Binary files /dev/null and b/res/drawable-xxhdpi/ic_nlp_app.png differ
diff --git a/res/drawable-xxhdpi/ic_nlp_settings.png b/res/drawable-xxhdpi/ic_nlp_settings.png
new file mode 100644
index 0000000..7fcda52
Binary files /dev/null and b/res/drawable-xxhdpi/ic_nlp_settings.png differ
diff --git a/res/drawable-xxxhdpi/ic_nlp_app.png b/res/drawable-xxxhdpi/ic_nlp_app.png
new file mode 100644
index 0000000..59d5da9
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_nlp_app.png differ
diff --git a/res/drawable-xxxhdpi/ic_nlp_settings.png b/res/drawable-xxxhdpi/ic_nlp_settings.png
new file mode 100644
index 0000000..b2ab77d
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_nlp_settings.png differ