diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 961a9924..e11f2fe0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -130,7 +130,7 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           channel: 'stable'
-      - name: "Codesign"
+      - name: "Build & Codesign"
         run: |
           flutter config --enable-macos-desktop
           flutter pub get
@@ -155,10 +155,10 @@ jobs:
           /usr/bin/codesign -vvv --force --deep --options runtime --strict -s Z28DW76Y3W build/macos/Build/Products/Release/notifi.app
 
           # codesign sparkle auto update
-          /usr/bin/codesign -vvv --force --deep --options runtime --strict -s Z28DW76Y3W build/macos/Build/Products/Release/notifi.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app
+          /usr/bin/codesign -vvv --force --deep --options runtime --strict -s Z28DW76Y3W build/macos/Build/Products/Release/notifi.app/Contents/Frameworks/Sparkle.framework/Versions/Current/Updater.app
 
           # codesign binaries
-          /usr/bin/codesign -vvv --force --deep --options runtime --strict -s Z28DW76Y3W build/macos/Build/Products/Release/notifi.app/Contents/Frameworks/Sparkle.framework/Versions/A/Sparkle
+          /usr/bin/codesign -vvv --force --deep --options runtime --strict -s Z28DW76Y3W build/macos/Build/Products/Release/notifi.app/Contents/Frameworks/Sparkle.framework/Versions/Current/Sparkle
           /usr/bin/codesign -vvv --force --deep --options runtime --strict -s Z28DW76Y3W build/macos/Build/Products/Release/notifi.app/Contents/MacOS/notifi
 
       - name: "Create & Notarize .dmg"
diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index b33c806f..a58363c2 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Test
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: 29
+          api-level: 31
           arch: x86_64
           profile: Nexus 6P
           script: ./test_driver/test.sh "${{ matrix.device }}" "${{ matrix.branch }}" "${{ secrets.B64_ENV }}" "${{ secrets.B64_DEV_ENV }}"
diff --git a/.github/workflows/ss.yml b/.github/workflows/ss.yml
index baa7489e..25c3c89e 100644
--- a/.github/workflows/ss.yml
+++ b/.github/workflows/ss.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Take Screenshot
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          api-level: 29
+          api-level: 31
           arch: x86_64
           profile: Nexus 6P
           script: |
diff --git a/README.md b/README.md
index 41160edc..ce490ec4 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,6 @@ http://itunes.apple.com/lookup?bundleId=it.notifi.notifi
 
 ```bash
 ln -s $(pwd)/pre-commit.sh $(pwd)/.git/hooks/pre-commit
-chmod +x $(pwd)/.git/hooks/pre-commit
 ```
 
 ## linux setup
diff --git a/android/app/build.gradle b/android/app/build.gradle
index f0fd0b35..d48806fd 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -33,7 +33,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -49,10 +49,9 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "it.notifi.notifi"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -68,8 +67,6 @@ android {
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.release
         }
     }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index c2727623..eea39a8b 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
         android:label="notifi">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
diff --git a/android/build.gradle b/android/build.gradle
index 4fdd3937..b6af3b75 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.30'
     repositories {
         google()
         mavenCentral()
diff --git a/lib/main.dart b/lib/main.dart
index 349c1922..3f38192e 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -25,6 +25,7 @@ Future<void> main() => mainImpl();
 
 Future<void> mainImpl({bool integration: false}) async {
   WidgetsFlutterBinding.ensureInitialized();
+
   final SharedPreferences sp = await SharedPreferences.getInstance();
   Globals.isIntegration = integration;
 
@@ -77,6 +78,7 @@ Future<void> mainImpl({bool integration: false}) async {
   } catch (_) {
     canBadge = false;
   }
+
   runApp(MultiProvider(
     providers: <SingleChildWidget>[
       ChangeNotifierProvider<TableNotifier>(
diff --git a/lib/screens/utils/scaffold.dart b/lib/screens/utils/scaffold.dart
index 57d45aec..cf3509e3 100644
--- a/lib/screens/utils/scaffold.dart
+++ b/lib/screens/utils/scaffold.dart
@@ -1,3 +1,4 @@
+import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:notifi/notifications/notifis.dart';
 import 'package:notifi/screens/utils/animated_cnt.dart';
@@ -13,8 +14,8 @@ class MyScaffold extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    double paddingTop = 0;
-    if (MediaQuery.of(context).padding.top > 0) {
+    double paddingTop = MediaQuery.of(context).padding.top;
+    if (MediaQuery.of(context).padding.top > 0 && Platform.isIOS) {
       paddingTop = MediaQuery.of(context).padding.top - 20;
     }
     double paddingBottom = 0;
diff --git a/macos/Podfile b/macos/Podfile
index 2eff9865..2c1ae274 100644
--- a/macos/Podfile
+++ b/macos/Podfile
@@ -30,7 +30,7 @@ target 'Runner' do
   use_frameworks!
   use_modular_headers!
 
-  pod 'Sparkle'
+  pod 'Sparkle', '2.0.0'
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
 end
 
diff --git a/pubspec.yaml b/pubspec.yaml
index fc66a998..0b634341 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -12,8 +12,8 @@ dependencies:
   cached_network_image: ^3.1.0
   desktop_window: ^0.4.0
   dio: ^4.0.0
-  firebase_core: ^1.8.0
-  firebase_messaging: ^10.0.9
+  firebase_core: ^1.12.0
+  firebase_messaging: ^11.2.6
   flutter:
     sdk: flutter
   flutter_app_icon_badge: ^2.0.0
diff --git a/test/golden-asserts/screen/no-notifications.png b/test/golden-asserts/screen/no-notifications.png
index 9fd644a8..fe89a247 100644
Binary files a/test/golden-asserts/screen/no-notifications.png and b/test/golden-asserts/screen/no-notifications.png differ
diff --git a/test/golden-asserts/screen/notification.png b/test/golden-asserts/screen/notification.png
index 974ee127..00cb25c2 100644
Binary files a/test/golden-asserts/screen/notification.png and b/test/golden-asserts/screen/notification.png differ
diff --git a/test/golden-asserts/screen/settings.png b/test/golden-asserts/screen/settings.png
index 6652b38c..edcc1b60 100644
Binary files a/test/golden-asserts/screen/settings.png and b/test/golden-asserts/screen/settings.png differ