diff --git a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png
index 96771cd..473e40b 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png
index a72bc62..10eedf4 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png
index 7639651..33f1209 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png
index 8dc6a35..b4ac87a 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png
index 073e2f0..b246656 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differ
diff --git a/flutter_launcher_icons.yaml b/flutter_launcher_icons.yaml
index d4b9dd3..f55400d 100644
--- a/flutter_launcher_icons.yaml
+++ b/flutter_launcher_icons.yaml
@@ -1,22 +1,17 @@
+# flutter pub run flutter_launcher_icons
 flutter_launcher_icons:
-  image_path: "assets/icon/headlines_toolkit.png"
+  image_path: "assets/icon/logo.png"
 
   android: "launcher_icon"
-  # image_path_android: "assets/icon/headlines_toolkit.png"
+  # image_path_android: "assets/icon/logo.png"
   min_sdk_android: 21 # android min sdk min:16, default 21
   # adaptive_icon_background: "assets/icon/background.png"
   # adaptive_icon_foreground: "assets/icon/foreground.png"
+  # adaptive_icon_foreground_inset: 16
   # adaptive_icon_monochrome: "assets/icon/monochrome.png"
 
-  ios: false
-  # image_path_ios: "assets/icon/headlines_toolkit.png"
-  remove_alpha_channel_ios: true
-  # image_path_ios_dark_transparent: "assets/icon/icon_dark.png"
-  # image_path_ios_tinted_grayscale: "assets/icon/icon_tinted.png"
-  # desaturate_tinted_to_grayscale_ios: true
-
   web:
     generate: true
     # image_path: "assets/icon/headlines_toolkit.png"
     background_color: "#FFFFFF"
-    theme_color: "#FFFFFF"
\ No newline at end of file
+    theme_color: "#FFFFFF"
diff --git a/lib/app/services/splash_remover_stub.dart b/lib/app/services/splash_screen_remover/splash_remover_stub.dart
similarity index 100%
rename from lib/app/services/splash_remover_stub.dart
rename to lib/app/services/splash_screen_remover/splash_remover_stub.dart
diff --git a/lib/app/services/splash_remover_web.dart b/lib/app/services/splash_screen_remover/splash_remover_web.dart
similarity index 100%
rename from lib/app/services/splash_remover_web.dart
rename to lib/app/services/splash_screen_remover/splash_remover_web.dart
diff --git a/lib/app/services/web_splash.dart b/lib/app/services/splash_screen_remover/web_splash_remover.dart
similarity index 100%
rename from lib/app/services/web_splash.dart
rename to lib/app/services/splash_screen_remover/web_splash_remover.dart
diff --git a/lib/main.dart b/lib/main.dart
index f1ffe48..3c5641e 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,12 +1,12 @@
 import 'package:device_preview/device_preview.dart';
-import 'package:flutter_news_app_mobile_client_full_source_code/app/services/web_splash.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/app/config/config.dart';
+import 'package:flutter_news_app_mobile_client_full_source_code/app/services/splash_screen_remover/web_splash_remover.dart';
 import 'package:flutter_news_app_mobile_client_full_source_code/bootstrap.dart';
 
 // Define the current application environment (production/development/demo).
-const appEnvironment = AppEnvironment.development;
+const appEnvironment = AppEnvironment.demo;
 
 void main() async {
   final appConfig = switch (appEnvironment) {
diff --git a/web/favicon.png b/web/favicon.png
index 2764956..6888380 100644
Binary files a/web/favicon.png and b/web/favicon.png differ
diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png
index 073e2f0..b246656 100644
Binary files a/web/icons/Icon-192.png and b/web/icons/Icon-192.png differ
diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png
index 8b2140a..00eb6c2 100644
Binary files a/web/icons/Icon-512.png and b/web/icons/Icon-512.png differ
diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png
index 073e2f0..b246656 100644
Binary files a/web/icons/Icon-maskable-192.png and b/web/icons/Icon-maskable-192.png differ
diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png
index 8b2140a..00eb6c2 100644
Binary files a/web/icons/Icon-maskable-512.png and b/web/icons/Icon-maskable-512.png differ
diff --git a/web/index.html b/web/index.html
index ce320cd..49d669c 100644
--- a/web/index.html
+++ b/web/index.html
@@ -29,6 +29,7 @@
 
   <title>Flutter News App</title>
   <link rel="manifest" href="manifest.json">
+  <link rel="stylesheet" type="text/css" href="splash/splash.css">
   
   
   <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
@@ -98,20 +99,19 @@
   </style>
   <script id="splash-screen-script">
     function removeSplashFromWeb() {
-      document.getElementById("splash")?.remove();
-      document.getElementById("splash-branding")?.remove();
+      document.getElementById("splash-container")?.remove();
       document.body.style.background = "transparent";
     }
   </script>
 </head>
 <body>
-  <picture id="splash">
-      <source srcset="splash/img/light-1x.png 1x, splash/img/light-2x.png 2x, splash/img/light-3x.png 3x, splash/img/light-4x.png 4x" media="(prefers-color-scheme: light)">
-      <source srcset="splash/img/dark-1x.png 1x, splash/img/dark-2x.png 2x, splash/img/dark-3x.png 3x, splash/img/dark-4x.png 4x" media="(prefers-color-scheme: dark)">
-      <img class="center" aria-hidden="true" src="splash/img/light-1x.png" alt="">
-  </picture>
-  <div id="loading-indicator">
-    <div class="spinner"></div>
+  <div id="splash-container" class="center">
+    <picture id="splash">
+        <source srcset="splash/img/light-1x.png 1x, splash/img/light-2x.png 2x, splash/img/light-3x.png 3x, splash/img/light-4x.png 4x" media="(prefers-color-scheme: light)">
+        <source srcset="splash/img/dark-1x.png 1x, splash/img/dark-2x.png 2x, splash/img/dark-3x.png 3x, splash/img/dark-4x.png 4x" media="(prefers-color-scheme: dark)">
+        <img aria-hidden="true" src="splash/img/light-1x.png" alt="">
+    </picture>
+    <div class="loader"></div>
   </div>
   <script>
     {{flutter_bootstrap_js}}
@@ -119,4 +119,4 @@
 
 
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/web/splash/splash.css b/web/splash/splash.css
new file mode 100644
index 0000000..9c385b2
--- /dev/null
+++ b/web/splash/splash.css
@@ -0,0 +1,46 @@
+.center {
+  margin: 0;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  -ms-transform: translate(-50%, -50%);
+  transform: translate(-50%, -50%);
+}
+
+#splash-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+
+#splash {
+  margin-bottom: 20px;
+}
+
+.loader {
+  border: 4px solid #f3f3f3;
+  border-radius: 50%;
+  border-top: 4px solid #3498db;
+  width: 40px;
+  height: 40px;
+  -webkit-animation: spin 2s linear infinite; /* Safari */
+  animation: spin 2s linear infinite;
+}
+
+/* Safari */
+@-webkit-keyframes spin {
+  0% { -webkit-transform: rotate(0deg); }
+  100% { -webkit-transform: rotate(360deg); }
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
+@media (prefers-color-scheme: dark) {
+  .loader {
+    border-top: 4px solid #90caf9; /* A lighter blue for dark mode */
+  }
+}