diff --git a/src/AutoFillPlugin/AutoFillPlugin.csproj b/src/AutoFillPlugin/AutoFillPlugin.csproj
index 93850d6e..5bdb2b66 100644
--- a/src/AutoFillPlugin/AutoFillPlugin.csproj
+++ b/src/AutoFillPlugin/AutoFillPlugin.csproj
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6FF440E6-E8FF-4E43-8221-9E3972F14812}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
@@ -15,7 +13,7 @@
     <AndroidApplication>true</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
+    <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
     <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
   </PropertyGroup>
@@ -27,7 +25,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -38,7 +35,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
@@ -66,9 +62,8 @@
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values\Strings.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\Icon.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\Icon.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_notify_autofill.png" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Properties\AndroidManifest.xml" />
@@ -78,21 +73,19 @@
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\ic_notify_keyboard.png" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\KeePassLib2Android\KeePassLib2Android.csproj">
-      <Project>{545b4a6b-8bba-4fbe-92fc-4ac060122a54}</Project>
+      <Project>{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}</Project>
       <Name>KeePassLib2Android</Name>
     </ProjectReference>
     <ProjectReference Include="..\PluginSdkBinding\PluginSdkBinding.csproj">
-      <Project>{3da3911e-36de-465e-8f15-f1991b6437e5}</Project>
+      <Project>{3DA3911E-36DE-465E-8F15-F1991B6437E5}</Project>
       <Name>PluginSdkBinding</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\layout\" />
+    <Folder Include="Resources\drawable\" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/AutoFillPlugin/Kp2aAccessibilityService.cs b/src/AutoFillPlugin/Kp2aAccessibilityService.cs
index 52b981d9..96297983 100644
--- a/src/AutoFillPlugin/Kp2aAccessibilityService.cs
+++ b/src/AutoFillPlugin/Kp2aAccessibilityService.cs
@@ -145,7 +145,7 @@ namespace keepass2android.AutoFillPlugin
             var builder = new Notification.Builder(this);
             //TODO icon
             //TODO plugin icon
-            builder.SetSmallIcon(Resource.Drawable.ic_notify_keyboard)
+            builder.SetSmallIcon(Resource.Drawable.ic_notify_autofill)
                    .SetContentText(GetString(Resource.String.NotificationContentText, new Java.Lang.Object[] { targetName }))
                    .SetContentTitle(GetString(Resource.String.NotificationTitle))
                    .SetWhen(Java.Lang.JavaSystem.CurrentTimeMillis())
diff --git a/src/AutoFillPlugin/Properties/AndroidManifest.xml b/src/AutoFillPlugin/Properties/AndroidManifest.xml
index ef6e7cf6..bf0d6032 100644
--- a/src/AutoFillPlugin/Properties/AndroidManifest.xml
+++ b/src/AutoFillPlugin/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="AutoFillPlugin.AutoFillPlugin" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="19" />
-	<application android:label="AutoFillPlugin" android:icon="@drawable/Icon"></application>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="keepass2android.AutoFillPlugin" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
+	<application android:label="KP2A AutoFillPlugin" android:icon="@drawable/Icon"></application>
 </manifest>
\ No newline at end of file
diff --git a/src/AutoFillPlugin/Resources/drawable-xhdpi/Icon.png b/src/AutoFillPlugin/Resources/drawable-xhdpi/Icon.png
new file mode 100644
index 00000000..0f324313
Binary files /dev/null and b/src/AutoFillPlugin/Resources/drawable-xhdpi/Icon.png differ
diff --git a/src/AutoFillPlugin/Resources/drawable-xhdpi/ic_notify_autofill.png b/src/AutoFillPlugin/Resources/drawable-xhdpi/ic_notify_autofill.png
new file mode 100644
index 00000000..b7ffa486
Binary files /dev/null and b/src/AutoFillPlugin/Resources/drawable-xhdpi/ic_notify_autofill.png differ
diff --git a/src/AutoFillPlugin/Resources/drawable-xhdpi/ic_notify_keyboard.png b/src/AutoFillPlugin/Resources/drawable-xhdpi/ic_notify_keyboard.png
deleted file mode 100644
index 2e473aa2..00000000
Binary files a/src/AutoFillPlugin/Resources/drawable-xhdpi/ic_notify_keyboard.png and /dev/null differ
diff --git a/src/AutoFillPlugin/Resources/drawable/Icon.png b/src/AutoFillPlugin/Resources/drawable/Icon.png
deleted file mode 100644
index 8074c4c5..00000000
Binary files a/src/AutoFillPlugin/Resources/drawable/Icon.png and /dev/null differ
diff --git a/src/AutoFillPlugin/Resources/values/Strings.xml b/src/AutoFillPlugin/Resources/values/Strings.xml
index d9e359e7..72f60d33 100644
--- a/src/AutoFillPlugin/Resources/values/Strings.xml
+++ b/src/AutoFillPlugin/Resources/values/Strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <string name="LookupTitle">Look up credentials</string>
     <string name="ApplicationName">KP2A AutoFillPlugin</string>
+  <string name="AutoFillServiceDescription">Monitors apps and websites for password fields. Offers to look up credentials from Keepass2Android and auto-fill them into the forms.</string>
   <string name="NotificationTitle">Keepass2Android AutoFill</string>
     <string name="NotificationContentText">AutoFill form for %1$s</string>
   <string name="NotificationTickerText">AutoFill available for %1$s</string>
diff --git a/src/AutoFillPlugin/Resources/xml/accserviceconfig.xml b/src/AutoFillPlugin/Resources/xml/accserviceconfig.xml
index 5f9db482..dd22a70e 100644
--- a/src/AutoFillPlugin/Resources/xml/accserviceconfig.xml
+++ b/src/AutoFillPlugin/Resources/xml/accserviceconfig.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
-    android:description="@string/ApplicationName"
+    android:description="@string/AutoFillServiceDescription"
     android:accessibilityEventTypes="typeAllMask"
     android:accessibilityFlags="flagDefault"
     android:accessibilityFeedbackType="feedbackSpoken"