diff --git a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
index 730ddd274..a11b6e623 100644
--- a/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
+++ b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:targetSdkVersion="14" />
 
     <application
-        android:icon="@drawable/icon"
+        android:icon="@drawable/ic_launcher"
         android:label="OpenPGP Keychain API Demo" >
         <activity
             android:name=".BaseActivity"
diff --git a/OpenPGP-Keychain-API-Demo/ic_launcher-web.png b/OpenPGP-Keychain-API-Demo/ic_launcher-web.png
new file mode 100644
index 000000000..ae4cd0976
Binary files /dev/null and b/OpenPGP-Keychain-API-Demo/ic_launcher-web.png differ
diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/ic_launcher.png b/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 000000000..cf114d7db
Binary files /dev/null and b/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/ic_launcher.png differ
diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/icon.png b/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/icon.png
deleted file mode 100644
index 6b8cc3d73..000000000
Binary files a/OpenPGP-Keychain-API-Demo/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-ldpi/icon.png b/OpenPGP-Keychain-API-Demo/res/drawable-ldpi/icon.png
deleted file mode 100644
index a1adf6bcb..000000000
Binary files a/OpenPGP-Keychain-API-Demo/res/drawable-ldpi/icon.png and /dev/null differ
diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/ic_launcher.png b/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 000000000..d55318843
Binary files /dev/null and b/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/ic_launcher.png differ
diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/icon.png b/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/icon.png
deleted file mode 100644
index 6b10a2ad3..000000000
Binary files a/OpenPGP-Keychain-API-Demo/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/ic_launcher.png b/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..13ed3d450
Binary files /dev/null and b/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/icon.png b/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/icon.png
deleted file mode 100644
index 03ee31bbd..000000000
Binary files a/OpenPGP-Keychain-API-Demo/res/drawable-xhdpi/icon.png and /dev/null differ
diff --git a/OpenPGP-Keychain-API-Demo/res/drawable-xxhdpi/ic_launcher.png b/OpenPGP-Keychain-API-Demo/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..831c993d4
Binary files /dev/null and b/OpenPGP-Keychain-API-Demo/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java
index 65e50599d..e1bd415be 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/helper/PgpMain.java
@@ -788,7 +788,6 @@ public class PgpMain {
         }
         updateProgress(progress, R.string.progress_preparingStreams, 5, 100);
 
-        Log.d(Constants.TAG, "as"+symmetricEncryptionAlgorithm);
         // encrypt and compress input file content
         JcePGPDataEncryptorBuilder encryptorBuilder = new JcePGPDataEncryptorBuilder(
                 symmetricEncryptionAlgorithm).setProvider(BOUNCY_CASTLE_PROVIDER_NAME)