diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index 123795ab..953a3efa 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -3,8 +3,6 @@ name: Android
 on:
   pull_request:
     branches: [ main, master, develop ]
-  push:
-    branches: [ main, master, develop ]
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/ios-build.yml b/.github/workflows/ios-build.yml
index 433c0fea..b4ad5f83 100644
--- a/.github/workflows/ios-build.yml
+++ b/.github/workflows/ios-build.yml
@@ -3,8 +3,6 @@ name: iOS
 on:
   pull_request:
     branches: [ main, master, develop ]
-  push:
-    branches: [ main, master, develop ]
   workflow_dispatch:
 
 permissions:
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
index 1dc6f6d5..0698bbb9 100644
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -28,6 +28,8 @@ android {
         versionCode = 1
         versionName = appVersionName
 
+        resourceConfigurations.addAll(setOf("en", "ar"))
+
         val baseUrl = localProperties.getProperty("BASE_URL", "")
         buildConfigField("String", "BASE_URL", "\"${baseUrl}\"")
     }
@@ -66,6 +68,10 @@ android {
                 signingConfig = signingConfigs.getByName("release")
             }
 
+            ndk {
+                abiFilters.addAll(setOf("armeabi-v7a", "arm64-v8a"))
+            }
+
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
diff --git a/designSystem/src/commonMain/composeResources/drawable/avatar_me.webp b/designSystem/src/commonMain/composeResources/drawable/img_avatar_me.webp
similarity index 100%
rename from designSystem/src/commonMain/composeResources/drawable/avatar_me.webp
rename to designSystem/src/commonMain/composeResources/drawable/img_avatar_me.webp
diff --git a/designSystem/src/commonMain/composeResources/drawable/img_screenTemplate_dark.png b/designSystem/src/commonMain/composeResources/drawable/img_screenTemplate_dark.png
deleted file mode 100644
index 8ab8ee77..00000000
Binary files a/designSystem/src/commonMain/composeResources/drawable/img_screenTemplate_dark.png and /dev/null differ
diff --git a/designSystem/src/commonMain/composeResources/drawable/img_screenTemplate_dark.webp b/designSystem/src/commonMain/composeResources/drawable/img_screenTemplate_dark.webp
new file mode 100644
index 00000000..7d04b9db
Binary files /dev/null and b/designSystem/src/commonMain/composeResources/drawable/img_screenTemplate_dark.webp differ
diff --git a/designSystem/src/commonMain/composeResources/drawable/img_screenTemplate_light.png b/designSystem/src/commonMain/composeResources/drawable/img_screenTemplate_light.png
deleted file mode 100644
index 11546055..00000000
Binary files a/designSystem/src/commonMain/composeResources/drawable/img_screenTemplate_light.png and /dev/null differ
diff --git a/designSystem/src/commonMain/composeResources/drawable/img_screenTemplate_light.webp b/designSystem/src/commonMain/composeResources/drawable/img_screenTemplate_light.webp
new file mode 100644
index 00000000..0f5daa82
Binary files /dev/null and b/designSystem/src/commonMain/composeResources/drawable/img_screenTemplate_light.webp differ
diff --git a/designSystem/src/commonMain/composeResources/drawable/img_spendoo_robot.png b/designSystem/src/commonMain/composeResources/drawable/img_spendoo_robot.png
deleted file mode 100644
index 2b222f7b..00000000
Binary files a/designSystem/src/commonMain/composeResources/drawable/img_spendoo_robot.png and /dev/null differ
diff --git a/designSystem/src/commonMain/composeResources/drawable/img_spendoo_robot.webp b/designSystem/src/commonMain/composeResources/drawable/img_spendoo_robot.webp
new file mode 100644
index 00000000..ef2cdfd9
Binary files /dev/null and b/designSystem/src/commonMain/composeResources/drawable/img_spendoo_robot.webp differ
diff --git a/statisticsPresentation/src/commonMain/kotlin/com/spendoo/statistics/presentation/screen/statistics/StatisticsScreen.kt b/statisticsPresentation/src/commonMain/kotlin/com/spendoo/statistics/presentation/screen/statistics/StatisticsScreen.kt
index 34abebe0..a3cc87c5 100644
--- a/statisticsPresentation/src/commonMain/kotlin/com/spendoo/statistics/presentation/screen/statistics/StatisticsScreen.kt
+++ b/statisticsPresentation/src/commonMain/kotlin/com/spendoo/statistics/presentation/screen/statistics/StatisticsScreen.kt
@@ -67,7 +67,7 @@ import kotlinx.datetime.LocalDateTime
 import org.koin.compose.viewmodel.koinViewModel
 import org.koin.core.parameter.parametersOf
 import spendoo.designsystem.generated.resources.Res
-import spendoo.designsystem.generated.resources.avatar_me
+import spendoo.designsystem.generated.resources.img_avatar_me
 import spendoo.designsystem.generated.resources.ic_download
 import spendoo.designsystem.generated.resources.ic_user_follow
 
@@ -153,7 +153,7 @@ private fun StatisticsContent(
                     leading = {
                         AsyncImage(
                             model = state.userImageUrl,
-                            placeholder = Res.drawable.avatar_me.painter(),
+                            placeholder = Res.drawable.img_avatar_me.painter(),
                             contentDescription = null,
                             modifier = Modifier
                                 .padding(end = 12.dp)