diff --git a/packages/stream_chat_v1/.metadata b/packages/stream_chat_v1/.metadata
index ce13b42..c3217d6 100644
--- a/packages/stream_chat_v1/.metadata
+++ b/packages/stream_chat_v1/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled.
 
 version:
-  revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+  revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
   channel: stable
 
 project_type: app
@@ -13,26 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
+      base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
     - platform: android
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-    - platform: ios
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-    - platform: linux
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-    - platform: macos
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-    - platform: web
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-    - platform: windows
-      create_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
-      base_revision: ee4e09cce01d6f2d7f4baebd247fde02e5008851
+      create_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
+      base_revision: b06b8b2710955028a6b562f5aa6fe62941d6febf
 
   # User provided section
 
diff --git a/packages/stream_chat_v1/android/app/src/main/AndroidManifest.xml b/packages/stream_chat_v1/android/app/src/main/AndroidManifest.xml
index 3ea0f99..fa7cbe4 100644
--- a/packages/stream_chat_v1/android/app/src/main/AndroidManifest.xml
+++ b/packages/stream_chat_v1/android/app/src/main/AndroidManifest.xml
@@ -9,10 +9,9 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <application
-        android:name=".Application"
         android:label="Chat Sample Flutter"
+        android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:requestLegacyExternalStorage="true"
         >
         <activity
@@ -23,6 +22,14 @@
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize"
             android:exported="true">
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+             the Android process has started. This theme is visible to the user
+             while the Flutter UI initializes. After that, this theme continues
+             to determine the Window background behind the Flutter UI. -->
+            <meta-data
+                    android:name="io.flutter.embedding.android.NormalTheme"
+                    android:resource="@style/NormalTheme"
+            />
             <intent-filter>
                 <action android:name="FLUTTER_NOTIFICATION_CLICK" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -38,4 +45,4 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/Application.kt b/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/Application.kt
deleted file mode 100644
index 938a498..0000000
--- a/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/Application.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.example.example
-
-import com.dexterous.flutterlocalnotifications.FlutterLocalNotificationsPlugin
-import io.flutter.app.FlutterApplication
-import io.flutter.plugin.common.PluginRegistry
-import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
-import io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin
-import io.flutter.plugins.pathprovider.PathProviderPlugin
-
-class Application : FlutterApplication(), PluginRegistrantCallback {
-    override fun onCreate() {
-        super.onCreate()
-    }
-
-    override fun registerWith(registry: PluginRegistry) {
-        PathProviderPlugin.registerWith(registry.registrarFor(
-                "io.flutter.plugins.pathprovider.PathProviderPlugin"))
-        SharedPreferencesPlugin.registerWith(registry.registrarFor(
-                "io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin"))
-        FlutterLocalNotificationsPlugin.registerWith(registry.registrarFor(
-                "com.dexterous.flutterlocalnotifications.FlutterLocalNotificationsPlugin"))
-    }
-}
\ No newline at end of file
diff --git a/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/MainActivity.kt b/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/MainActivity.kt
index 1656503..e793a00 100644
--- a/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/MainActivity.kt
+++ b/packages/stream_chat_v1/android/app/src/main/kotlin/com/example/example/MainActivity.kt
@@ -1,12 +1,6 @@
 package com.example.example
 
-import androidx.annotation.NonNull;
 import io.flutter.embedding.android.FlutterActivity
-import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugins.GeneratedPluginRegistrant
 
 class MainActivity: FlutterActivity() {
-    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
-        GeneratedPluginRegistrant.registerWith(flutterEngine);
-    }
 }
diff --git a/packages/stream_chat_v1/android/app/src/main/kotlin/io/getstream/stream_chat_v1/MainActivity.kt b/packages/stream_chat_v1/android/app/src/main/kotlin/io/getstream/stream_chat_v1/MainActivity.kt
deleted file mode 100644
index 3b9195b..0000000
--- a/packages/stream_chat_v1/android/app/src/main/kotlin/io/getstream/stream_chat_v1/MainActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package io.getstream.stream_chat_v1
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}
diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-hdpi/ic_launcher_background.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-hdpi/ic_launcher_background.png
new file mode 100644
index 0000000..83e8029
Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-hdpi/ic_launcher_background.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..8c255db
Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-mdpi/ic_launcher_background.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-mdpi/ic_launcher_background.png
new file mode 100644
index 0000000..6a78a31
Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-mdpi/ic_launcher_background.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..0145cae
Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..58bbfe9
Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..f7bf254
Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..b1b4cac
Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..837416c
Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..8b20fd6
Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..5f89936
Binary files /dev/null and b/packages/stream_chat_v1/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/packages/stream_chat_v1/android/app/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 2ef2ab2..0000000
--- a/packages/stream_chat_v1/android/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group android:scaleX="0.72"
-      android:scaleY="0.72"
-      android:translateX="15.12"
-      android:translateY="15.12">
-    <path
-        android:pathData="M65.042,45.564L88.074,43.931C89.594,43.823 90.552,45.537 89.663,46.775L83.777,54.973C82.711,54.334 81.584,53.787 80.406,53.343L83.12,49.571L76.042,52.219C75.049,52.075 74.033,52 73,52C72.395,52 71.795,52.026 71.203,52.076L82.08,47.95L68.044,48.956L70.849,52.109C69.487,52.247 68.163,52.516 66.89,52.903L54.917,39.39V58.184L60.614,56.04C59.31,56.994 58.12,58.094 57.069,59.317L56.612,59.488L56.849,59.577C56.439,60.07 56.052,60.581 55.687,61.111L54.917,60.823V62.316C54.191,63.543 53.585,64.85 53.118,66.221V60.823L38.17,66.409H53.055C52.677,67.555 52.394,68.744 52.217,69.967H35.958C35.379,69.967 34.836,69.689 34.498,69.219L18.343,46.777C17.452,45.539 18.409,43.823 19.931,43.931L42.893,45.564L52.7,34.599C53.419,33.796 54.678,33.801 55.391,34.61L65.042,45.564ZM51.393,59.488L36.121,65.189L24.885,49.571L51.393,59.488ZM53.133,58.185V39.388L40.645,53.484L53.133,58.185ZM36.983,52.184L39.856,48.956L25.82,47.95L36.983,52.184ZM73,90C82.389,90 90,82.389 90,73C90,63.611 82.389,56 73,56C63.611,56 56,63.611 56,73C56,82.389 63.611,90 73,90Z"
-        android:fillColor="#ffffff"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M73.291,61.342L61.624,72.996L65.217,76.589L80.448,61.354H73.304L73.291,61.342ZM73.305,72.094L67.021,78.365L73.304,84.648H80.464L74.19,78.367L80.464,72.094H73.306L73.305,72.094Z"
-        android:fillColor="#000000"/>
-  </group>
-</vector>
diff --git a/packages/stream_chat_v1/android/app/src/main/res/drawable/launch_background.xml b/packages/stream_chat_v1/android/app/src/main/res/drawable/launch_background.xml
index 3618fa7..304732f 100644
--- a/packages/stream_chat_v1/android/app/src/main/res/drawable/launch_background.xml
+++ b/packages/stream_chat_v1/android/app/src/main/res/drawable/launch_background.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/splash_color"/>
+    <item android:drawable="@android:color/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
 </layer-list>
diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd..7e91a57 100644
--- a/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
+  <background android:drawable="@drawable/ic_launcher_background"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 7353dbd..0000000
--- a/packages/stream_chat_v1/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 818a3c8..8ec56ee 100644
Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 818a3c8..0000000
Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 38bf9b8..2f7fdaa 100644
Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 38bf9b8..0000000
Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 1367146..2c20055 100644
Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 1367146..0000000
Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index bd5086f..89492aa 100644
Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index bd5086f..0000000
Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 6a602c3..dd30e06 100644
Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 6a602c3..0000000
Binary files a/packages/stream_chat_v1/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/packages/stream_chat_v1/android/app/src/main/res/values-night/styles.xml b/packages/stream_chat_v1/android/app/src/main/res/values-night/styles.xml
index 449a9f9..06952be 100644
--- a/packages/stream_chat_v1/android/app/src/main/res/values-night/styles.xml
+++ b/packages/stream_chat_v1/android/app/src/main/res/values-night/styles.xml
@@ -3,14 +3,14 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/packages/stream_chat_v1/android/app/src/main/res/values/colors.xml b/packages/stream_chat_v1/android/app/src/main/res/values/colors.xml
deleted file mode 100644
index e0b6c6f..0000000
--- a/packages/stream_chat_v1/android/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="splash_color">#005fff</color>
-</resources>
\ No newline at end of file
diff --git a/packages/stream_chat_v1/android/app/src/main/res/values/ic_launcher_background.xml b/packages/stream_chat_v1/android/app/src/main/res/values/ic_launcher_background.xml
deleted file mode 100644
index c5d819c..0000000
--- a/packages/stream_chat_v1/android/app/src/main/res/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#005FFF</color>
-</resources>
\ No newline at end of file
diff --git a/packages/stream_chat_v1/android/app/src/main/res/values/styles.xml b/packages/stream_chat_v1/android/app/src/main/res/values/styles.xml
index 00fa441..cb1ef88 100644
--- a/packages/stream_chat_v1/android/app/src/main/res/values/styles.xml
+++ b/packages/stream_chat_v1/android/app/src/main/res/values/styles.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
 </resources>
diff --git a/packages/stream_chat_v1/assets/android_icon.png b/packages/stream_chat_v1/assets/android_icon.png
deleted file mode 100644
index 3b85d6c..0000000
Binary files a/packages/stream_chat_v1/assets/android_icon.png and /dev/null differ
diff --git a/packages/stream_chat_v1/assets/ios_icon.png b/packages/stream_chat_v1/assets/ic_launcher.png
similarity index 100%
rename from packages/stream_chat_v1/assets/ios_icon.png
rename to packages/stream_chat_v1/assets/ic_launcher.png
diff --git a/packages/stream_chat_v1/assets/ic_launcher_background.png b/packages/stream_chat_v1/assets/ic_launcher_background.png
new file mode 100644
index 0000000..651c64f
Binary files /dev/null and b/packages/stream_chat_v1/assets/ic_launcher_background.png differ
diff --git a/packages/stream_chat_v1/assets/ic_launcher_foreground.png b/packages/stream_chat_v1/assets/ic_launcher_foreground.png
new file mode 100644
index 0000000..fc3d22e
Binary files /dev/null and b/packages/stream_chat_v1/assets/ic_launcher_foreground.png differ
diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
new file mode 100644
index 0000000..5fa6152
Binary files /dev/null and b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ
diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
new file mode 100644
index 0000000..8874ac7
Binary files /dev/null and b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ
diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
new file mode 100644
index 0000000..bc00e9c
Binary files /dev/null and b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
new file mode 100644
index 0000000..527ae4c
Binary files /dev/null and b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
new file mode 100644
index 0000000..8ec56ee
Binary files /dev/null and b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ
diff --git a/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
new file mode 100644
index 0000000..89492aa
Binary files /dev/null and b/packages/stream_chat_v1/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ
diff --git a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index a2ec33f..96d3fee 100644
--- a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,68 +1,68 @@
 {
-  "images" : [
-    {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_16.png",
-      "scale" : "1x"
+    "info": {
+        "version": 1,
+        "author": "xcode"
     },
-    {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_64.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_128.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_1024.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+    "images": [
+        {
+            "size": "16x16",
+            "idiom": "mac",
+            "filename": "app_icon_16.png",
+            "scale": "1x"
+        },
+        {
+            "size": "16x16",
+            "idiom": "mac",
+            "filename": "app_icon_32.png",
+            "scale": "2x"
+        },
+        {
+            "size": "32x32",
+            "idiom": "mac",
+            "filename": "app_icon_32.png",
+            "scale": "1x"
+        },
+        {
+            "size": "32x32",
+            "idiom": "mac",
+            "filename": "app_icon_64.png",
+            "scale": "2x"
+        },
+        {
+            "size": "128x128",
+            "idiom": "mac",
+            "filename": "app_icon_128.png",
+            "scale": "1x"
+        },
+        {
+            "size": "128x128",
+            "idiom": "mac",
+            "filename": "app_icon_256.png",
+            "scale": "2x"
+        },
+        {
+            "size": "256x256",
+            "idiom": "mac",
+            "filename": "app_icon_256.png",
+            "scale": "1x"
+        },
+        {
+            "size": "256x256",
+            "idiom": "mac",
+            "filename": "app_icon_512.png",
+            "scale": "2x"
+        },
+        {
+            "size": "512x512",
+            "idiom": "mac",
+            "filename": "app_icon_512.png",
+            "scale": "1x"
+        },
+        {
+            "size": "512x512",
+            "idiom": "mac",
+            "filename": "app_icon_1024.png",
+            "scale": "2x"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png
index 3c4935a..6286cc9 100644
Binary files a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ
diff --git a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png
index ed4cc16..c8b042e 100644
Binary files a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ
diff --git a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png
index 483be61..bc3b6c5 100644
Binary files a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ
diff --git a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png
index bcbf36d..1003e61 100644
Binary files a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ
diff --git a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png
index 9c0a652..1457317 100644
Binary files a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ
diff --git a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png
index e71a726..e362036 100644
Binary files a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ
diff --git a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png
index 8a31fe2..c4d5157 100644
Binary files a/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/packages/stream_chat_v1/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ
diff --git a/packages/stream_chat_v1/pubspec.yaml b/packages/stream_chat_v1/pubspec.yaml
index cfc14b8..9ce8c22 100644
--- a/packages/stream_chat_v1/pubspec.yaml
+++ b/packages/stream_chat_v1/pubspec.yaml
@@ -32,7 +32,7 @@ dependencies:
   yaml: ^3.1.0
   uuid: ^3.0.5
   streaming_shared_preferences: ^2.0.0
-  lottie: ^2.0.0
+  lottie: ^2.3.2
   collection: ^1.15.0
   sentry_flutter: ^6.5.0
   flutter_slidable: ^2.0.0
@@ -40,8 +40,7 @@ dependencies:
   provider: ^6.0.3
 
 dev_dependencies:
-  flutter_launcher_icons: ^0.9.2
-  test: any
+  flutter_launcher_icons: ^0.12.0
   flutter_lints: ^2.0.0
 
 dependency_overrides:
@@ -62,13 +61,20 @@ dependency_overrides:
       path: packages/stream_chat_flutter
 
 flutter:
+  uses-material-design: true
   assets:
     - assets/
-    - pubspec.lock
-  uses-material-design: true
 
 flutter_icons:
+  image_path: "assets/ic_launcher.png"
+
   android: true
+  adaptive_icon_background: "assets/ic_launcher_background.png"
+  adaptive_icon_foreground: "assets/ic_launcher_foreground.png"
   ios: true
-  image_path_android: "assets/android_icon.png"
-  image_path_ios: "assets/ios_icon.png"
+  web:
+    generate: true
+  windows:
+    generate: true
+  macos:
+    generate: true
diff --git a/packages/stream_chat_v1/web/favicon.png b/packages/stream_chat_v1/web/favicon.png
index 8aaa46a..bc3b6c5 100644
Binary files a/packages/stream_chat_v1/web/favicon.png and b/packages/stream_chat_v1/web/favicon.png differ
diff --git a/packages/stream_chat_v1/web/icons/Icon-192.png b/packages/stream_chat_v1/web/icons/Icon-192.png
index b749bfe..dd30e06 100644
Binary files a/packages/stream_chat_v1/web/icons/Icon-192.png and b/packages/stream_chat_v1/web/icons/Icon-192.png differ
diff --git a/packages/stream_chat_v1/web/icons/Icon-512.png b/packages/stream_chat_v1/web/icons/Icon-512.png
index 88cfd48..e362036 100644
Binary files a/packages/stream_chat_v1/web/icons/Icon-512.png and b/packages/stream_chat_v1/web/icons/Icon-512.png differ
diff --git a/packages/stream_chat_v1/web/icons/Icon-maskable-192.png b/packages/stream_chat_v1/web/icons/Icon-maskable-192.png
new file mode 100644
index 0000000..dd30e06
Binary files /dev/null and b/packages/stream_chat_v1/web/icons/Icon-maskable-192.png differ
diff --git a/packages/stream_chat_v1/web/icons/Icon-maskable-512.png b/packages/stream_chat_v1/web/icons/Icon-maskable-512.png
new file mode 100644
index 0000000..e362036
Binary files /dev/null and b/packages/stream_chat_v1/web/icons/Icon-maskable-512.png differ
diff --git a/packages/stream_chat_v1/web/manifest.json b/packages/stream_chat_v1/web/manifest.json
index 97eb9af..0657cf7 100644
--- a/packages/stream_chat_v1/web/manifest.json
+++ b/packages/stream_chat_v1/web/manifest.json
@@ -18,6 +18,18 @@
             "src": "icons/Icon-512.png",
             "sizes": "512x512",
             "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-maskable-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "icons/Icon-maskable-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
         }
     ]
-}
+}
\ No newline at end of file