diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
deleted file mode 100644
index f000541..0000000
--- a/.fvm/fvm_config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "flutterSdkVersion": "3.13.8",
-  "flavors": {}
-}
\ No newline at end of file
diff --git a/.fvmrc b/.fvmrc
new file mode 100644
index 0000000..3072dbc
--- /dev/null
+++ b/.fvmrc
@@ -0,0 +1,3 @@
+{
+  "flutter": "3.13.8"
+}
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 563de0a..7727490 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,40 +1,37 @@
 ---
 name: Bug Report
-about: Create a report to help us improve
+about: Create a bug report to help us improve
 title: '[Bug]: '
 labels: bug
 assignees: ''
 
 ---
 
-*For questions or comments, please use the [Discussions](https://github.com/jithware/brethap/discussions) section. Please complete the sections below:*
+*For questions or comments, please use the [Discussions](https://github.com/jithware/brethap/discussions) section. Please complete **all** the sections below:*
 
-**Describe the bug**
+**Describe the bug:**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
+**Steps to Reproduce:**
+Include all steps to reproduce the behavior. Be specific. If a bug can not be reproduced by the assignee, it will likely not be resolvable.
 1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
+2. Click on '...'
+3. Scroll down to '...'
 4. See error
 
-**Expected behavior**
+**Expected behavior:**
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+**Screenshots:**
+If applicable, [add](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/attaching-files) screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 1.0.1+10]
+**Smartphone:** Detail information about the device the bug occurs on.
+ - Device: [e.g. Pixel 5]
+ - OS: [e.g. Android 14]
+ - Brethap version [e.g. 1.0.1+10]
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 1.0.1+10]
+**Additional context:**
 
-**Additional context**
-Add any other context or screenshots about the problem here.
+[Attach](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/attaching-files) any other context [e.g. .txt file] or screenshots about the problem here. 
+
+*Note: external urls to images or files are not acceptable as they can be temporary or altered, thereby not preserving the integrity of the bug history.*
diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml
index 6cb72b8..ab57bb3 100644
--- a/.github/workflows/flutter.yml
+++ b/.github/workflows/flutter.yml
@@ -12,7 +12,7 @@ jobs:
 
     # See https://github.com/subosito/flutter-action 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: subosito/flutter-action@v2
       with:
         flutter-version: '3.13.8'
diff --git a/.gitignore b/.gitignore
index bf23a66..b8585c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,5 +52,7 @@ brethap.tar.gz
 # Output of flutter test
 downloadsPath/brethap.sessions.csv
 
-# Flutter version management set with: fvm use 3.10.3
-.fvm/flutter_sdk
+# Flutter version management set with: fvm use 3.13.8
+
+# FVM Version Cache
+.fvm/
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
index bc5eea9..a94ccc8 100644
Binary files a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ
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..97901c0
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_foreground.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
index 8d8b515..26ab429 100644
Binary files a/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.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..f1400a1
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_foreground.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
index d783dfb..fcf8826 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.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..d954853
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_foreground.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
index 61307e9..ba5a019 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.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..a55ff12
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_foreground.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
index 47827c4..7c4e210 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.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..875a66b
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 b26e945..f606c4d 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
@@ -2,5 +2,5 @@
 <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"/>
-  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index b99d9f2..709e40f 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index c97804f..d37392c 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index ad88bab..cb285f6 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 8abd0e4..a89ef4e 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 2d235bd..9ef8db0 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/docs/flutter_service_worker.js b/docs/flutter_service_worker.js
index d39978b..4862689 100644
--- a/docs/flutter_service_worker.js
+++ b/docs/flutter_service_worker.js
@@ -36,10 +36,10 @@ const RESOURCES = {"assets/FontManifest.json": "7b2a36307916a9721811788013e65289
 "manifest.json": "7dbb56011187c29a1092f838ef6df339",
 "README.md": "e36fa824f15fa14b5e13c4be30936e63",
 "flutter.js": "6fef97aeca90b426343ba6c5c9dc5d4a",
-"index.html": "1bc3e24008e9791157418d0b881e2f88",
-"/": "1bc3e24008e9791157418d0b881e2f88",
-"main.dart.js": "7482d33bea8bce23ee1acab6b231e414",
-"version.json": "6bd65753696e376b299047f14478f9de"};
+"index.html": "b5277170683580dbd63d8d0973bcd2ea",
+"/": "b5277170683580dbd63d8d0973bcd2ea",
+"main.dart.js": "4e989ad06bf85794ccfb8c9a6321c326",
+"version.json": "109f8e0215fc4dfe10981ce4afff291b"};
 // The application shell files that are downloaded before a service worker can
 // start.
 const CORE = ["main.dart.js",
diff --git a/docs/index.html b/docs/index.html
index 57b484e..410c153 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -31,7 +31,7 @@
        application. For more information, see:
        https://developers.google.com/web/fundamentals/primers/service-workers -->
   <script>
-    const serviceWorkerVersion = "989146414";
+    const serviceWorkerVersion = "1660253434";
     var scriptLoaded = false;
     function loadMainDartJs() {
       if (scriptLoaded) {
diff --git a/docs/main.dart.js b/docs/main.dart.js
index e82f882..33f9297 100644
--- a/docs/main.dart.js
+++ b/docs/main.dart.js
@@ -50783,7 +50783,7 @@ i.toString
 i=A.qG(f,f,B.QT,f,new A.awA(g),!1,f,A.an(i.gx_(),f,f,f,f,f,f,f,f))
 h=A.aw(a,B.p,s)
 h.toString
-r=A.aiP(A.a([new A.ON(B.IU,o,f),q,m,l,A.we(!0,new A.Kz(B.QM,j,k,p,"Copyright 2023 Jithware. All rights reserved.",A.a([i,A.qG(f,f,B.QP,f,new A.awB(g),!1,f,A.an(h.gyc(),f,f,f,f,f,f,f,f)),A.ht(A.aN8("images/github-qr.png"),f,f)],r),f),B.Y,!0)],r),B.Y,f,!1)
+r=A.aiP(A.a([new A.ON(B.IU,o,f),q,m,l,A.we(!0,new A.Kz(B.QM,j,k,p,"Copyright 2024 Jithware. All rights reserved.",A.a([i,A.qG(f,f,B.QP,f,new A.awB(g),!1,f,A.an(h.gyc(),f,f,f,f,f,f,f,f)),A.ht(A.aN8("images/github-qr.png"),f,f)],r),f),B.Y,!0)],r),B.Y,f,!1)
 if(g.d){s=A.aw(a,B.p,s)
 s.toString
 s=s.gu1(s)}else{s=A.aw(a,B.p,s)
diff --git a/docs/version.json b/docs/version.json
index af66cd3..f62912d 100644
--- a/docs/version.json
+++ b/docs/version.json
@@ -1 +1 @@
-{"app_name":"brethap","version":"1.7.24","build_number":"122","package_name":"brethap"}
\ No newline at end of file
+{"app_name":"brethap","version":"1.7.25","build_number":"124","package_name":"brethap"}
\ No newline at end of file
diff --git a/fastlane/metadata/android/README.md b/fastlane/metadata/android/README.md
index 998904e..a872c00 100644
--- a/fastlane/metadata/android/README.md
+++ b/fastlane/metadata/android/README.md
@@ -11,6 +11,7 @@ git pull
 git checkout fdroid
 git merge --no-ff --no-commit master  # resolve any conflicts here
 git push
+git checkout master
 ```
 
 ## Update a pull request
diff --git a/fastlane/metadata/android/en-US/changelogs/124.txt b/fastlane/metadata/android/en-US/changelogs/124.txt
new file mode 100644
index 0000000..56790c2
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/124.txt
@@ -0,0 +1,3 @@
+Release version: 1.7.25+124
+* Update icons
+* Other minor enhancements
diff --git a/images/README.md b/images/README.md
index d0eecc6..890f1ec 100644
--- a/images/README.md
+++ b/images/README.md
@@ -16,4 +16,14 @@ Export to webp
 File->Export As "animated.webp" 
 Export->Lossless, As Animation, Loop forever, Delay 100ms
 Export
+```
+
+Convert to gray
+```
+convert launcher-adaptive.png -colorspace gray launcher-monochrome.png 
+```
+
+Convert to svg
+```
+convert -threshold 0% -negate app_icon.png launcher.svg && sed -i 's/fill="#000000"/fill="#1e88e5"/g' launcher.svg
 ```
\ No newline at end of file
diff --git a/images/launcher-adaptive.png b/images/launcher-adaptive.png
new file mode 100644
index 0000000..a43b898
Binary files /dev/null and b/images/launcher-adaptive.png differ
diff --git a/images/launcher-monochrome.png b/images/launcher-monochrome.png
new file mode 100644
index 0000000..01dafe2
Binary files /dev/null and b/images/launcher-monochrome.png differ
diff --git a/images/launcher.svg b/images/launcher.svg
index 4f55084..1667cf7 100644
--- a/images/launcher.svg
+++ b/images/launcher.svg
@@ -1 +1,26 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path d="m36.929 34.225c-.688-.315-1.654-.479-2.899-.492h-7.143v7.736h7.045c1.258 0 2.238-.171 2.938-.512 1.271-.631 1.907-1.838 1.907-3.623 0-1.509-.616-2.545-1.848-3.109" fill="#1e88e5"/><path d="m37.008 28.211c.785-.479 1.179-1.329 1.179-2.55 0-1.352-.52-2.244-1.558-2.677-.896-.303-2.04-.453-3.43-.453h-6.313v6.397h7.053c1.26.001 2.284-.239 3.069-.717" fill="#1e88e5"/><path d="m32 2c-16.568 0-30 13.432-30 30s13.432 30 30 30 30-13.432 30-30-13.432-30-30-30m11.607 40.374c-.549.905-1.232 1.667-2.055 2.283-.927.709-2.02 1.194-3.279 1.457-1.259.263-2.625.394-4.1.394h-13.073v-29.016h14.023c3.537.052 6.044 1.082 7.52 3.09.888 1.234 1.332 2.71 1.332 4.43 0 1.771-.449 3.195-1.344 4.271-.502.604-1.238 1.154-2.214 1.653 1.481.538 2.599 1.392 3.353 2.56.753 1.168 1.13 2.585 1.13 4.252-.001 1.719-.431 3.261-1.293 4.626" fill="#1e88e5"/></svg>
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="512.000000pt" height="512.000000pt" viewBox="0 0 512.000000 512.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+</metadata>
+<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)"
+fill="#1e88e5" stroke="none">
+<path d="M2245 4944 c-526 -71 -1008 -308 -1380 -679 -381 -379 -619 -862
+-690 -1398 -20 -155 -20 -459 0 -614 70 -528 304 -1008 675 -1383 265 -268
+592 -471 945 -589 269 -89 472 -121 765 -121 292 0 493 32 765 121 866 284
+1499 1055 1620 1972 20 155 20 459 0 614 -58 442 -233 853 -512 1203 -86 109
+-265 286 -371 370 -353 276 -758 448 -1195 505 -146 19 -481 18 -622 -1z m659
+-1234 c199 -20 346 -80 451 -185 105 -106 155 -237 155 -409 0 -198 -68 -332
+-216 -428 -35 -22 -64 -42 -64 -43 0 -1 29 -16 64 -34 78 -38 158 -109 201
+-176 123 -194 121 -477 -6 -692 -54 -91 -171 -202 -259 -245 -169 -83 -232
+-90 -937 -95 l-603 -5 0 1161 0 1161 558 0 c306 0 602 -5 656 -10z"/>
+<path d="M2150 3060 l0 -260 313 0 c346 0 417 9 497 58 27 17 55 45 70 72 22
+39 25 57 25 135 0 107 -22 160 -84 201 -66 43 -160 53 -508 54 l-313 0 0 -260z"/>
+<path d="M2150 2114 l0 -315 363 3 c416 5 426 6 508 88 59 59 82 125 83 235 1
+98 -15 145 -66 201 -81 88 -172 104 -605 104 l-283 0 0 -316z"/>
+</g>
+</svg>
diff --git a/images/launcher.xcf b/images/launcher.xcf
index 55b5d31..506a94f 100644
Binary files a/images/launcher.xcf and b/images/launcher.xcf differ
diff --git a/integration_test/app_test.dart b/integration_test/app_test.dart
index ad1ae72..707a243 100644
--- a/integration_test/app_test.dart
+++ b/integration_test/app_test.dart
@@ -35,7 +35,9 @@ Future<void> main() async {
   testWidgets('Integration test', (WidgetTester tester) async {
     app.main();
 
-    await tester.pump(wait);
+    // Allow splash screen to clear
+    await tester.pump(wait * 3);
+    await tester.pumpAndSettle();
 
     await testHomeWidget(tester);
 
diff --git a/lib/constants.dart b/lib/constants.dart
index b86e162..ad555e6 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -5,7 +5,7 @@ const String JITHWARE_URL = "http://www.jithware.com",
         "https://www.paypal.com/donate/?hosted_button_id=2ZFSMQ8DGQVFS",
     BUGS_URL = "https://github.com/jithware/brethap/issues",
     HELP_URL = "https://github.com/jithware/brethap#readme",
-    COPYRIGHT = "Copyright 2023 Jithware. All rights reserved.",
+    COPYRIGHT = "Copyright 2024 Jithware. All rights reserved.",
     APP_NAME = "Brethap";
 
 const String DATE_FORMAT = "yyyy-MM-dd h:mm a",
diff --git a/pubspec.lock b/pubspec.lock
index f08e788..3947d66 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -310,10 +310,11 @@ packages:
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
-      name: flutter_launcher_icons
-      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: master
+      resolved-ref: "006cb1ed53f969bf11816cde5b16dd520e1ee40e"
+      url: "https://github.com/fluttercommunity/flutter_launcher_icons.git"
+    source: git
     version: "0.13.1"
   flutter_lints:
     dependency: "direct dev"
diff --git a/pubspec.yaml b/pubspec.yaml
index 4f33f5b..e5c5561 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,11 +15,11 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.7.24+122
+version: 1.7.25+124
 
 environment:
   sdk: ">=3.1.4 <4.0.0"
-  flutter: ^3.13.8
+  flutter: 3.13.8
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -57,7 +57,10 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  flutter_launcher_icons: ^0.13.0
+  flutter_launcher_icons: 
+    git:
+      url: https://github.com/fluttercommunity/flutter_launcher_icons.git
+      ref: master 
   flutter_lints: ^3.0.0
   path_provider_platform_interface: ^2.0.5
   plugin_platform_interface: ^2.1.3
@@ -66,13 +69,15 @@ dev_dependencies:
   hive_generator: ^2.0.0
   build_runner: ^2.1.0
 
-# To build launcher icons run: flutter pub run flutter_launcher_icons:main
+# To build launcher icons run: dart run flutter_launcher_icons
 flutter_icons:
   android: "ic_launcher"
   ios: false
-  image_path: "images/launcher.png"
-  adaptive_icon_foreground: "images/launcher.png"
+  image_path: "images/app_icon.png"
+  # See requirements in https://developer.android.com/develop/ui/views/launch/icon_design_adaptive
+  adaptive_icon_foreground: "images/launcher-adaptive.png"
   adaptive_icon_background: "#ffffff"
+  adaptive_icon_monochrome: "images/launcher-monochrome.png"
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec