diff --git a/.gitignore b/.gitignore
index 25c98d5d1f..3e96fb9767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 
 # Built application files
 /build
+/buildSrc
 
 # Local configuration file (sdk path, etc)
 local.properties
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2bb55e36b4..ef93ea2179 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,17 +27,16 @@
     </queries>
 
     <application
-        android:theme="@style/SplashTheme"
-        android:label="@string/tangem_app_name"
         android:name="com.tangem.tap.TapApplication"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher"
-        android:supportsRtl="true"
         android:allowBackup="false"
         android:fullBackupContent="false"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:hardwareAccelerated="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/tangem_app_name"
         android:largeHeap="@bool/largeHeap"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:roundIcon="@mipmap/ic_launcher"
+        android:supportsRtl="true"
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:allowBackup, android:fullBackupContent">
 
@@ -46,10 +45,11 @@
             android:value="true" />
 
         <activity
-            android:exported="true"
             android:name="com.tangem.tap.MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
+            android:theme="@style/SplashTheme"
             android:windowSoftInputMode="adjustResize">
 
             <intent-filter>
@@ -126,13 +126,17 @@
 
         </activity>
 
-        <activity android:name="com.tangem.tap.common.qrCodeScan.ScanQrCodeActivity" />
+        <activity
+            android:name="com.tangem.tap.common.qrCodeScan.ScanQrCodeActivity"
+            android:theme="@style/AppTheme" />
 
         <activity
             android:name="zendesk.messaging.MessagingActivity"
             android:theme="@style/ZendeskTheme" />
 
-        <activity android:name="com.tangem.tap.features.sprinklr.ui.SprinklrActivity" />
+        <activity
+            android:name="com.tangem.tap.features.sprinklr.ui.SprinklrActivity"
+            android:theme="@style/AppTheme" />
 
         <provider
             android:name="androidx.core.content.FileProvider"