diff --git a/src/KeePassLib2Android/Cryptography/PopularPasswords.cs b/src/KeePassLib2Android/Cryptography/PopularPasswords.cs
index 6083520d..e6223c82 100644
--- a/src/KeePassLib2Android/Cryptography/PopularPasswords.cs
+++ b/src/KeePassLib2Android/Cryptography/PopularPasswords.cs
@@ -35,8 +35,6 @@ namespace KeePassLib.Cryptography
 		{
 			get
 			{
-				Debug.Assert(m_dicts.Count > 0); // Should be initialized
-
 				int iMaxLen = 0;
 				foreach(int iLen in m_dicts.Keys)
 				{
diff --git a/src/keepass2android-app/Manifests/AndroidManifest_debug.xml b/src/keepass2android-app/Manifests/AndroidManifest_debug.xml
index 27a4d6bc..45df9101 100644
--- a/src/keepass2android-app/Manifests/AndroidManifest_debug.xml
+++ b/src/keepass2android-app/Manifests/AndroidManifest_debug.xml
@@ -47,8 +47,8 @@
   <permission android:description="@string/permission_desc2" android:icon="@drawable/ic_notify_locked" android:label="KP2A entry search" android:name="keepass2android.keepass2android_debug.permission.KP2aInternalSearch" android:protectionLevel="signature" />
   <permission android:description="@string/permission_desc3" android:icon="@drawable/ic_launcher" android:label="KP2A choose autofill dataset" android:name="keepass2android.keepass2android_debug.permission.Kp2aChooseAutofill" android:protectionLevel="signature" />
   <application
-	android:icon="@mipmap/ic_launcher_online"
-	android:roundIcon="@mipmap/ic_launcher_online_round"
+	android:icon="@mipmap/ic_launcher_debug"
+	android:roundIcon="@mipmap/ic_launcher_debug_round"
 	android:networkSecurityConfig="@xml/network_security_config"
 	>
     <meta-data
diff --git a/src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_debug.png b/src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_debug.png
new file mode 100644
index 00000000..a13fe501
Binary files /dev/null and b/src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_debug.png differ
diff --git a/src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_debug_round.png b/src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_debug_round.png
new file mode 100644
index 00000000..1fd874a0
Binary files /dev/null and b/src/keepass2android-app/Resources/mipmap-xxxhdpi/ic_launcher_debug_round.png differ
diff --git a/src/keepass2android-app/app/App.cs b/src/keepass2android-app/app/App.cs
index 00f73cf2..f342c52c 100644
--- a/src/keepass2android-app/app/App.cs
+++ b/src/keepass2android-app/app/App.cs
@@ -93,11 +93,13 @@ namespace keepass2android
 #if DEBUG
         public const string PackagePart = "keepass2android_debug";
 		public const string Searchable = "@xml/searchable_debug";
+        public const int LauncherIcon = Resource.Mipmap.ic_launcher_debug;
 #else
 		public const string PackagePart = "keepass2android";
 		public const string Searchable = "@xml/searchable";
+		public const int LauncherIcon = Resource.Mipmap.ic_launcher_online;
 #endif
-        public const int LauncherIcon = Resource.Mipmap.ic_launcher_online;
+
         public const int NotificationLockedIcon = Resource.Drawable.ic_notify_loaded;
         public const int NotificationUnlockedIcon = Resource.Drawable.ic_notify_locked;