diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e0a71e..9b0d00d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.0.69
+
+- Support Android Monochrome Icon
+- Multiple bug fixes
+
 ## 0.0.67
 
 - Adds crash reports (optional). Please consider enabling this under Settings > Help > “Share errors and crashes with us.”
diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..e422343
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..5bd8fe1
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..c2d315f
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..c0b1163
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..25e0614
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index c79c58a..d506366 100644
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -6,4 +6,9 @@
           android:drawable="@drawable/ic_launcher_foreground"
           android:inset="16%" />
   </foreground>
+  <monochrome>
+      <inset
+          android:drawable="@drawable/ic_launcher_monochrome"
+          android:inset="16%" />
+  </monochrome>
 </adaptive-icon>
diff --git a/lib/src/database/daos/groups.dao.dart b/lib/src/database/daos/groups.dao.dart
index 89730f5..5fd2fe6 100644
--- a/lib/src/database/daos/groups.dao.dart
+++ b/lib/src/database/daos/groups.dao.dart
@@ -247,16 +247,22 @@ class GroupsDao extends DatabaseAccessor<TwonlyDB> with _$GroupsDaoMixin {
         .get();
   }
 
-  Future<List<GroupMember>> getAllGroupMemberWithoutPublicKey() {
-    final query =
-        ((select(groups)..where((t) => t.isDirectChat.equals(false))).join([
-      leftOuterJoin(
-        groupMembers,
-        groupMembers.groupId.equalsExp(groups.groupId),
-      ),
-    ])
-          ..where(groupMembers.groupPublicKey.isNull()));
-    return query.map((row) => row.readTable(groupMembers)).get();
+  Future<List<GroupMember>> getAllGroupMemberWithoutPublicKey() async {
+    try {
+      final query = ((select(groupMembers)
+            ..where((t) => t.groupPublicKey.isNull()))
+          .join([
+        leftOuterJoin(
+          groups,
+          groups.groupId.equalsExp(groupMembers.groupId),
+        ),
+      ])
+        ..where(groups.isDirectChat.isNull()));
+      return query.map((row) => row.readTable(groupMembers)).get();
+    } catch (e) {
+      Log.error(e);
+      return [];
+    }
   }
 
   Future<Group?> getDirectChat(int userId) async {
diff --git a/pubspec.yaml b/pubspec.yaml
index 6efaa60..8ce28a4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -109,6 +109,7 @@ flutter_launcher_icons:
   ios: false
   image_path: "assets/images/logo.png"
   adaptive_icon_foreground: "assets/images/logo.png"
+  adaptive_icon_monochrome: "assets/images/logo.png"
   min_sdk_android: 21 # android min sdk min:16, default 21
   remove_alpha_ios: true
   adaptive_icon_background: "#FF57CC99"