diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7fc2e2519f..4ce7ef30a4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3836996911..2899e81b02 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -70,7 +70,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files
@@ -89,7 +89,7 @@ jobs:
         run: ./gradlew assemble${{ env.BUILD_TYPE }}
 
       - name: Upload Android ${{ env.BUILD_TYPE }} Artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         if: github.event_name == 'push' || github.event_name == 'schedule'
         with:
           name: androidArtifacts
@@ -138,7 +138,7 @@ jobs:
           file: huawei/${{ env.BUILD_TYPE_LOWERCASE }}/app-huawei-${{ env.BUILD_TYPE_LOWERCASE }}.apk
 
       - name: Delete Android ${{ env.BUILD_TYPE }} Artifacts
-        uses: geekyeggo/delete-artifact@v5.0.0
+        uses: geekyeggo/delete-artifact@v5.1.0
         with:
           name: androidArtifacts
 
@@ -153,7 +153,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files
@@ -173,14 +173,16 @@ jobs:
         run: fastlane build${{ env.BUILD_TYPE }}
 
       - name: Upload iOS Debug Artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         if: github.event_name == 'push'
         with:
           name: iOSArtifacts
-          path: ios/CCC_I.ipa
+          path: |
+            ios/CCC_I.ipa
+            ios/CCC_I.app.dSYM.zip
 
       - name: Upload iOS Artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         if: github.event_name == 'schedule'
         with:
           name: iOSArtifacts
@@ -220,7 +222,7 @@ jobs:
           fastlane distribute${{ env.BUILD_TYPE }}
 
       - name: Delete iOS ${{ env.BUILD_TYPE }} Artifacts
-        uses: geekyeggo/delete-artifact@v5.0.0
+        uses: geekyeggo/delete-artifact@v5.1.0
         with:
           name: iOSArtifacts
 
@@ -235,7 +237,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Test
         run: ./gradlew test
@@ -255,7 +257,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Generate Coverage
         run: ./gradlew koverXmlReport
@@ -273,7 +275,7 @@ jobs:
           coverage-reports: build/reports/kover/report.xml
 
       - name: SonarCloud Scan
-        uses: sonarsource/sonarcloud-github-action@v2.3.0
+        uses: sonarsource/sonarcloud-github-action@v3.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -298,7 +300,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Detekt & Lint
         run: ./gradlew detektAll lint
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index b4ac5b16aa..0807b6b1df 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   ProjectAutomations:
-    uses: Oztechan/Global/.github/workflows/reusable-project.yml@007659c3464bb29eeaaed0abfd2822af806dfe1e
+    uses: Oztechan/Global/.github/workflows/reusable-project.yml@f2926167f4c8103dca1abd9cf2908c83733e1898
     with:
       project_id: 2
     secrets: inherit
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c49bf04150..f6003fbe2c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -8,7 +8,7 @@ on:
 jobs:
 
   PublishRelease:
-    uses: Oztechan/Global/.github/workflows/reusable-publish.yml@007659c3464bb29eeaaed0abfd2822af806dfe1e
+    uses: Oztechan/Global/.github/workflows/reusable-publish.yml@f2926167f4c8103dca1abd9cf2908c83733e1898
     with:
       slack_channel: "ccc-github"
     secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d3c5be2331..8ad471d483 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
     steps:
 
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files
@@ -80,19 +80,19 @@ jobs:
         run: ./gradlew :android:app:bundleRelease :backend:app:jar --parallel
 
       - name: Upload Google App Bundle
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: googleBundle
           path: android/app/build/outputs/bundle/googleRelease/app-google-release.aab
 
       - name: Upload Huawei App Bundle
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: huaweiBundle
           path: android/app/build/outputs/bundle/huaweiRelease/app-huawei-release.aab
 
       - name: Upload Backend Jar
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: backendJar
           path: backend/app/build/libs/app-*.jar
@@ -139,7 +139,7 @@ jobs:
           status: completed
 
       - name: Delete App Bundle
-        uses: geekyeggo/delete-artifact@v5.0.0
+        uses: geekyeggo/delete-artifact@v5.1.0
         with:
           name: googleBundle
 
@@ -170,7 +170,7 @@ jobs:
           file-name: "app-huawei-release"
 
       - name: Delete App Bundle
-        uses: geekyeggo/delete-artifact@v5.0.0
+        uses: geekyeggo/delete-artifact@v5.1.0
         with:
           name: huaweiBundle
 
@@ -201,7 +201,7 @@ jobs:
           SOURCE: "artifact/"
 
       - name: Delete Backend Jar
-        uses: geekyeggo/delete-artifact@v5.0.0
+        uses: geekyeggo/delete-artifact@v5.1.0
         with:
           name: backendJar
 
@@ -215,7 +215,7 @@ jobs:
       status: ${{ steps.status.outputs.status }}
     steps:
       - name: Setup Gradle Repo
-        uses: Oztechan/Global/actions/setup-gradle-repo@007659c3464bb29eeaaed0abfd2822af806dfe1e
+        uses: Oztechan/Global/actions/setup-gradle-repo@f2926167f4c8103dca1abd9cf2908c83733e1898
 
       - name: Adding secret files
         uses: ./.github/actions/add-secret-files
diff --git a/android/app/src/main/kotlin/com/oztechan/ccc/android/app/Application.kt b/android/app/src/main/kotlin/com/oztechan/ccc/android/app/Application.kt
index 2fb5fa644a..d02b67f53b 100644
--- a/android/app/src/main/kotlin/com/oztechan/ccc/android/app/Application.kt
+++ b/android/app/src/main/kotlin/com/oztechan/ccc/android/app/Application.kt
@@ -10,8 +10,8 @@ import android.os.StrictMode.ThreadPolicy
 import android.os.StrictMode.VmPolicy
 import co.touchlab.kermit.Logger
 import com.github.submob.logmob.ANRWatchDogHandler
+import com.github.submob.logmob.enableCrashlyticsCollection
 import com.github.submob.logmob.initLogger
-import com.github.submob.logmob.setCrashlyticsCollection
 import com.oztechan.ccc.android.app.di.initKoin
 import com.oztechan.ccc.client.core.analytics.initAnalytics
 
@@ -20,11 +20,9 @@ class Application : Application() {
     override fun onCreate() {
         super.onCreate()
 
-        setCrashlyticsCollection(!BuildConfig.DEBUG)
+        enableCrashlyticsCollection()
 
-        if (!BuildConfig.DEBUG) {
-            initAnalytics(this)
-        }
+        initAnalytics(this)
 
         initLogger()
 
diff --git a/android/ui/mobile/src/main/ic_launcher-playstore.png b/android/ui/mobile/src/main/ic_launcher-playstore.png
index dd96003a26..10b902d8a4 100644
Binary files a/android/ui/mobile/src/main/ic_launcher-playstore.png and b/android/ui/mobile/src/main/ic_launcher-playstore.png differ
diff --git a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/calculator/CalculatorFragment.kt b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/calculator/CalculatorFragment.kt
index 2ca511c744..5d0b1fa8b5 100755
--- a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/calculator/CalculatorFragment.kt
+++ b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/calculator/CalculatorFragment.kt
@@ -9,6 +9,7 @@ import android.view.View
 import android.widget.Button
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
 import co.touchlab.kermit.Logger
 import com.github.submob.basemob.fragment.BaseVBFragment
 import com.oztechan.ccc.android.core.ad.AdManager
@@ -19,7 +20,6 @@ import com.oztechan.ccc.android.ui.mobile.util.copyToClipBoard
 import com.oztechan.ccc.android.ui.mobile.util.dataState
 import com.oztechan.ccc.android.ui.mobile.util.destroyBanner
 import com.oztechan.ccc.android.ui.mobile.util.getFromClipBoard
-import com.oztechan.ccc.android.ui.mobile.util.getNavigationResult
 import com.oztechan.ccc.android.ui.mobile.util.setBackgroundByName
 import com.oztechan.ccc.android.ui.mobile.util.setBannerAd
 import com.oztechan.ccc.android.ui.mobile.util.showSnack
@@ -55,7 +55,6 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
         binding.observeStates()
         binding.setListeners()
         observeEffects()
-        observeNavigationResults()
     }
 
     override fun onResume() {
@@ -76,14 +75,6 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
         super.onDestroyView()
     }
 
-    private fun observeNavigationResults() = getNavigationResult<String>(
-        CHANGE_BASE_EVENT,
-        R.id.calculatorFragment
-    )?.observe(viewLifecycleOwner) {
-        Logger.i { "CalculatorFragment observeNavigationResults $it" }
-        viewModel.event.onBaseChange(it)
-    }
-
     private fun FragmentCalculatorBinding.initViews() {
         adViewContainer.setBannerAd(
             adManager = adManager,
@@ -200,13 +191,15 @@ class CalculatorFragment : BaseVBFragment<FragmentCalculatorBinding>() {
             ac.setKeyboardListener()
             del.setKeyboardListener()
         }
+
+        findNavController().addOnDestinationChangedListener { _, navDestination, _ ->
+            if (navDestination.id == R.id.calculatorFragment) {
+                onSheetDismissed()
+            }
+        }
     }
 
     private fun Button.setKeyboardListener() = setOnClickListener {
         viewModel.event.onKeyPress(text.toString())
     }
-
-    companion object {
-        const val CHANGE_BASE_EVENT = "change_base"
-    }
 }
diff --git a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/currencies/CurrenciesFragment.kt b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/currencies/CurrenciesFragment.kt
index 66602b4fee..43470dd5c1 100755
--- a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/currencies/CurrenciesFragment.kt
+++ b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/currencies/CurrenciesFragment.kt
@@ -18,12 +18,10 @@ import com.github.submob.basemob.fragment.BaseVBFragment
 import com.oztechan.ccc.android.core.ad.AdManager
 import com.oztechan.ccc.android.ui.mobile.BuildConfig
 import com.oztechan.ccc.android.ui.mobile.R
-import com.oztechan.ccc.android.ui.mobile.content.calculator.CalculatorFragment.Companion.CHANGE_BASE_EVENT
 import com.oztechan.ccc.android.ui.mobile.databinding.FragmentCurrenciesBinding
 import com.oztechan.ccc.android.ui.mobile.util.destroyBanner
 import com.oztechan.ccc.android.ui.mobile.util.hideKeyboard
 import com.oztechan.ccc.android.ui.mobile.util.setBannerAd
-import com.oztechan.ccc.android.ui.mobile.util.setNavigationResult
 import com.oztechan.ccc.android.ui.mobile.util.showSnack
 import com.oztechan.ccc.android.ui.mobile.util.visibleIf
 import com.oztechan.ccc.client.core.analytics.AnalyticsManager
@@ -131,12 +129,6 @@ class CurrenciesFragment : BaseVBFragment<FragmentCurrenciesBinding>() {
                     findNavController().popBackStack()
                     view?.hideKeyboard()
                 }
-
-                is CurrenciesEffect.ChangeBase -> setNavigationResult(
-                    R.id.calculatorFragment,
-                    viewEffect.newBase,
-                    CHANGE_BASE_EVENT
-                )
             }
         }.launchIn(viewLifecycleOwner.lifecycleScope)
 
diff --git a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/main/MainActivity.kt b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/main/MainActivity.kt
index 44068df877..6d3e6e666d 100755
--- a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/main/MainActivity.kt
+++ b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/main/MainActivity.kt
@@ -105,12 +105,12 @@ class MainActivity : BaseActivity() {
     override fun onResume() {
         super.onResume()
         Logger.i { "MainActivity onResume" }
-        viewModel.event.onResume()
+        viewModel.event.onAppForeground()
     }
 
     override fun onPause() {
         Logger.i { "MainActivity onPause" }
-        viewModel.event.onPause()
+        viewModel.event.onAppBackground()
         super.onPause()
     }
 
diff --git a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/premium/PremiumBottomSheet.kt b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/premium/PremiumBottomSheet.kt
index fd003dc6af..3b7e4922d4 100644
--- a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/premium/PremiumBottomSheet.kt
+++ b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/premium/PremiumBottomSheet.kt
@@ -4,6 +4,7 @@
 
 package com.oztechan.ccc.android.ui.mobile.content.premium
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.flowWithLifecycle
@@ -15,8 +16,8 @@ import com.oztechan.ccc.android.core.billing.BillingEffect
 import com.oztechan.ccc.android.core.billing.BillingManager
 import com.oztechan.ccc.android.ui.mobile.BuildConfig
 import com.oztechan.ccc.android.ui.mobile.R
+import com.oztechan.ccc.android.ui.mobile.content.main.MainActivity
 import com.oztechan.ccc.android.ui.mobile.databinding.BottomSheetPremiumBinding
-import com.oztechan.ccc.android.ui.mobile.util.resolveAndStartIntent
 import com.oztechan.ccc.android.ui.mobile.util.showDialog
 import com.oztechan.ccc.android.ui.mobile.util.showSnack
 import com.oztechan.ccc.android.ui.mobile.util.toOldPurchaseList
@@ -112,6 +113,7 @@ class PremiumBottomSheet : BaseVBBottomSheetDialogFragment<BottomSheetPremiumBin
                 } else {
                     billingManager.acknowledgePurchase()
                 }
+
                 is PremiumEffect.ConsumePurchase -> billingManager.consumePurchase(viewEffect.token)
             }
         }.launchIn(viewLifecycleOwner.lifecycleScope)
@@ -156,8 +158,10 @@ class PremiumBottomSheet : BaseVBBottomSheetDialogFragment<BottomSheetPremiumBin
         )
     }
 
-    private fun restartActivity() = activity?.run {
-        finish()
-        resolveAndStartIntent(intent)
+    private fun restartActivity() {
+        val intent = Intent(requireContext(), MainActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+        startActivity(intent)
+        requireActivity().finish()
     }
 }
diff --git a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/selectcurrency/SelectCurrencyAdapter.kt b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/selectcurrency/SelectCurrencyAdapter.kt
index f8357aab3f..a9b156c534 100644
--- a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/selectcurrency/SelectCurrencyAdapter.kt
+++ b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/selectcurrency/SelectCurrencyAdapter.kt
@@ -7,6 +7,7 @@ import com.github.submob.basemob.adapter.BaseVBRecyclerViewAdapter
 import com.oztechan.ccc.android.ui.mobile.databinding.ItemSelectCurrencyBinding
 import com.oztechan.ccc.android.ui.mobile.util.setBackgroundByName
 import com.oztechan.ccc.client.viewmodel.selectcurrency.SelectCurrencyEvent
+import com.oztechan.ccc.client.viewmodel.selectcurrency.model.SelectCurrencyPurpose
 import com.oztechan.ccc.common.core.model.Currency
 
 class SelectCurrencyAdapter(
@@ -30,7 +31,12 @@ class SelectCurrencyAdapter(
         override fun onItemBind(item: Currency) = with(itemBinding) {
             imgIcon.setBackgroundByName(item.code)
             txtSettingItem.text = item.getVariablesOneLine()
-            root.setOnClickListener { selectCurrencyEvent.onItemClick(item) }
+            root.setOnClickListener {
+                selectCurrencyEvent.onItemClick(
+                    item,
+                    SelectCurrencyPurpose.Base
+                )
+            }
         }
     }
 
diff --git a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/selectcurrency/SelectCurrencyBottomSheet.kt b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/selectcurrency/SelectCurrencyBottomSheet.kt
index 8030c56eaf..bfde078100 100644
--- a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/selectcurrency/SelectCurrencyBottomSheet.kt
+++ b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/selectcurrency/SelectCurrencyBottomSheet.kt
@@ -10,9 +10,7 @@ import androidx.lifecycle.lifecycleScope
 import co.touchlab.kermit.Logger
 import com.github.submob.basemob.bottomsheet.BaseVBBottomSheetDialogFragment
 import com.oztechan.ccc.android.ui.mobile.R
-import com.oztechan.ccc.android.ui.mobile.content.calculator.CalculatorFragment.Companion.CHANGE_BASE_EVENT
 import com.oztechan.ccc.android.ui.mobile.databinding.BottomSheetSelectCurrencyBinding
-import com.oztechan.ccc.android.ui.mobile.util.setNavigationResult
 import com.oztechan.ccc.android.ui.mobile.util.visibleIf
 import com.oztechan.ccc.client.core.analytics.AnalyticsManager
 import com.oztechan.ccc.client.core.analytics.model.ScreenName
@@ -86,14 +84,7 @@ class SelectCurrencyBottomSheet :
         .onEach { viewEffect ->
             Logger.i { "SelectCurrencyBottomSheet observeEffects ${viewEffect::class.simpleName}" }
             when (viewEffect) {
-                is SelectCurrencyEffect.CurrencyChange -> {
-                    setNavigationResult(
-                        R.id.calculatorFragment,
-                        viewEffect.newBase,
-                        CHANGE_BASE_EVENT
-                    )
-                    dismissDialog()
-                }
+                is SelectCurrencyEffect.CurrencySelected -> dismissDialog()
 
                 SelectCurrencyEffect.OpenCurrencies -> navigate(
                     R.id.selectCurrencyBottomSheet,
diff --git a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/watchers/WatcherItem.kt b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/watchers/WatcherItem.kt
index 0d72d5174c..fd6f8408eb 100644
--- a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/watchers/WatcherItem.kt
+++ b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/watchers/WatcherItem.kt
@@ -35,7 +35,7 @@ import com.oztechan.ccc.common.core.model.Watcher
 fun WatcherItem(
     watcher: Watcher,
     onRateChange: (String) -> Unit,
-    onBaseClick: () -> Unit,
+    onSourceClick: () -> Unit,
     onTargetClick: () -> Unit
 ) {
     val itemPadding: Dp = 2.dp
@@ -54,16 +54,16 @@ fun WatcherItem(
         )
 
         Text(
-            text = watcher.base,
+            text = watcher.source,
             modifier = Modifier.padding(itemPadding),
         )
 
         ImageView(
-            painter = watcher.base.getImageIdByName().toPainter(),
+            painter = watcher.source.getImageIdByName().toPainter(),
             modifier = Modifier
                 .size(itemHeight)
                 .padding(itemPadding)
-                .clickable { onBaseClick() }
+                .clickable { onSourceClick() }
         )
 
         Text(
@@ -109,13 +109,13 @@ fun WatcherItemPreview() = Preview {
     WatcherItem(
         watcher = Watcher(
             id = 0,
-            base = "EUR",
+            source = "EUR",
             target = "USD",
             isGreater = false,
             rate = 123456789.0
         ),
         onRateChange = {},
-        onBaseClick = {},
+        onSourceClick = {},
         onTargetClick = {}
     )
 }
diff --git a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/watchers/WatchersView.kt b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/watchers/WatchersView.kt
index cc7cd5f44a..fbf82d5c83 100644
--- a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/watchers/WatchersView.kt
+++ b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/content/watchers/WatchersView.kt
@@ -55,8 +55,8 @@ fun WatchersView(
                     onRateChange = { rate ->
                         event.onRateChange(it, rate)
                     },
-                    onBaseClick = {
-                        event.onBaseClick(it)
+                    onSourceClick = {
+                        event.onSourceClick(it)
                     },
                     onTargetClick = {
                         event.onTargetClick(it)
@@ -98,16 +98,22 @@ fun WatchersViewPreview() = Preview {
             WatchersState(
                 isBannerAdVisible = false,
                 watcherList = listOf(
-                    Watcher(id = 0, base = "EUR", target = "USD", isGreater = false, rate = 123.0),
-                    Watcher(id = 0, base = "USD", target = "EUR", isGreater = false, rate = 123.0)
+                    Watcher(
+                        id = 0,
+                        source = "EUR",
+                        target = "USD",
+                        isGreater = false,
+                        rate = 123.0
+                    ),
+                    Watcher(id = 0, source = "USD", target = "EUR", isGreater = false, rate = 123.0)
                 )
             )
         ),
         event = object : WatchersEvent {
             override fun onBackClick() = Unit
-            override fun onBaseClick(watcher: Watcher) = Unit
+            override fun onSourceClick(watcher: Watcher) = Unit
             override fun onTargetClick(watcher: Watcher) = Unit
-            override fun onBaseChanged(watcher: Watcher, newBase: String) = Unit
+            override fun onSourceChanged(watcher: Watcher, newBase: String) = Unit
             override fun onTargetChanged(watcher: Watcher, newTarget: String) = Unit
             override fun onAddClick() = Unit
             override fun onDeleteClick(watcher: Watcher) = Unit
diff --git a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/Dialog.kt b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/Dialog.kt
index ebc7d12b17..258f397aa7 100644
--- a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/Dialog.kt
+++ b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/Dialog.kt
@@ -70,5 +70,5 @@ fun Activity.showSingleChoiceDialog(
 private fun Activity.buildDialog(title: String) = AlertDialog
     .Builder(this, R.style.AlertDialogCustom)
     .whetherNot { isFinishing }
-    ?.setIcon(R.drawable.ic_dialog_and_snackbar)
+    ?.setIcon(R.drawable.ic_app_logo)
     ?.setTitle(title)
diff --git a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/SnackBar.kt b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/SnackBar.kt
index 9c28c5ead6..dbc6cbaa51 100644
--- a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/SnackBar.kt
+++ b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/SnackBar.kt
@@ -31,7 +31,7 @@ fun View?.showSnack(
             findViewById<TextView>(R.id.snackbar_text)?.apply {
                 gravity = Gravity.CENTER
 
-                ContextCompat.getDrawable(context, icon ?: R.drawable.ic_dialog_and_snackbar)?.apply {
+                ContextCompat.getDrawable(context, icon ?: R.drawable.ic_app_logo)?.apply {
                     setBounds(
                         0,
                         0,
diff --git a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/ViewExtensions.kt b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/ViewExtensions.kt
index c1313c2355..077759904a 100644
--- a/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/ViewExtensions.kt
+++ b/android/ui/mobile/src/main/kotlin/com/oztechan/ccc/android/ui/mobile/util/ViewExtensions.kt
@@ -19,9 +19,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.children
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.findNavController
-import co.touchlab.kermit.Logger
 import com.github.submob.scopemob.castTo
 import com.oztechan.ccc.android.core.ad.AdManager
 import com.oztechan.ccc.android.core.ad.BannerAdView
@@ -73,32 +70,6 @@ fun View.animateHeight(startHeight: Int, endHeight: Int) {
     startAnimation(animation)
 }
 
-fun <T> Fragment.getNavigationResult(
-    key: String,
-    destinationId: Int
-) = try {
-    findNavController()
-        .currentBackStackEntry
-        ?.savedStateHandle
-        ?.getLiveData<T>(key)
-} catch (e: IllegalArgumentException) {
-    Logger.e(e) { "$destinationId is not found in the backstack when getting navigation result for key $key" }
-    null
-}
-
-fun <T> Fragment.setNavigationResult(
-    destinationId: Int,
-    result: T,
-    key: String
-) = try {
-    findNavController()
-        .previousBackStackEntry
-        ?.savedStateHandle
-        ?.set(key, result)
-} catch (e: IllegalArgumentException) {
-    Logger.e(e) { "$destinationId is not found in the backstack when setting navigation result for key $key" }
-}
-
 fun View?.visibleIf(visible: Boolean, bringFront: Boolean = false) = this?.apply {
     if (visible) {
         isVisible = true
diff --git a/android/ui/mobile/src/main/res/drawable/ic_launcher_foreground.xml b/android/ui/mobile/src/main/res/drawable/ic_launcher_foreground.xml
index 77f3e85a87..6f24284125 100644
--- a/android/ui/mobile/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/android/ui/mobile/src/main/res/drawable/ic_launcher_foreground.xml
@@ -7,69 +7,76 @@
     android:viewportHeight="108"
     tools:ignore="VectorPath">
     <group
-        android:name="group_2"
-        android:scaleX="0.16188227"
-        android:scaleY="0.16188227"
-        android:translateX="12.55814"
-        android:translateY="12.55814">
-        <group android:name="group">
+        android:name="foreground"
+        android:scaleX="0.18"
+        android:scaleY="0.18"
+        android:translateX="8"
+        android:translateY="8">
+        <group android:name="currencies">
             <path
-                android:name="path"
-                android:fillColor="#0096A6"
-                android:fillType="evenOdd"
-                android:pathData="M 299.7 414.5 C 251.2 403.5 218.5 358.2 223.8 309.9 C 226.5 286.2 236.4 266.3 253.8 249.8 C 290.8 214.7 347.6 214.5 385.6 249.3 C 397.6 260.3 407.8 276.7 412.5 292.5 C 416.1 304.6 417 325.5 414.5 338 C 406.9 376.1 377.8 406.1 340.7 414.1 C 329.9 416.4 308.9 416.6 299.7 414.5 M 272 384.1 C 270.8 381.8 272.8 379.6 275.3 380.5 C 277.2 381.2 277.4 383 276 384.8 C 274.5 386.5 273.1 386.2 272 384.1 M 346.3 373.4 C 346 372.6 346.3 371.3 347 370.4 C 348 369.2 351.4 369 365.5 369 C 375 369 383.5 369.2 384.4 369.6 C 385.2 369.9 386 371.2 386 372.6 C 386 375 386 375 366.5 375 C 350 375 346.9 374.7 346.3 373.4 M 254.4 366.5 C 253.1 363.3 255 363 274.6 363 C 293.6 363 294.1 363 293.5 365 C 293 366.8 291.9 367 274 367.5 C 257.9 367.9 254.9 367.7 254.4 366.5 M 346.3 359.3 C 345.9 358.3 346.3 357.1 347.5 356.3 C 350.3 354.2 384.6 354.8 385.9 356.9 C 388.2 360.6 386.6 361 366.5 361 C 349.3 361 346.9 360.8 346.3 359.3 M 272.5 350.3 C 271.6 349.1 271.9 346.1 273 345.4 C 274.6 344.4 277.3 347.5 276.6 349.4 C 275.9 351 273.4 351.5 272.5 350.3 M 272 294.8 C 271.4 294.1 271 290.1 271 285.8 C 271 278 271 278 262.7 277.7 C 255.2 277.5 254.5 277.3 254.5 275.5 C 254.5 273.6 255.2 273.4 262.7 273.2 C 271 272.9 271 272.9 271 265.6 C 271 257.7 272.4 254.4 275.2 255.5 C 276.5 256 276.9 257.7 277.2 264.3 C 277.5 272.5 277.5 272.5 285.4 272.7 C 293.3 273 295.3 273.9 294.3 276.6 C 293.9 277.6 291.4 278 285.4 278 C 277 278 277 278 276.5 286.5 C 276.1 292.8 275.6 295.1 274.5 295.5 C 273.6 295.7 272.5 295.4 272 294.8 M 352 289.8 C 350.3 287.8 350.7 287.1 356.5 281 C 362 275.2 362 275.2 356.4 269.6 C 351.5 264.8 350.9 263.8 351.9 262 C 352.5 260.9 353.4 260 353.9 260 C 354.4 260 357.4 262.5 360.5 265.6 C 366.1 271.2 366.1 271.2 371.8 265.6 C 375.9 261.5 378.1 260.1 379.3 260.5 C 382.1 261.6 381.1 264.3 376 269.5 C 373.2 272.2 371 274.8 371 275.2 C 371 275.7 373.4 278.6 376.4 281.6 C 381 286.3 381.7 287.5 380.9 289.1 C 380.3 290.1 379.4 291 378.8 291 C 378.3 291 375.1 288.4 371.8 285.3 C 365.9 279.6 365.9 279.6 359.9 285.3 C 356.6 288.4 353.7 291 353.5 291 C 353.2 291 352.5 290.4 352 289.8" />
-        </group>
-        <group android:name="group_1">
-            <path
-                android:name="path_1"
-                android:fillColor="#F8F8F8"
-                android:fillType="evenOdd"
-                android:pathData="M 272 384.1 C 270.8 381.8 272.8 379.6 275.3 380.5 C 277.2 381.2 277.4 383 276 384.8 C 274.5 386.5 273.1 386.2 272 384.1" />
-            <path
-                android:name="path_2"
+                android:name="dollar"
                 android:fillColor="#F8F8F8"
                 android:fillType="evenOdd"
-                android:pathData="M 346.3 373.4 C 346 372.6 346.3 371.3 347 370.4 C 348 369.2 351.4 369 365.5 369 C 375 369 383.5 369.2 384.4 369.6 C 385.2 369.9 386 371.2 386 372.6 C 386 375 386 375 366.5 375 C 350 375 346.9 374.7 346.3 373.4" />
+                android:pathData="M 160 210.1 C 160 207.6 159.2 206.9 153.5 204 C 146.8 200.8 141.8 195.8 140 190.8 C 139.1 188.1 139.3 187.8 143.9 185.5 C 148.8 183 148.8 183 149.3 185.4 C 151.1 192.5 161.3 197.9 170.6 196.6 C 184.1 194.7 190.5 184 182.5 176.5 C 178.8 172.9 173.8 171.4 163.8 170.5 C 155.5 169.8 151.1 168 145.8 163.2 C 137.4 155.6 136.6 145.2 143.8 137.6 C 146.6 134.6 153.7 130.7 158.2 129.6 C 160.4 129 161 128.4 161 125.9 C 161 123 161 123 166.5 123 C 171.8 123 172 123 172 125.8 C 172 128.4 172.3 128.8 176.1 129.4 C 182.2 130.3 189.9 134.8 193.1 139.4 C 194.7 141.5 196 143.7 196 144.4 C 196 145 193.9 146.2 191.4 147.1 C 186.9 148.7 186.8 148.7 185.8 146.6 C 184.4 143.4 179.2 140.2 173.3 138.9 C 160.5 135.9 146.5 143.6 149.9 151.8 C 151.9 156.6 156.7 158.9 167.1 160 C 183 161.7 193.1 168.2 196 178.5 C 198.1 186 195.9 192.9 189.3 199.3 C 185.6 202.9 176.9 207 172.9 207 C 171.4 207 171 207.6 171 210 C 171 212.9 170.9 213 165.5 213 C 160.1 213 160 212.9 160 210.1" />
             <path
-                android:name="path_3"
+                android:name="euro"
                 android:fillColor="#F8F8F8"
                 android:fillType="evenOdd"
-                android:pathData="M 254.4 366.5 C 253.1 363.3 255 363 274.6 363 C 293.6 363 294.1 363 293.5 365 C 293 366.8 291.9 367 274 367.5 C 257.9 367.9 254.9 367.7 254.4 366.5" />
+                android:pathData="M 319.6 205.6 C 310 202.8 300.9 194.8 296.1 185.2 C 293.9 181 293.9 181 287.4 181 C 280.8 181 280.8 181 281.1 176.2 C 281.5 171.5 281.5 171.5 286.8 171.1 C 291.9 170.9 292.1 170.7 291.8 168.1 C 291.5 165.6 291.1 165.4 286.1 165.1 C 280.8 164.8 280.8 164.8 281.1 160.1 C 281.5 155.5 281.5 155.5 287.6 155.2 C 293.8 154.9 293.8 154.9 296.4 149.5 C 303.4 135.1 321.5 126.2 338 129 C 344.9 130.1 354 134.7 358.7 139.3 C 361 141.5 361 141.5 357 145.4 C 353 149.3 353 149.3 350.2 146.8 C 338.6 135.9 319 137.7 309.2 150.3 C 308 151.9 307 153.6 307 154.1 C 307 154.6 310.6 155 315 155 C 323 155 323 155 323 159.9 C 323 164.9 323 164.9 313.2 165.2 C 303.5 165.5 303.5 165.5 303.1 168.2 C 302.8 171 302.8 171 312.9 171 C 323 171 323 171 323 176 C 323 181 323 181 315 181 C 309.5 181 307 181.3 307 182.1 C 307 182.8 309.1 185.4 311.8 188 C 317.4 193.3 323.8 196 331.5 196 C 338.1 196 342.2 194.5 348.3 190.2 C 353.7 186.5 352.6 186.2 359.7 192.7 C 361.2 194 360.1 195.4 353.8 200.2 C 345.8 206.4 330.2 208.8 319.6 205.6" />
             <path
-                android:name="path_4"
+                android:name="pound"
                 android:fillColor="#F8F8F8"
                 android:fillType="evenOdd"
                 android:pathData="M 167 360.4 C 139 359.9 139 359.9 139 355.1 C 139 350.5 139.1 350.2 141.9 349.6 C 143.6 349.3 146.1 348.2 147.6 347.3 C 150.8 345.2 154.9 336.7 154.9 332.2 C 155 329 155 329 147 329 C 139 329 139 329 139 323.5 C 139 318 139 318 146.9 318 C 154.9 318 154.9 318 152.4 312.7 C 147.5 302.1 150.2 289.8 158.4 285.3 C 167.8 280.1 179.4 280.2 191.2 285.8 C 197 288.5 197 288.5 194.5 292.6 C 192 296.8 192 296.8 184.7 294.2 C 176.2 291.3 168.8 291.5 164 294.9 C 160 297.8 159.4 301.5 162 308.6 C 163.2 311.8 164.4 315.2 164.6 316.2 C 165.1 317.6 166.7 317.9 175.3 318.2 C 185.5 318.5 185.5 318.5 185.8 323.7 C 186.1 329 186.1 329 176.1 329 C 166.2 329 166.2 329 165.6 335.1 C 165.2 338.7 163.9 343 162.5 345.6 C 160.1 350 160.1 350 178.5 350 C 197 350 197 350 197 355 C 197 357.7 196.5 360.2 196 360.5 C 195.4 360.7 182.4 360.7 167 360.4" />
+        </group>
+        <group
+            android:name="calculator_circle"
+            android:translateX="-4"
+            android:translateY="-4">
             <path
-                android:name="path_5"
-                android:fillColor="#F8F8F8"
-                android:fillType="evenOdd"
-                android:pathData="M 346.3 359.3 C 345.9 358.3 346.3 357.1 347.5 356.3 C 350.3 354.2 384.6 354.8 385.9 356.9 C 388.2 360.6 386.6 361 366.5 361 C 349.3 361 346.9 360.8 346.3 359.3" />
-            <path
-                android:name="path_6"
-                android:fillColor="#F8F8F8"
+                android:name="circle"
+                android:fillColor="#0096A6"
                 android:fillType="evenOdd"
-                android:pathData="M 272.5 350.3 C 271.6 349.1 271.9 346.1 273 345.4 C 274.6 344.4 277.3 347.5 276.6 349.4 C 275.9 351 273.4 351.5 272.5 350.3" />
+                android:pathData="M 299.7 414.5 C 251.2 403.5 218.5 358.2 223.8 309.9 C 226.5 286.2 236.4 266.3 253.8 249.8 C 290.8 214.7 347.6 214.5 385.6 249.3 C 397.6 260.3 407.8 276.7 412.5 292.5 C 416.1 304.6 417 325.5 414.5 338 C 406.9 376.1 377.8 406.1 340.7 414.1 C 329.9 416.4 308.9 416.6 299.7 414.5 M 270 386 C 268 381 272 377 277 379 C 279 380 280 383 278 387 C 276 390 272 390 270 386 M 346.3 373.4 C 346 372.6 346.3 371.3 347 370.4 C 348 369.2 351.4 369 365.5 369 C 375 369 383.5 369.2 384.4 369.6 C 385.2 369.9 386 371.2 386 372.6 C 386 375 386 375 366.5 375 C 350 375 346.9 374.7 346.3 373.4 M 254.4 366.5 C 253.1 363.3 255 362 275 362 C 294 362 294.1 363 293.5 365 C 293 366.8 292 368 274 368 C 257.9 367.9 254.9 367.7 254.4 366.5 M 346.3 359.3 C 345.9 358.3 346.3 357.1 347.5 356.3 C 350.3 354.2 384.6 354.8 385.9 356.9 C 388.2 360.6 386.6 361 366.5 361 C 349.3 361 346.9 360.8 346.3 359.3 M 271 352 C 268 349 270 344 274 344 C 276 344 281 347 278 352 C 276 354 273 354 271 352 M 272 294.8 C 271.4 294.1 271 290.1 271 285.8 C 271 278 271 278 262.7 277.7 C 255.2 277.5 254.5 277.3 254.5 275.5 C 254.5 273.6 255.2 273.4 262.7 273.2 C 271 272.9 271 272.9 271 265.6 C 271 257.7 272.4 254.4 275.2 255.5 C 276.5 256 276.9 257.7 277.2 264.3 C 277.5 272.5 277.5 272.5 285.4 272.7 C 293.3 273 295.3 273.9 294.3 276.6 C 293.9 277.6 291.4 278 285.4 278 C 277 278 277 278 276.5 286.5 C 276.1 292.8 275.6 295.1 274.5 295.5 C 273.6 295.7 272.5 295.4 272 294.8 M 352 289.8 C 350.3 287.8 350.7 287.1 356.5 281 C 362 275.2 362 275.2 356.4 269.6 C 351.5 264.8 350.9 263.8 351.9 262 C 352.5 260.9 353.4 260 353.9 260 C 354.4 260 357.4 262.5 360.5 265.6 C 366.1 271.2 366.1 271.2 371.8 265.6 C 375.9 261.5 378.1 260.1 379.3 260.5 C 382.1 261.6 381.1 264.3 376 269.5 C 373.2 272.2 371 274.8 371 275.2 C 371 275.7 373.4 278.6 376.4 281.6 C 381 286.3 381.7 287.5 380.9 289.1 C 380.3 290.1 379.4 291 378.8 291 C 378.3 291 375.1 288.4 371.8 285.3 C 365.9 279.6 365.9 279.6 359.9 285.3 C 356.6 288.4 353.7 291 353.5 291 C 353.2 291 352.5 290.4 352 289.8" />
             <path
-                android:name="path_7"
+                android:name="plus"
                 android:fillColor="#F8F8F8"
                 android:fillType="evenOdd"
                 android:pathData="M 272 294.8 C 271.4 294.1 271 290.1 271 285.8 C 271 278 271 278 262.7 277.7 C 255.2 277.5 254.5 277.3 254.5 275.5 C 254.5 273.6 255.2 273.4 262.7 273.2 C 271 272.9 271 272.9 271 265.6 C 271 257.7 272.4 254.4 275.2 255.5 C 276.5 256 276.9 257.7 277.2 264.3 C 277.5 272.5 277.5 272.5 285.4 272.7 C 293.3 273 295.3 273.9 294.3 276.6 C 293.9 277.6 291.4 278 285.4 278 C 277 278 277 278 276.5 286.5 C 276.1 292.8 275.6 295.1 274.5 295.5 C 273.6 295.7 272.5 295.4 272 294.8" />
             <path
-                android:name="path_8"
+                android:name="multiply"
                 android:fillColor="#F8F8F8"
                 android:fillType="evenOdd"
                 android:pathData="M 352 289.8 C 350.3 287.8 350.7 287.1 356.5 281 C 362 275.2 362 275.2 356.4 269.6 C 351.5 264.8 350.9 263.8 351.9 262 C 352.5 260.9 353.4 260 353.9 260 C 354.4 260 357.4 262.5 360.5 265.6 C 366.1 271.2 366.1 271.2 371.8 265.6 C 375.9 261.5 378.1 260.1 379.3 260.5 C 382.1 261.6 381.1 264.3 376 269.5 C 373.2 272.2 371 274.8 371 275.2 C 371 275.7 373.4 278.6 376.4 281.6 C 381 286.3 381.7 287.5 380.9 289.1 C 380.3 290.1 379.4 291 378.8 291 C 378.3 291 375.1 288.4 371.8 285.3 C 365.9 279.6 365.9 279.6 359.9 285.3 C 356.6 288.4 353.7 291 353.5 291 C 353.2 291 352.5 290.4 352 289.8" />
-            <path
-                android:name="path_9"
-                android:fillColor="#F8F8F8"
-                android:fillType="evenOdd"
-                android:pathData="M 160 210.1 C 160 207.6 159.2 206.9 153.5 204 C 146.8 200.8 141.8 195.8 140 190.8 C 139.1 188.1 139.3 187.8 143.9 185.5 C 148.8 183 148.8 183 149.3 185.4 C 151.1 192.5 161.3 197.9 170.6 196.6 C 184.1 194.7 190.5 184 182.5 176.5 C 178.8 172.9 173.8 171.4 163.8 170.5 C 155.5 169.8 151.1 168 145.8 163.2 C 137.4 155.6 136.6 145.2 143.8 137.6 C 146.6 134.6 153.7 130.7 158.2 129.6 C 160.4 129 161 128.4 161 125.9 C 161 123 161 123 166.5 123 C 171.8 123 172 123 172 125.8 C 172 128.4 172.3 128.8 176.1 129.4 C 182.2 130.3 189.9 134.8 193.1 139.4 C 194.7 141.5 196 143.7 196 144.4 C 196 145 193.9 146.2 191.4 147.1 C 186.9 148.7 186.8 148.7 185.8 146.6 C 184.4 143.4 179.2 140.2 173.3 138.9 C 160.5 135.9 146.5 143.6 149.9 151.8 C 151.9 156.6 156.7 158.9 167.1 160 C 183 161.7 193.1 168.2 196 178.5 C 198.1 186 195.9 192.9 189.3 199.3 C 185.6 202.9 176.9 207 172.9 207 C 171.4 207 171 207.6 171 210 C 171 212.9 170.9 213 165.5 213 C 160.1 213 160 212.9 160 210.1" />
-            <path
-                android:name="path_10"
-                android:fillColor="#F8F8F8"
-                android:fillType="evenOdd"
-                android:pathData="M 319.6 205.6 C 310 202.8 300.9 194.8 296.1 185.2 C 293.9 181 293.9 181 287.4 181 C 280.8 181 280.8 181 281.1 176.2 C 281.5 171.5 281.5 171.5 286.8 171.1 C 291.9 170.9 292.1 170.7 291.8 168.1 C 291.5 165.6 291.1 165.4 286.1 165.1 C 280.8 164.8 280.8 164.8 281.1 160.1 C 281.5 155.5 281.5 155.5 287.6 155.2 C 293.8 154.9 293.8 154.9 296.4 149.5 C 303.4 135.1 321.5 126.2 338 129 C 344.9 130.1 354 134.7 358.7 139.3 C 361 141.5 361 141.5 357 145.4 C 353 149.3 353 149.3 350.2 146.8 C 338.6 135.9 319 137.7 309.2 150.3 C 308 151.9 307 153.6 307 154.1 C 307 154.6 310.6 155 315 155 C 323 155 323 155 323 159.9 C 323 164.9 323 164.9 313.2 165.2 C 303.5 165.5 303.5 165.5 303.1 168.2 C 302.8 171 302.8 171 312.9 171 C 323 171 323 171 323 176 C 323 181 323 181 315 181 C 309.5 181 307 181.3 307 182.1 C 307 182.8 309.1 185.4 311.8 188 C 317.4 193.3 323.8 196 331.5 196 C 338.1 196 342.2 194.5 348.3 190.2 C 353.7 186.5 352.6 186.2 359.7 192.7 C 361.2 194 360.1 195.4 353.8 200.2 C 345.8 206.4 330.2 208.8 319.6 205.6" />
+            <group android:name="division">
+                <path
+                    android:name="division_upper_dot"
+                    android:fillColor="#F8F8F8"
+                    android:fillType="evenOdd"
+                    android:pathData="M 271 352 C 268 349 270 344 274 344 C 276 344 281 347 278 352 C 276 354 273 354 271 352" />
+                <path
+                    android:name="division_middle_line"
+                    android:fillColor="#F8F8F8"
+                    android:fillType="evenOdd"
+                    android:pathData="M 254.4 366.5 C 253.1 363.3 255 362 275 362 C 294 362 294.1 363 293.5 365 C 293 366.8 292 368 274 368 C 257.9 367.9 254.9 367.7 254.4 366.5" />
+                <path
+                    android:name="division_down_dot"
+                    android:fillColor="#F8F8F8"
+                    android:fillType="evenOdd"
+                    android:pathData="M 270 386 C 268 381 272 377 277 379 C 279 380 280 383 278 387 C 276 390 272 390 270 386" />
+            </group>
+            <group android:name="equal">
+                <path
+                    android:name="equal_down_line"
+                    android:fillColor="#F8F8F8"
+                    android:fillType="evenOdd"
+                    android:pathData="M 346.3 373.4 C 346 372.6 346.3 371.3 347 370.4 C 348 369.2 351.4 369 365.5 369 C 375 369 383.5 369.2 384.4 369.6 C 385.2 369.9 386 371.2 386 372.6 C 386 375 386 375 366.5 375 C 350 375 346.9 374.7 346.3 373.4" />
+                <path
+                    android:name="equal_upper_line"
+                    android:fillColor="#F8F8F8"
+                    android:fillType="evenOdd"
+                    android:pathData="M 346.3 359.3 C 345.9 358.3 346.3 357.1 347.5 356.3 C 350.3 354.2 384.6 354.8 385.9 356.9 C 388.2 360.6 386.6 361 366.5 361 C 349.3 361 346.9 360.8 346.3 359.3" />
+            </group>
         </group>
     </group>
 </vector>
diff --git a/android/ui/mobile/src/main/res/drawable/ic_launcher_monochrome.xml b/android/ui/mobile/src/main/res/drawable/ic_launcher_monochrome.xml
index e50738ba3e..8d8ed4076d 100644
--- a/android/ui/mobile/src/main/res/drawable/ic_launcher_monochrome.xml
+++ b/android/ui/mobile/src/main/res/drawable/ic_launcher_monochrome.xml
@@ -7,69 +7,76 @@
     android:viewportHeight="108"
     tools:ignore="VectorPath">
     <group
-        android:name="group_2"
-        android:scaleX="0.16188227"
-        android:scaleY="0.16188227"
-        android:translateX="12.55814"
-        android:translateY="12.55814">
-        <group android:name="group">
+        android:name="foreground"
+        android:scaleX="0.18"
+        android:scaleY="0.18"
+        android:translateX="8"
+        android:translateY="8">
+        <group android:name="currencies">
             <path
-                android:name="path"
+                android:name="dollar"
                 android:fillColor="#ffffff"
                 android:fillType="evenOdd"
-                android:pathData="M 299.7 414.5 C 251.2 403.5 218.5 358.2 223.8 309.9 C 226.5 286.2 236.4 266.3 253.8 249.8 C 290.8 214.7 347.6 214.5 385.6 249.3 C 397.6 260.3 407.8 276.7 412.5 292.5 C 416.1 304.6 417 325.5 414.5 338 C 406.9 376.1 377.8 406.1 340.7 414.1 C 329.9 416.4 308.9 416.6 299.7 414.5 M 272 384.1 C 270.8 381.8 272.8 379.6 275.3 380.5 C 277.2 381.2 277.4 383 276 384.8 C 274.5 386.5 273.1 386.2 272 384.1 M 346.3 373.4 C 346 372.6 346.3 371.3 347 370.4 C 348 369.2 351.4 369 365.5 369 C 375 369 383.5 369.2 384.4 369.6 C 385.2 369.9 386 371.2 386 372.6 C 386 375 386 375 366.5 375 C 350 375 346.9 374.7 346.3 373.4 M 254.4 366.5 C 253.1 363.3 255 363 274.6 363 C 293.6 363 294.1 363 293.5 365 C 293 366.8 291.9 367 274 367.5 C 257.9 367.9 254.9 367.7 254.4 366.5 M 346.3 359.3 C 345.9 358.3 346.3 357.1 347.5 356.3 C 350.3 354.2 384.6 354.8 385.9 356.9 C 388.2 360.6 386.6 361 366.5 361 C 349.3 361 346.9 360.8 346.3 359.3 M 272.5 350.3 C 271.6 349.1 271.9 346.1 273 345.4 C 274.6 344.4 277.3 347.5 276.6 349.4 C 275.9 351 273.4 351.5 272.5 350.3 M 272 294.8 C 271.4 294.1 271 290.1 271 285.8 C 271 278 271 278 262.7 277.7 C 255.2 277.5 254.5 277.3 254.5 275.5 C 254.5 273.6 255.2 273.4 262.7 273.2 C 271 272.9 271 272.9 271 265.6 C 271 257.7 272.4 254.4 275.2 255.5 C 276.5 256 276.9 257.7 277.2 264.3 C 277.5 272.5 277.5 272.5 285.4 272.7 C 293.3 273 295.3 273.9 294.3 276.6 C 293.9 277.6 291.4 278 285.4 278 C 277 278 277 278 276.5 286.5 C 276.1 292.8 275.6 295.1 274.5 295.5 C 273.6 295.7 272.5 295.4 272 294.8 M 352 289.8 C 350.3 287.8 350.7 287.1 356.5 281 C 362 275.2 362 275.2 356.4 269.6 C 351.5 264.8 350.9 263.8 351.9 262 C 352.5 260.9 353.4 260 353.9 260 C 354.4 260 357.4 262.5 360.5 265.6 C 366.1 271.2 366.1 271.2 371.8 265.6 C 375.9 261.5 378.1 260.1 379.3 260.5 C 382.1 261.6 381.1 264.3 376 269.5 C 373.2 272.2 371 274.8 371 275.2 C 371 275.7 373.4 278.6 376.4 281.6 C 381 286.3 381.7 287.5 380.9 289.1 C 380.3 290.1 379.4 291 378.8 291 C 378.3 291 375.1 288.4 371.8 285.3 C 365.9 279.6 365.9 279.6 359.9 285.3 C 356.6 288.4 353.7 291 353.5 291 C 353.2 291 352.5 290.4 352 289.8" />
-        </group>
-        <group android:name="group_1">
-            <path
-                android:name="path_1"
-                android:fillColor="#00000000"
-                android:fillType="evenOdd"
-                android:pathData="M 272 384.1 C 270.8 381.8 272.8 379.6 275.3 380.5 C 277.2 381.2 277.4 383 276 384.8 C 274.5 386.5 273.1 386.2 272 384.1" />
-            <path
-                android:name="path_2"
-                android:fillColor="#00000000"
-                android:fillType="evenOdd"
-                android:pathData="M 346.3 373.4 C 346 372.6 346.3 371.3 347 370.4 C 348 369.2 351.4 369 365.5 369 C 375 369 383.5 369.2 384.4 369.6 C 385.2 369.9 386 371.2 386 372.6 C 386 375 386 375 366.5 375 C 350 375 346.9 374.7 346.3 373.4" />
+                android:pathData="M 160 210.1 C 160 207.6 159.2 206.9 153.5 204 C 146.8 200.8 141.8 195.8 140 190.8 C 139.1 188.1 139.3 187.8 143.9 185.5 C 148.8 183 148.8 183 149.3 185.4 C 151.1 192.5 161.3 197.9 170.6 196.6 C 184.1 194.7 190.5 184 182.5 176.5 C 178.8 172.9 173.8 171.4 163.8 170.5 C 155.5 169.8 151.1 168 145.8 163.2 C 137.4 155.6 136.6 145.2 143.8 137.6 C 146.6 134.6 153.7 130.7 158.2 129.6 C 160.4 129 161 128.4 161 125.9 C 161 123 161 123 166.5 123 C 171.8 123 172 123 172 125.8 C 172 128.4 172.3 128.8 176.1 129.4 C 182.2 130.3 189.9 134.8 193.1 139.4 C 194.7 141.5 196 143.7 196 144.4 C 196 145 193.9 146.2 191.4 147.1 C 186.9 148.7 186.8 148.7 185.8 146.6 C 184.4 143.4 179.2 140.2 173.3 138.9 C 160.5 135.9 146.5 143.6 149.9 151.8 C 151.9 156.6 156.7 158.9 167.1 160 C 183 161.7 193.1 168.2 196 178.5 C 198.1 186 195.9 192.9 189.3 199.3 C 185.6 202.9 176.9 207 172.9 207 C 171.4 207 171 207.6 171 210 C 171 212.9 170.9 213 165.5 213 C 160.1 213 160 212.9 160 210.1" />
             <path
-                android:name="path_3"
-                android:fillColor="#00000000"
+                android:name="euro"
+                android:fillColor="#ffffff"
                 android:fillType="evenOdd"
-                android:pathData="M 254.4 366.5 C 253.1 363.3 255 363 274.6 363 C 293.6 363 294.1 363 293.5 365 C 293 366.8 291.9 367 274 367.5 C 257.9 367.9 254.9 367.7 254.4 366.5" />
+                android:pathData="M 319.6 205.6 C 310 202.8 300.9 194.8 296.1 185.2 C 293.9 181 293.9 181 287.4 181 C 280.8 181 280.8 181 281.1 176.2 C 281.5 171.5 281.5 171.5 286.8 171.1 C 291.9 170.9 292.1 170.7 291.8 168.1 C 291.5 165.6 291.1 165.4 286.1 165.1 C 280.8 164.8 280.8 164.8 281.1 160.1 C 281.5 155.5 281.5 155.5 287.6 155.2 C 293.8 154.9 293.8 154.9 296.4 149.5 C 303.4 135.1 321.5 126.2 338 129 C 344.9 130.1 354 134.7 358.7 139.3 C 361 141.5 361 141.5 357 145.4 C 353 149.3 353 149.3 350.2 146.8 C 338.6 135.9 319 137.7 309.2 150.3 C 308 151.9 307 153.6 307 154.1 C 307 154.6 310.6 155 315 155 C 323 155 323 155 323 159.9 C 323 164.9 323 164.9 313.2 165.2 C 303.5 165.5 303.5 165.5 303.1 168.2 C 302.8 171 302.8 171 312.9 171 C 323 171 323 171 323 176 C 323 181 323 181 315 181 C 309.5 181 307 181.3 307 182.1 C 307 182.8 309.1 185.4 311.8 188 C 317.4 193.3 323.8 196 331.5 196 C 338.1 196 342.2 194.5 348.3 190.2 C 353.7 186.5 352.6 186.2 359.7 192.7 C 361.2 194 360.1 195.4 353.8 200.2 C 345.8 206.4 330.2 208.8 319.6 205.6" />
             <path
-                android:name="path_4"
+                android:name="pound"
                 android:fillColor="#ffffff"
                 android:fillType="evenOdd"
                 android:pathData="M 167 360.4 C 139 359.9 139 359.9 139 355.1 C 139 350.5 139.1 350.2 141.9 349.6 C 143.6 349.3 146.1 348.2 147.6 347.3 C 150.8 345.2 154.9 336.7 154.9 332.2 C 155 329 155 329 147 329 C 139 329 139 329 139 323.5 C 139 318 139 318 146.9 318 C 154.9 318 154.9 318 152.4 312.7 C 147.5 302.1 150.2 289.8 158.4 285.3 C 167.8 280.1 179.4 280.2 191.2 285.8 C 197 288.5 197 288.5 194.5 292.6 C 192 296.8 192 296.8 184.7 294.2 C 176.2 291.3 168.8 291.5 164 294.9 C 160 297.8 159.4 301.5 162 308.6 C 163.2 311.8 164.4 315.2 164.6 316.2 C 165.1 317.6 166.7 317.9 175.3 318.2 C 185.5 318.5 185.5 318.5 185.8 323.7 C 186.1 329 186.1 329 176.1 329 C 166.2 329 166.2 329 165.6 335.1 C 165.2 338.7 163.9 343 162.5 345.6 C 160.1 350 160.1 350 178.5 350 C 197 350 197 350 197 355 C 197 357.7 196.5 360.2 196 360.5 C 195.4 360.7 182.4 360.7 167 360.4" />
+        </group>
+        <group
+            android:name="calculator_circle"
+            android:translateX="-4"
+            android:translateY="-4">
             <path
-                android:name="path_5"
-                android:fillColor="#00000000"
-                android:fillType="evenOdd"
-                android:pathData="M 346.3 359.3 C 345.9 358.3 346.3 357.1 347.5 356.3 C 350.3 354.2 384.6 354.8 385.9 356.9 C 388.2 360.6 386.6 361 366.5 361 C 349.3 361 346.9 360.8 346.3 359.3" />
-            <path
-                android:name="path_6"
-                android:fillColor="#00000000"
+                android:name="circle"
+                android:fillColor="#ffffff"
                 android:fillType="evenOdd"
-                android:pathData="M 272.5 350.3 C 271.6 349.1 271.9 346.1 273 345.4 C 274.6 344.4 277.3 347.5 276.6 349.4 C 275.9 351 273.4 351.5 272.5 350.3" />
+                android:pathData="M 299.7 414.5 C 251.2 403.5 218.5 358.2 223.8 309.9 C 226.5 286.2 236.4 266.3 253.8 249.8 C 290.8 214.7 347.6 214.5 385.6 249.3 C 397.6 260.3 407.8 276.7 412.5 292.5 C 416.1 304.6 417 325.5 414.5 338 C 406.9 376.1 377.8 406.1 340.7 414.1 C 329.9 416.4 308.9 416.6 299.7 414.5 M 270 386 C 268 381 272 377 277 379 C 279 380 280 383 278 387 C 276 390 272 390 270 386 M 346.3 373.4 C 346 372.6 346.3 371.3 347 370.4 C 348 369.2 351.4 369 365.5 369 C 375 369 383.5 369.2 384.4 369.6 C 385.2 369.9 386 371.2 386 372.6 C 386 375 386 375 366.5 375 C 350 375 346.9 374.7 346.3 373.4 M 254.4 366.5 C 253.1 363.3 255 362 275 362 C 294 362 294.1 363 293.5 365 C 293 366.8 292 368 274 368 C 257.9 367.9 254.9 367.7 254.4 366.5 M 346.3 359.3 C 345.9 358.3 346.3 357.1 347.5 356.3 C 350.3 354.2 384.6 354.8 385.9 356.9 C 388.2 360.6 386.6 361 366.5 361 C 349.3 361 346.9 360.8 346.3 359.3 M 271 352 C 268 349 270 344 274 344 C 276 344 281 347 278 352 C 276 354 273 354 271 352 M 272 294.8 C 271.4 294.1 271 290.1 271 285.8 C 271 278 271 278 262.7 277.7 C 255.2 277.5 254.5 277.3 254.5 275.5 C 254.5 273.6 255.2 273.4 262.7 273.2 C 271 272.9 271 272.9 271 265.6 C 271 257.7 272.4 254.4 275.2 255.5 C 276.5 256 276.9 257.7 277.2 264.3 C 277.5 272.5 277.5 272.5 285.4 272.7 C 293.3 273 295.3 273.9 294.3 276.6 C 293.9 277.6 291.4 278 285.4 278 C 277 278 277 278 276.5 286.5 C 276.1 292.8 275.6 295.1 274.5 295.5 C 273.6 295.7 272.5 295.4 272 294.8 M 352 289.8 C 350.3 287.8 350.7 287.1 356.5 281 C 362 275.2 362 275.2 356.4 269.6 C 351.5 264.8 350.9 263.8 351.9 262 C 352.5 260.9 353.4 260 353.9 260 C 354.4 260 357.4 262.5 360.5 265.6 C 366.1 271.2 366.1 271.2 371.8 265.6 C 375.9 261.5 378.1 260.1 379.3 260.5 C 382.1 261.6 381.1 264.3 376 269.5 C 373.2 272.2 371 274.8 371 275.2 C 371 275.7 373.4 278.6 376.4 281.6 C 381 286.3 381.7 287.5 380.9 289.1 C 380.3 290.1 379.4 291 378.8 291 C 378.3 291 375.1 288.4 371.8 285.3 C 365.9 279.6 365.9 279.6 359.9 285.3 C 356.6 288.4 353.7 291 353.5 291 C 353.2 291 352.5 290.4 352 289.8" />
             <path
-                android:name="path_7"
+                android:name="plus"
                 android:fillColor="#00000000"
                 android:fillType="evenOdd"
                 android:pathData="M 272 294.8 C 271.4 294.1 271 290.1 271 285.8 C 271 278 271 278 262.7 277.7 C 255.2 277.5 254.5 277.3 254.5 275.5 C 254.5 273.6 255.2 273.4 262.7 273.2 C 271 272.9 271 272.9 271 265.6 C 271 257.7 272.4 254.4 275.2 255.5 C 276.5 256 276.9 257.7 277.2 264.3 C 277.5 272.5 277.5 272.5 285.4 272.7 C 293.3 273 295.3 273.9 294.3 276.6 C 293.9 277.6 291.4 278 285.4 278 C 277 278 277 278 276.5 286.5 C 276.1 292.8 275.6 295.1 274.5 295.5 C 273.6 295.7 272.5 295.4 272 294.8" />
             <path
-                android:name="path_8"
+                android:name="multiply"
                 android:fillColor="#00000000"
                 android:fillType="evenOdd"
                 android:pathData="M 352 289.8 C 350.3 287.8 350.7 287.1 356.5 281 C 362 275.2 362 275.2 356.4 269.6 C 351.5 264.8 350.9 263.8 351.9 262 C 352.5 260.9 353.4 260 353.9 260 C 354.4 260 357.4 262.5 360.5 265.6 C 366.1 271.2 366.1 271.2 371.8 265.6 C 375.9 261.5 378.1 260.1 379.3 260.5 C 382.1 261.6 381.1 264.3 376 269.5 C 373.2 272.2 371 274.8 371 275.2 C 371 275.7 373.4 278.6 376.4 281.6 C 381 286.3 381.7 287.5 380.9 289.1 C 380.3 290.1 379.4 291 378.8 291 C 378.3 291 375.1 288.4 371.8 285.3 C 365.9 279.6 365.9 279.6 359.9 285.3 C 356.6 288.4 353.7 291 353.5 291 C 353.2 291 352.5 290.4 352 289.8" />
-            <path
-                android:name="path_9"
-                android:fillColor="#ffffff"
-                android:fillType="evenOdd"
-                android:pathData="M 160 210.1 C 160 207.6 159.2 206.9 153.5 204 C 146.8 200.8 141.8 195.8 140 190.8 C 139.1 188.1 139.3 187.8 143.9 185.5 C 148.8 183 148.8 183 149.3 185.4 C 151.1 192.5 161.3 197.9 170.6 196.6 C 184.1 194.7 190.5 184 182.5 176.5 C 178.8 172.9 173.8 171.4 163.8 170.5 C 155.5 169.8 151.1 168 145.8 163.2 C 137.4 155.6 136.6 145.2 143.8 137.6 C 146.6 134.6 153.7 130.7 158.2 129.6 C 160.4 129 161 128.4 161 125.9 C 161 123 161 123 166.5 123 C 171.8 123 172 123 172 125.8 C 172 128.4 172.3 128.8 176.1 129.4 C 182.2 130.3 189.9 134.8 193.1 139.4 C 194.7 141.5 196 143.7 196 144.4 C 196 145 193.9 146.2 191.4 147.1 C 186.9 148.7 186.8 148.7 185.8 146.6 C 184.4 143.4 179.2 140.2 173.3 138.9 C 160.5 135.9 146.5 143.6 149.9 151.8 C 151.9 156.6 156.7 158.9 167.1 160 C 183 161.7 193.1 168.2 196 178.5 C 198.1 186 195.9 192.9 189.3 199.3 C 185.6 202.9 176.9 207 172.9 207 C 171.4 207 171 207.6 171 210 C 171 212.9 170.9 213 165.5 213 C 160.1 213 160 212.9 160 210.1" />
-            <path
-                android:name="path_10"
-                android:fillColor="#ffffff"
-                android:fillType="evenOdd"
-                android:pathData="M 319.6 205.6 C 310 202.8 300.9 194.8 296.1 185.2 C 293.9 181 293.9 181 287.4 181 C 280.8 181 280.8 181 281.1 176.2 C 281.5 171.5 281.5 171.5 286.8 171.1 C 291.9 170.9 292.1 170.7 291.8 168.1 C 291.5 165.6 291.1 165.4 286.1 165.1 C 280.8 164.8 280.8 164.8 281.1 160.1 C 281.5 155.5 281.5 155.5 287.6 155.2 C 293.8 154.9 293.8 154.9 296.4 149.5 C 303.4 135.1 321.5 126.2 338 129 C 344.9 130.1 354 134.7 358.7 139.3 C 361 141.5 361 141.5 357 145.4 C 353 149.3 353 149.3 350.2 146.8 C 338.6 135.9 319 137.7 309.2 150.3 C 308 151.9 307 153.6 307 154.1 C 307 154.6 310.6 155 315 155 C 323 155 323 155 323 159.9 C 323 164.9 323 164.9 313.2 165.2 C 303.5 165.5 303.5 165.5 303.1 168.2 C 302.8 171 302.8 171 312.9 171 C 323 171 323 171 323 176 C 323 181 323 181 315 181 C 309.5 181 307 181.3 307 182.1 C 307 182.8 309.1 185.4 311.8 188 C 317.4 193.3 323.8 196 331.5 196 C 338.1 196 342.2 194.5 348.3 190.2 C 353.7 186.5 352.6 186.2 359.7 192.7 C 361.2 194 360.1 195.4 353.8 200.2 C 345.8 206.4 330.2 208.8 319.6 205.6" />
+            <group android:name="division">
+                <path
+                    android:name="division_upper_dot"
+                    android:fillColor="#00000000"
+                    android:fillType="evenOdd"
+                    android:pathData="M 271 352 C 268 349 270 344 274 344 C 276 344 281 347 278 352 C 276 354 273 354 271 352" />
+                <path
+                    android:name="division_middle_line"
+                    android:fillColor="#00000000"
+                    android:fillType="evenOdd"
+                    android:pathData="M 254.4 366.5 C 253.1 363.3 255 362 275 362 C 294 362 294.1 363 293.5 365 C 293 366.8 292 368 274 368 C 257.9 367.9 254.9 367.7 254.4 366.5" />
+                <path
+                    android:name="division_down_dot"
+                    android:fillColor="#00000000"
+                    android:fillType="evenOdd"
+                    android:pathData="M 270 386 C 268 381 272 377 277 379 C 279 380 280 383 278 387 C 276 390 272 390 270 386" />
+            </group>
+            <group android:name="equal">
+                <path
+                    android:name="equal_down_line"
+                    android:fillColor="#00000000"
+                    android:fillType="evenOdd"
+                    android:pathData="M 346.3 373.4 C 346 372.6 346.3 371.3 347 370.4 C 348 369.2 351.4 369 365.5 369 C 375 369 383.5 369.2 384.4 369.6 C 385.2 369.9 386 371.2 386 372.6 C 386 375 386 375 366.5 375 C 350 375 346.9 374.7 346.3 373.4" />
+                <path
+                    android:name="equal_upper_line"
+                    android:fillColor="#00000000"
+                    android:fillType="evenOdd"
+                    android:pathData="M 346.3 359.3 C 345.9 358.3 346.3 357.1 347.5 356.3 C 350.3 354.2 384.6 354.8 385.9 356.9 C 388.2 360.6 386.6 361 366.5 361 C 349.3 361 346.9 360.8 346.3 359.3" />
+            </group>
         </group>
     </group>
 </vector>
diff --git a/android/ui/mobile/src/main/res/mipmap-hdpi/ic_launcher.webp b/android/ui/mobile/src/main/res/mipmap-hdpi/ic_launcher.webp
index 65822ba756..5f16e6c979 100644
Binary files a/android/ui/mobile/src/main/res/mipmap-hdpi/ic_launcher.webp and b/android/ui/mobile/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/android/ui/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/android/ui/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.webp
index 47c8faebf7..70545b36dd 100644
Binary files a/android/ui/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/android/ui/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/android/ui/mobile/src/main/res/mipmap-mdpi/ic_launcher.webp b/android/ui/mobile/src/main/res/mipmap-mdpi/ic_launcher.webp
index 68c61d832a..91579e9c8d 100644
Binary files a/android/ui/mobile/src/main/res/mipmap-mdpi/ic_launcher.webp and b/android/ui/mobile/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/android/ui/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/android/ui/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.webp
index 6317c12670..ff66fe47b3 100644
Binary files a/android/ui/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/android/ui/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/android/ui/mobile/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android/ui/mobile/src/main/res/mipmap-xhdpi/ic_launcher.webp
index 1527c5f06c..4b6e1e070a 100644
Binary files a/android/ui/mobile/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/android/ui/mobile/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/android/ui/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/android/ui/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
index e1fb08e47e..d874ff40d9 100644
Binary files a/android/ui/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/android/ui/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/android/ui/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/android/ui/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.webp
index 3d9ab4131e..66bd6a18d8 100644
Binary files a/android/ui/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/android/ui/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/android/ui/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/android/ui/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
index 37383bdfcc..dd3f7d32c6 100644
Binary files a/android/ui/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/android/ui/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/android/ui/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/android/ui/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
index 8ac6351604..c43df194c7 100644
Binary files a/android/ui/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/android/ui/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/android/ui/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/android/ui/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
index 7c8bea60d3..072e994c64 100644
Binary files a/android/ui/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/android/ui/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/android/ui/mobile/src/main/res/values/styles.xml b/android/ui/mobile/src/main/res/values/styles.xml
index 1226a3bdb0..0fa69c744f 100755
--- a/android/ui/mobile/src/main/res/values/styles.xml
+++ b/android/ui/mobile/src/main/res/values/styles.xml
@@ -333,6 +333,8 @@
 
     <style name="SearchViewStyle" parent="WrapStyle">
         <item name="android:maxWidth">@dimen/max_width_search_view</item>
+        <item name="queryBackground">@null</item>
+        <item name="submitBackground">@null</item>
         <item name="queryHint">@string/search</item>
         <item name="closeIcon">@drawable/ic_close</item>
         <item name="searchHintIcon">@drawable/ic_search_hint</item>
diff --git a/android/ui/widget/src/main/kotlin/com/oztechan/ccc/android/ui/widget/content/HeaderView.kt b/android/ui/widget/src/main/kotlin/com/oztechan/ccc/android/ui/widget/content/HeaderView.kt
index bcc83ab685..ad6b4c7c3d 100644
--- a/android/ui/widget/src/main/kotlin/com/oztechan/ccc/android/ui/widget/content/HeaderView.kt
+++ b/android/ui/widget/src/main/kotlin/com/oztechan/ccc/android/ui/widget/content/HeaderView.kt
@@ -22,7 +22,7 @@ import com.oztechan.ccc.client.core.res.getImageIdByName
 @Suppress("RestrictedApi")
 @Composable
 fun HeaderView(
-    currentBase: String,
+    base: String,
     onBackClick: () -> Unit,
     onNextClick: () -> Unit
 ) {
@@ -43,14 +43,14 @@ fun HeaderView(
         Spacer(modifier = GlanceModifier.defaultWeight())
 
         ImageView(
-            provider = ImageProvider(currentBase.getImageIdByName()),
+            provider = ImageProvider(base.getImageIdByName()),
             modifier = GlanceModifier
                 .size(32.dp)
                 .padding(horizontal = 2.dp)
         )
 
         Text(
-            text = currentBase,
+            text = base,
             style = TextStyle(color = ColorProvider(R.color.text), fontSize = 15.sp),
             modifier = GlanceModifier.padding(horizontal = 2.dp)
         )
diff --git a/android/ui/widget/src/main/kotlin/com/oztechan/ccc/android/ui/widget/content/WidgetView.kt b/android/ui/widget/src/main/kotlin/com/oztechan/ccc/android/ui/widget/content/WidgetView.kt
index cce7f79af9..9f75b22d50 100644
--- a/android/ui/widget/src/main/kotlin/com/oztechan/ccc/android/ui/widget/content/WidgetView.kt
+++ b/android/ui/widget/src/main/kotlin/com/oztechan/ccc/android/ui/widget/content/WidgetView.kt
@@ -33,7 +33,7 @@ fun WidgetView(
     ) {
         if (state.isPremium) {
             HeaderView(
-                currentBase = state.currentBase,
+                base = state.base,
                 onBackClick = event::onPreviousClick,
                 onNextClick = event::onNextClick
             )
diff --git a/android/viewmodel/widget/android-viewmodel-widget.gradle.kts b/android/viewmodel/widget/android-viewmodel-widget.gradle.kts
index f3131eec22..5dacd47d53 100644
--- a/android/viewmodel/widget/android-viewmodel-widget.gradle.kts
+++ b/android/viewmodel/widget/android-viewmodel-widget.gradle.kts
@@ -41,6 +41,7 @@ dependencies {
     Modules.Client.Core.apply {
         implementation(project(viewModel))
         implementation(project(shared))
+        implementation(project(analytics))
     }
 
     Modules.Client.Storage.apply {
diff --git a/android/viewmodel/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetSEED.kt b/android/viewmodel/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetSEED.kt
index 37c6517ce9..9cd75678dd 100644
--- a/android/viewmodel/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetSEED.kt
+++ b/android/viewmodel/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetSEED.kt
@@ -10,7 +10,7 @@ import com.oztechan.ccc.common.core.model.Currency
 data class WidgetState(
     var currencyList: List<Currency> = listOf(),
     var lastUpdate: String = "",
-    var currentBase: String,
+    var base: String,
     var isPremium: Boolean
 ) : BaseState
 
diff --git a/android/viewmodel/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetViewModel.kt b/android/viewmodel/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetViewModel.kt
index 995ef35d4c..d7803edecb 100644
--- a/android/viewmodel/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetViewModel.kt
+++ b/android/viewmodel/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetViewModel.kt
@@ -2,6 +2,10 @@ package com.oztechan.ccc.android.viewmodel.widget
 
 import co.touchlab.kermit.Logger
 import com.oztechan.ccc.android.viewmodel.widget.WidgetData.Companion.MAXIMUM_NUMBER_OF_CURRENCY
+import com.oztechan.ccc.client.core.analytics.AnalyticsManager
+import com.oztechan.ccc.client.core.analytics.model.Event
+import com.oztechan.ccc.client.core.analytics.model.Param
+import com.oztechan.ccc.client.core.analytics.model.UserProperty
 import com.oztechan.ccc.client.core.shared.util.getFormatted
 import com.oztechan.ccc.client.core.shared.util.getRateFromCode
 import com.oztechan.ccc.client.core.shared.util.isNotPassed
@@ -18,10 +22,11 @@ class WidgetViewModel(
     private val calculationStorage: CalculationStorage,
     private val backendApiService: BackendApiService,
     private val currencyDataSource: CurrencyDataSource,
-    private val appStorage: AppStorage
+    private val appStorage: AppStorage,
+    private val analyticsManager: AnalyticsManager
 ) : SEEDViewModel<WidgetState, BaseEffect, WidgetEvent, WidgetData>(
     initialState = WidgetState(
-        currentBase = calculationStorage.currentBase,
+        base = calculationStorage.currentBase,
         isPremium = appStorage.premiumEndDate.isNotPassed()
     ),
     initialData = WidgetData()
@@ -33,7 +38,7 @@ class WidgetViewModel(
             copy(
                 currencyList = listOf(),
                 lastUpdate = "",
-                currentBase = calculationStorage.currentBase,
+                base = calculationStorage.currentBase,
                 isPremium = appStorage.premiumEndDate.isNotPassed()
             )
         }
@@ -82,8 +87,13 @@ class WidgetViewModel(
                     (it + activeCurrencies.size) % activeCurrencies.size // it handles index -1 and index size +1
                 }
 
+            val newBase = activeCurrencies[newBaseIndex].code
+
             calculationStorage.currentBase = activeCurrencies[newBaseIndex].code
 
+            analyticsManager.trackEvent(Event.BaseChange(Param.Base(newBase)))
+            analyticsManager.setUserProperty(UserProperty.BaseCurrency(newBase))
+
             refreshWidgetData()
         }
     }
diff --git a/android/viewmodel/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/di/AndroidViewModelWidgetModule.kt b/android/viewmodel/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/di/AndroidViewModelWidgetModule.kt
index 92461f7597..422419b88d 100644
--- a/android/viewmodel/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/di/AndroidViewModelWidgetModule.kt
+++ b/android/viewmodel/widget/src/main/kotlin/com/oztechan/ccc/android/viewmodel/widget/di/AndroidViewModelWidgetModule.kt
@@ -10,7 +10,8 @@ val androidViewModelWidgetModule = module {
             calculationStorage = get(),
             backendApiService = get(),
             currencyDataSource = get(),
-            appStorage = get()
+            appStorage = get(),
+            analyticsManager = get()
         )
     }
 }
diff --git a/android/viewmodel/widget/src/test/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetViewModelTest.kt b/android/viewmodel/widget/src/test/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetViewModelTest.kt
index 3fea803a4b..6eef2fd215 100644
--- a/android/viewmodel/widget/src/test/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetViewModelTest.kt
+++ b/android/viewmodel/widget/src/test/kotlin/com/oztechan/ccc/android/viewmodel/widget/WidgetViewModelTest.kt
@@ -2,6 +2,10 @@ package com.oztechan.ccc.android.viewmodel.widget
 
 import co.touchlab.kermit.CommonWriter
 import co.touchlab.kermit.Logger
+import com.oztechan.ccc.client.core.analytics.AnalyticsManager
+import com.oztechan.ccc.client.core.analytics.model.Event
+import com.oztechan.ccc.client.core.analytics.model.Param
+import com.oztechan.ccc.client.core.analytics.model.UserProperty
 import com.oztechan.ccc.client.core.shared.util.getFormatted
 import com.oztechan.ccc.client.core.shared.util.getRateFromCode
 import com.oztechan.ccc.client.core.shared.util.isNotPassed
@@ -43,7 +47,8 @@ internal class WidgetViewModelTest {
             calculationStorage = calculationStorage,
             backendApiService = backendApiService,
             currencyDataSource = currencyDataSource,
-            appStorage = appStorage
+            appStorage = appStorage,
+            analyticsManager = analyticsManager
         )
     }
 
@@ -55,6 +60,8 @@ internal class WidgetViewModelTest {
 
     private val appStorage = mock<AppStorage>()
 
+    private val analyticsManager = mock<AnalyticsManager>(MockMode.autoUnit)
+
     private val base = "EUR"
     private val firstBase = "USD"
     private val lastBase = "TRY"
@@ -155,7 +162,7 @@ internal class WidgetViewModelTest {
             assertNotNull(it)
             assertTrue { it.currencyList.isEmpty() }
             assertEquals("", it.lastUpdate)
-            assertEquals(base, it.currentBase)
+            assertEquals(base, it.base)
             assertEquals(appStorage.premiumEndDate.isNotPassed(), it.isPremium)
         }
     }
@@ -219,6 +226,8 @@ internal class WidgetViewModelTest {
         verifySuspend(VerifyMode.not) { currencyDataSource.getActiveCurrencies() }
 
         verify(VerifyMode.not) { calculationStorage.currentBase = any<String>() }
+        verify(VerifyMode.not) { analyticsManager.trackEvent(Event.BaseChange(Param.Base(any<String>()))) }
+        verify(VerifyMode.not) { analyticsManager.setUserProperty(UserProperty.BaseCurrency(any<String>())) }
     }
 
     // region Event
@@ -232,7 +241,23 @@ internal class WidgetViewModelTest {
 
         verifySuspend { currencyDataSource.getActiveCurrencies() }
 
-        verify { calculationStorage.currentBase = lastBase }
+        verify(VerifyMode.exactly(1)) { calculationStorage.currentBase = lastBase }
+        verify(VerifyMode.exactly(1)) {
+            analyticsManager.trackEvent(
+                Event.BaseChange(
+                    Param.Base(
+                        lastBase
+                    )
+                )
+            )
+        }
+        verify(VerifyMode.exactly(1)) {
+            analyticsManager.setUserProperty(
+                UserProperty.BaseCurrency(
+                    lastBase
+                )
+            )
+        }
 
         every { calculationStorage.currentBase }
             .returns(lastBase)
@@ -241,7 +266,23 @@ internal class WidgetViewModelTest {
 
         verifySuspend { currencyDataSource.getActiveCurrencies() }
 
-        verify { calculationStorage.currentBase = firstBase }
+        verify(VerifyMode.exactly(1)) { calculationStorage.currentBase = firstBase }
+        verify(VerifyMode.exactly(1)) {
+            analyticsManager.trackEvent(
+                Event.BaseChange(
+                    Param.Base(
+                        firstBase
+                    )
+                )
+            )
+        }
+        verify(VerifyMode.exactly(1)) {
+            analyticsManager.setUserProperty(
+                UserProperty.BaseCurrency(
+                    firstBase
+                )
+            )
+        }
     }
 
     @Test
@@ -254,7 +295,23 @@ internal class WidgetViewModelTest {
 
         verifySuspend { currencyDataSource.getActiveCurrencies() }
 
-        verify { calculationStorage.currentBase = firstBase }
+        verify(VerifyMode.exactly(1)) { calculationStorage.currentBase = firstBase }
+        verify(VerifyMode.exactly(1)) {
+            analyticsManager.trackEvent(
+                Event.BaseChange(
+                    Param.Base(
+                        firstBase
+                    )
+                )
+            )
+        }
+        verify(VerifyMode.exactly(1)) {
+            analyticsManager.setUserProperty(
+                UserProperty.BaseCurrency(
+                    firstBase
+                )
+            )
+        }
 
         every { calculationStorage.currentBase }
             .returns(firstBase)
@@ -263,7 +320,23 @@ internal class WidgetViewModelTest {
 
         verifySuspend { currencyDataSource.getActiveCurrencies() }
 
-        verify { calculationStorage.currentBase = lastBase }
+        verify(VerifyMode.exactly(1)) { calculationStorage.currentBase = lastBase }
+        verify(VerifyMode.exactly(1)) {
+            analyticsManager.trackEvent(
+                Event.BaseChange(
+                    Param.Base(
+                        lastBase
+                    )
+                )
+            )
+        }
+        verify(VerifyMode.exactly(1)) {
+            analyticsManager.setUserProperty(
+                UserProperty.BaseCurrency(
+                    lastBase
+                )
+            )
+        }
     }
 
     @Test
diff --git a/client/core/res/src/commonMain/moko-resources/images/ic_app_logo@2x.png b/client/core/res/src/commonMain/moko-resources/images/ic_app_logo@2x.png
index b959454eda..d01b892fad 100644
Binary files a/client/core/res/src/commonMain/moko-resources/images/ic_app_logo@2x.png and b/client/core/res/src/commonMain/moko-resources/images/ic_app_logo@2x.png differ
diff --git a/client/core/res/src/commonMain/moko-resources/images/ic_dialog_and_snackbar@2x.png b/client/core/res/src/commonMain/moko-resources/images/ic_dialog_and_snackbar@2x.png
deleted file mode 100644
index 1c4581b7b1..0000000000
Binary files a/client/core/res/src/commonMain/moko-resources/images/ic_dialog_and_snackbar@2x.png and /dev/null differ
diff --git a/client/datasource/watcher/src/commonMain/kotlin/com/oztechan/ccc/client/datasource/watcher/mapper/WatcherMapper.kt b/client/datasource/watcher/src/commonMain/kotlin/com/oztechan/ccc/client/datasource/watcher/mapper/WatcherMapper.kt
index 3bc592b7c1..97a94589d9 100644
--- a/client/datasource/watcher/src/commonMain/kotlin/com/oztechan/ccc/client/datasource/watcher/mapper/WatcherMapper.kt
+++ b/client/datasource/watcher/src/commonMain/kotlin/com/oztechan/ccc/client/datasource/watcher/mapper/WatcherMapper.kt
@@ -6,7 +6,7 @@ import com.oztechan.ccc.common.core.model.Watcher as WatcherModel
 
 internal fun WatcherDBModel.toWatcherModel() = WatcherModel(
     id = id,
-    base = base,
+    source = base,
     target = target,
     isGreater = isGreater.toBoolean(),
     rate = rate,
diff --git a/client/datasource/watcher/src/commonTest/kotlin/com/oztechan/ccc/client/datasource/watcher/mapper/WatcherMapperTest.kt b/client/datasource/watcher/src/commonTest/kotlin/com/oztechan/ccc/client/datasource/watcher/mapper/WatcherMapperTest.kt
index 66bf266f78..566f2b0208 100644
--- a/client/datasource/watcher/src/commonTest/kotlin/com/oztechan/ccc/client/datasource/watcher/mapper/WatcherMapperTest.kt
+++ b/client/datasource/watcher/src/commonTest/kotlin/com/oztechan/ccc/client/datasource/watcher/mapper/WatcherMapperTest.kt
@@ -11,7 +11,7 @@ internal class WatcherMapperTest {
         val model = Fakes.watcherDBModel.toWatcherModel()
 
         assertEquals(Fakes.watcherDBModel.id, model.id)
-        assertEquals(Fakes.watcherDBModel.base, model.base)
+        assertEquals(Fakes.watcherDBModel.base, model.source)
         assertEquals(Fakes.watcherDBModel.target, model.target)
         assertEquals(Fakes.watcherDBModel.isGreater.toBoolean(), model.isGreater)
         assertEquals(Fakes.watcherDBModel.rate, model.rate)
diff --git a/client/viewmodel/calculator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorSEED.kt b/client/viewmodel/calculator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorSEED.kt
index 172bb59b64..9050aa4bd6 100644
--- a/client/viewmodel/calculator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorSEED.kt
+++ b/client/viewmodel/calculator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorSEED.kt
@@ -32,7 +32,7 @@ interface CalculatorEvent : BaseEvent {
     fun onPasteToInput(text: String)
     fun onBarClick()
     fun onSettingsClicked()
-    fun onBaseChange(base: String)
+    fun onSheetDismissed()
 }
 
 // Effect
diff --git a/client/viewmodel/calculator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt b/client/viewmodel/calculator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt
index 9266a87327..e035a325f2 100644
--- a/client/viewmodel/calculator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt
+++ b/client/viewmodel/calculator/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModel.kt
@@ -82,7 +82,18 @@ class CalculatorViewModel(
         .distinctUntilChanged()
         .onEach {
             Logger.d { "CalculatorViewModel observeBase $it" }
-            currentBaseChanged(it, true)
+
+            setState { copy(loading = true) }
+
+            calculationStorage.currentBase = it
+            data.conversion = null
+
+            updateSymbol()
+
+            analyticsManager.trackEvent(Event.BaseChange(Param.Base(it)))
+            analyticsManager.setUserProperty(UserProperty.BaseCurrency(it))
+
+            updateConversion()
         }
         .launchIn(viewModelScope)
 
@@ -90,18 +101,23 @@ class CalculatorViewModel(
         .distinctUntilChanged()
         .onEach {
             Logger.d { "CalculatorViewModel observeInput $it" }
+
+            setState { copy(loading = true) }
             calculationStorage.lastInput = it
             calculateOutput(it)
         }
         .launchIn(viewModelScope)
 
-    private fun updateConversion() {
-        setState { copy(loading = true) }
+    private suspend fun updateSymbol() {
+        val symbol = currencyDataSource.getCurrencyByCode(state.value.base)?.symbol.orEmpty()
+        setState { copy(symbol = symbol) }
+    }
 
+    private fun updateConversion() {
         data.conversion?.let {
             calculateConversions(it, ConversionState.Cached(it.date))
         } ?: viewModelScope.launch {
-            runCatching { backendApiService.getConversion(calculationStorage.currentBase) }
+            runCatching { backendApiService.getConversion(state.value.base) }
                 .onFailure(::updateConversionFailed)
                 .onSuccess(::updateConversionSuccess)
         }
@@ -118,7 +134,7 @@ class CalculatorViewModel(
     private fun updateConversionFailed(t: Throwable) = viewModelScope.launch {
         Logger.w(t) { "CalculatorViewModel updateConversionFailed" }
         conversionDataSource.getConversionByBase(
-            calculationStorage.currentBase
+            state.value.base
         )?.let {
             calculateConversions(it, ConversionState.Offline(it.date))
         } ?: run {
@@ -130,18 +146,20 @@ class CalculatorViewModel(
         }
     }
 
-    private fun calculateConversions(conversion: Conversion?, conversionState: ConversionState) =
+    private fun calculateConversions(conversion: Conversion?, conversionState: ConversionState) {
+        val precision = calculationStorage.precision
         setState {
             copy(
                 currencyList = state.value.currencyList.onEach {
                     it.rate = conversion.calculateRate(it.code, state.value.output)
-                        .getFormatted(calculationStorage.precision)
+                        .getFormatted(precision)
                         .toStandardDigits()
                 },
                 conversionState = conversionState,
                 loading = false
             )
         }
+    }
 
     private fun calculateOutput(input: String) {
         val output = data.parser
@@ -170,25 +188,6 @@ class CalculatorViewModel(
         }
     }
 
-    private fun currentBaseChanged(newBase: String, shouldTrack: Boolean = false) =
-        viewModelScope.launch {
-            data.conversion = null
-            calculationStorage.currentBase = newBase
-            val symbol = currencyDataSource.getCurrencyByCode(newBase)?.symbol.orEmpty()
-            setState {
-                copy(
-                    base = newBase,
-                    input = input,
-                    symbol = symbol
-                )
-            }
-
-            if (shouldTrack) {
-                analyticsManager.trackEvent(Event.BaseChange(Param.Base(newBase)))
-                analyticsManager.setUserProperty(UserProperty.BaseCurrency(newBase))
-            }
-        }
-
     // region Event
     override fun onKeyPress(key: String) {
         Logger.d { "CalculatorViewModel onKeyPress $key" }
@@ -233,7 +232,7 @@ class CalculatorViewModel(
         sendEffect {
             CalculatorEffect.ShowConversion(
                 currency.getConversionStringFromBase(
-                    calculationStorage.currentBase,
+                    state.value.base,
                     data.conversion
                 ),
                 currency.code
@@ -276,10 +275,13 @@ class CalculatorViewModel(
         sendEffect { CalculatorEffect.OpenSettings }
     }
 
-    override fun onBaseChange(base: String) {
-        Logger.d { "CalculatorViewModel onBaseChange $base" }
-        currentBaseChanged(base)
-        calculateOutput(state.value.input)
+    override fun onSheetDismissed() {
+        Logger.d { "CalculatorViewModel onSheetDismissed" }
+        calculationStorage.currentBase
+            .takeIf { it != state.value.base }
+            ?.let {
+                setState { copy(base = it) }
+            }
     }
     // endregion
 }
diff --git a/client/viewmodel/calculator/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModelTest.kt b/client/viewmodel/calculator/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModelTest.kt
index 4b61b21134..968adf0ca2 100644
--- a/client/viewmodel/calculator/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModelTest.kt
+++ b/client/viewmodel/calculator/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/calculator/CalculatorViewModelTest.kt
@@ -32,6 +32,7 @@ import dev.mokkery.every
 import dev.mokkery.everySuspend
 import dev.mokkery.mock
 import dev.mokkery.verify
+import dev.mokkery.verify.VerifyMode
 import dev.mokkery.verifySuspend
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.firstOrNull
@@ -74,9 +75,13 @@ internal class CalculatorViewModelTest {
     private val analyticsManager = mock<AnalyticsManager>(MockMode.autoUnit)
 
     private val currency1 = Currency("USD", "Dollar", "$", "12345.678", true)
-    private val currency2 = Currency("EUR", "Dollar", "$", "12345.678", true)
-    private val currencyList = listOf(currency1, currency2)
-    private val conversion = Conversion(currency1.code, "12.12.2121")
+    private val currency2 = Currency("EUR", "Euro", "€", "23456.789", true)
+    private val currency3 = Currency("TRY", "Turkish Lira", "₺", "34567.890", true)
+    private val currencyList = listOf(currency1, currency2, currency3)
+    private val conversion1 =
+        Conversion(currency1.code, "12.12.2121", usd = 1.0, eur = 2.0, `try` = 3.0)
+    private val conversion2 =
+        Conversion(currency2.code, "12.12.2121", usd = 1.5, eur = 1.0, `try` = 2.5)
     private val shouldShowAds = Random.nextBoolean()
 
     @BeforeTest
@@ -106,10 +111,10 @@ internal class CalculatorViewModelTest {
                 .returns(currencyList)
 
             everySuspend { conversionDataSource.getConversionByBase(currency1.code) }
-                .returns(conversion)
+                .returns(conversion1)
 
             everySuspend { backendApiService.getConversion(currency1.code) }
-                .returns(conversion)
+                .returns(conversion1)
 
             everySuspend { currencyDataSource.getCurrencyByCode(currency1.code) }
                 .returns(currency1)
@@ -177,10 +182,10 @@ internal class CalculatorViewModelTest {
             }.firstOrNull().let {
                 assertNotNull(it)
                 assertFalse { it.loading }
-                assertEquals(ConversionState.Offline(conversion.date), it.conversionState)
+                assertEquals(ConversionState.Offline(conversion1.date), it.conversionState)
 
                 val result = currencyList.onEach { currency ->
-                    currency.rate = conversion.calculateRate(currency.code, it.output)
+                    currency.rate = conversion1.calculateRate(currency.code, it.output)
                         .getFormatted(calculationStorage.precision)
                         .toStandardDigits()
                 }
@@ -295,6 +300,70 @@ internal class CalculatorViewModelTest {
         }
     }
 
+    @Suppress("StringLiteralDuplication")
+    @Test
+    fun `when base changed the values in the list should be recalculated according to the new base and prettied`() =
+        runTest {
+            val input = "1000"
+            viewModel.state.onSubscription {
+                viewModel.event.onKeyPress(input)
+            }.firstOrNull().let {
+                assertNotNull(it)
+                assertEquals(input, it.input)
+                assertEquals("1 000", it.output)
+                assertEquals(currency1.symbol, it.symbol)
+                assertEquals(currency1.code, it.base)
+                assertEquals("1 000", it.currencyList[0].rate)
+                assertEquals("2 000", it.currencyList[1].rate)
+                assertEquals("3 000", it.currencyList[2].rate)
+
+                verifySuspend(VerifyMode.order) {
+                    currencyDataSource.getActiveCurrenciesFlow()
+                    currencyDataSource.getActiveCurrencies()
+                    calculationStorage.currentBase
+                    calculationStorage.lastInput
+                    analyticsManager.setUserProperty(
+                        UserProperty.CurrencyCount(
+                            currencyList.count().toString()
+                        )
+                    )
+                    calculationStorage.currentBase = currency1.code
+                    currencyDataSource.getCurrencyByCode(currency1.code)
+                    analyticsManager.trackEvent(Event.BaseChange(Param.Base(currency1.code)))
+                    analyticsManager.setUserProperty(UserProperty.BaseCurrency(currency1.code))
+                    calculationStorage.lastInput = ""
+                    calculationStorage.lastInput = input
+                }
+            }
+
+            viewModel.state.onSubscription {
+                everySuspend { backendApiService.getConversion(currency2.code) }
+                    .returns(conversion2)
+                everySuspend { currencyDataSource.getCurrencyByCode(currency2.code) }
+                    .returns(currency2)
+                every { calculationStorage.currentBase }
+                    .returns(currency2.code)
+                viewModel.onSheetDismissed()
+            }.firstOrNull().let {
+                assertNotNull(it)
+                assertEquals(input, it.input)
+                assertEquals("1 000", it.output)
+                assertEquals(currency2.symbol, it.symbol)
+                assertEquals(currency2.code, it.base)
+                assertEquals("1 500", it.currencyList[0].rate)
+                assertEquals("1 000", it.currencyList[1].rate)
+                assertEquals("2 500", it.currencyList[2].rate)
+
+                verifySuspend(VerifyMode.order) {
+                    calculationStorage.currentBase
+                    calculationStorage.currentBase = currency2.code
+                    currencyDataSource.getCurrencyByCode(currency2.code)
+                    analyticsManager.trackEvent(Event.BaseChange(Param.Base(currency2.code)))
+                    analyticsManager.setUserProperty(UserProperty.BaseCurrency(currency2.code))
+                }
+            }
+        }
+
     // Analytics
     @Test
     fun ifUserPropertiesSetCorrect() {
@@ -491,24 +560,80 @@ internal class CalculatorViewModelTest {
         }
     }
 
+    @Suppress("LongMethod")
     @Test
-    fun onBaseChanged() = runTest {
+    fun onSheetDismissed() = runTest {
+        // when base in state is equal to base in storage
         every { calculationStorage.currentBase }
             .returns(currency1.code)
 
         everySuspend { backendApiService.getConversion(currency1.code) }
-            .returns(conversion)
+            .returns(conversion1)
 
         viewModel.state.onSubscription {
-            viewModel.event.onBaseChange(currency1.code)
+            viewModel.event.onSheetDismissed()
         }.firstOrNull().let {
             assertNotNull(it)
             assertNotNull(viewModel.data.conversion)
             assertEquals(currency1.code, viewModel.data.conversion!!.base)
             assertEquals(currency1.code, it.base)
 
-            verify { analyticsManager.trackEvent(Event.BaseChange(Param.Base(currency1.code))) }
-            verify { analyticsManager.setUserProperty(UserProperty.BaseCurrency(currency1.code)) }
+            verify(VerifyMode.exactly(1)) {
+                analyticsManager.trackEvent(
+                    Event.BaseChange(
+                        Param.Base(
+                            currency1.code
+                        )
+                    )
+                )
+            }
+            verify(VerifyMode.exactly(1)) {
+                analyticsManager.setUserProperty(
+                    UserProperty.BaseCurrency(
+                        currency1.code
+                    )
+                )
+            }
+
+            // from initial state
+            verify(VerifyMode.exactly(1)) { calculationStorage.currentBase = currency1.code }
+        }
+
+        // when base in state is not equal to base in storage
+        everySuspend { backendApiService.getConversion(currency2.code) }
+            .returns(conversion2)
+
+        everySuspend { currencyDataSource.getCurrencyByCode(currency2.code) }
+            .returns(currency2)
+
+        every { calculationStorage.currentBase }
+            .returns(currency2.code)
+
+        viewModel.state.onSubscription {
+            viewModel.event.onSheetDismissed()
+        }.firstOrNull().let {
+            assertNotNull(it)
+            assertNotNull(viewModel.data.conversion)
+            assertEquals(currency2.code, viewModel.data.conversion!!.base)
+            assertEquals(currency2.code, it.base)
+
+            verify(VerifyMode.exactly(1)) {
+                analyticsManager.trackEvent(
+                    Event.BaseChange(
+                        Param.Base(
+                            currency2.code
+                        )
+                    )
+                )
+            }
+            verify(VerifyMode.exactly(1)) {
+                analyticsManager.setUserProperty(
+                    UserProperty.BaseCurrency(
+                        currency2.code
+                    )
+                )
+            }
+            verify(VerifyMode.exactly(1)) { calculationStorage.currentBase = currency2.code }
         }
     }
 }
diff --git a/client/viewmodel/currencies/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/currencies/CurrenciesSEED.kt b/client/viewmodel/currencies/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/currencies/CurrenciesSEED.kt
index e6f2d24700..66d81407a9 100644
--- a/client/viewmodel/currencies/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/currencies/CurrenciesSEED.kt
+++ b/client/viewmodel/currencies/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/currencies/CurrenciesSEED.kt
@@ -30,7 +30,6 @@ sealed class CurrenciesEffect : BaseEffect {
     data object FewCurrency : CurrenciesEffect()
     data object OpenCalculator : CurrenciesEffect()
     data object Back : CurrenciesEffect()
-    data class ChangeBase(val newBase: String) : CurrenciesEffect()
 }
 
 // Data
diff --git a/client/viewmodel/currencies/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/currencies/CurrenciesViewModel.kt b/client/viewmodel/currencies/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/currencies/CurrenciesViewModel.kt
index ae3582a72d..ac5b9cba72 100755
--- a/client/viewmodel/currencies/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/currencies/CurrenciesViewModel.kt
+++ b/client/viewmodel/currencies/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/currencies/CurrenciesViewModel.kt
@@ -82,8 +82,6 @@ class CurrenciesViewModel(
 
         analyticsManager.trackEvent(Event.BaseChange(Param.Base(newBase)))
         analyticsManager.setUserProperty(UserProperty.BaseCurrency(newBase))
-
-        sendEffect { CurrenciesEffect.ChangeBase(newBase) }
     }
 
     private fun filterList(txt: String) = data.unFilteredList
diff --git a/client/viewmodel/currencies/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/currencies/CurrenciesViewModelTest.kt b/client/viewmodel/currencies/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/currencies/CurrenciesViewModelTest.kt
index 4d57198231..e888158efc 100644
--- a/client/viewmodel/currencies/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/currencies/CurrenciesViewModelTest.kt
+++ b/client/viewmodel/currencies/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/currencies/CurrenciesViewModelTest.kt
@@ -6,6 +6,8 @@ package com.oztechan.ccc.client.viewmodel.currencies
 import co.touchlab.kermit.CommonWriter
 import co.touchlab.kermit.Logger
 import com.oztechan.ccc.client.core.analytics.AnalyticsManager
+import com.oztechan.ccc.client.core.analytics.model.Event
+import com.oztechan.ccc.client.core.analytics.model.Param
 import com.oztechan.ccc.client.core.analytics.model.UserProperty
 import com.oztechan.ccc.client.datasource.currency.CurrencyDataSource
 import com.oztechan.ccc.client.repository.adcontrol.AdControlRepository
@@ -169,20 +171,21 @@ internal class CurrenciesViewModelTest {
     fun `don't show FewCurrency effect if there is MINIMUM_ACTIVE_CURRENCY and not firstRun`() =
         runTest {
             every { calculationStorage.currentBase }
-                .returns("") // in order to get ChangeBase effect, have to have an effect to finish test
+                .returns("")
 
             every { currencyDataSource.getCurrenciesFlow() }
                 .returns(
                     flow {
-                        delay(1.seconds.inWholeMilliseconds)
                         emit(listOf(currency1, currency1, currency1))
                     }
                 )
 
-            viewModel.effect.firstOrNull().let {
-                assertNotNull(it)
-                assertIs<CurrenciesEffect.ChangeBase>(it)
-            }
+            // init
+            viewModel
+
+            verify { analyticsManager.trackEvent(Event.BaseChange(Param.Base(currency1.code))) }
+            verify { analyticsManager.setUserProperty(UserProperty.BaseCurrency(currency1.code)) }
+            verify { calculationStorage.currentBase = currency1.code }
         }
 
     @Test
@@ -192,20 +195,20 @@ internal class CurrenciesViewModelTest {
                 .returns(true)
 
             every { calculationStorage.currentBase }
-                .returns("") // in order to get ChangeBase effect, have to have an effect to finish test
+                .returns("")
 
             every { currencyDataSource.getCurrenciesFlow() }
                 .returns(
                     flow {
-                        delay(1.seconds.inWholeMilliseconds)
                         emit(listOf(currency1))
                     }
                 )
+            // init
+            viewModel
 
-            viewModel.effect.firstOrNull().let {
-                assertNotNull(it)
-                assertIs<CurrenciesEffect.ChangeBase>(it)
-            }
+            verify { analyticsManager.trackEvent(Event.BaseChange(Param.Base(currency1.code))) }
+            verify { analyticsManager.setUserProperty(UserProperty.BaseCurrency(currency1.code)) }
+            verify { calculationStorage.currentBase = currency1.code }
         }
 
     @Test
@@ -226,20 +229,17 @@ internal class CurrenciesViewModelTest {
             every { currencyDataSource.getCurrenciesFlow() }
                 .returns(
                     flow {
-                        delay(1.seconds.inWholeMilliseconds)
                         emit(currencyList)
                     }
                 )
 
             every { calculationStorage.currentBase }
                 .returns("")
+            // init
+            viewModel
 
-            viewModel.effect.firstOrNull().let {
-                assertNotNull(it)
-                assertIs<CurrenciesEffect.ChangeBase>(it)
-                assertEquals(firstActiveBase, it.newBase)
-            }
-
+            verify { analyticsManager.trackEvent(Event.BaseChange(Param.Base(firstActiveBase))) }
+            verify { analyticsManager.setUserProperty(UserProperty.BaseCurrency(firstActiveBase)) }
             verify { calculationStorage.currentBase = firstActiveBase }
         }
 
@@ -251,20 +251,17 @@ internal class CurrenciesViewModelTest {
             every { currencyDataSource.getCurrenciesFlow() }
                 .returns(
                     flow {
-                        delay(1.seconds.inWholeMilliseconds)
                         emit(listOf(currency1, currency2, currency3))
                     }
                 )
 
             every { calculationStorage.currentBase }
                 .returns(currency1.code) // not active one
+            // init
+            viewModel
 
-            viewModel.effect.firstOrNull().let {
-                assertNotNull(it)
-                assertIs<CurrenciesEffect.ChangeBase>(it)
-                assertEquals(currency2.code, it.newBase)
-            }
-
+            verify { analyticsManager.trackEvent(Event.BaseChange(Param.Base(currency2.code))) }
+            verify { analyticsManager.setUserProperty(UserProperty.BaseCurrency(currency2.code)) }
             verify { calculationStorage.currentBase = currency2.code }
         }
 
diff --git a/client/viewmodel/main/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/main/MainSEED.kt b/client/viewmodel/main/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/main/MainSEED.kt
index b3ae057a6a..209d69ae58 100644
--- a/client/viewmodel/main/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/main/MainSEED.kt
+++ b/client/viewmodel/main/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/main/MainSEED.kt
@@ -21,8 +21,8 @@ sealed class MainEffect : BaseEffect {
 
 // Event
 interface MainEvent : BaseEvent {
-    fun onPause()
-    fun onResume()
+    fun onAppBackground()
+    fun onAppForeground()
 }
 
 // Data
diff --git a/client/viewmodel/main/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/main/MainViewModel.kt b/client/viewmodel/main/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/main/MainViewModel.kt
index 1445f10aef..d7f2531cd1 100644
--- a/client/viewmodel/main/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/main/MainViewModel.kt
+++ b/client/viewmodel/main/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/main/MainViewModel.kt
@@ -98,14 +98,14 @@ class MainViewModel(
     }
 
     // region Event
-    override fun onPause() {
-        Logger.d { "MainViewModel onPause" }
+    override fun onAppBackground() {
+        Logger.d { "MainViewModel onAppBackground" }
         data.adJob.cancel()
         data.adVisibility = false
     }
 
-    override fun onResume() {
-        Logger.d { "MainViewModel onResume" }
+    override fun onAppForeground() {
+        Logger.d { "MainViewModel onAppForeground" }
 
         setState {
             copy(
diff --git a/client/viewmodel/main/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/main/MainViewModelTest.kt b/client/viewmodel/main/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/main/MainViewModelTest.kt
index e544ee2dbc..ba6f7ce910 100644
--- a/client/viewmodel/main/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/main/MainViewModelTest.kt
+++ b/client/viewmodel/main/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/main/MainViewModelTest.kt
@@ -149,14 +149,14 @@ internal class MainViewModelTest {
 
     // event
     @Test
-    fun onPause() = with(viewModel) {
-        event.onPause()
+    fun onAppBackground() = with(viewModel) {
+        event.onAppBackground()
         assertFalse { data.adVisibility }
         assertTrue { data.adJob.isCancelled }
     }
 
     @Test
-    fun `onResume adjustSessionCount`() = with(viewModel) {
+    fun `onAppForeground adjustSessionCount`() = with(viewModel) {
         val mockSessionCount = Random.nextLong()
 
         every { reviewConfigService.config }
@@ -182,12 +182,12 @@ internal class MainViewModelTest {
 
         assertTrue { data.isNewSession }
 
-        event.onResume()
+        event.onAppForeground()
 
         verify { appStorage.sessionCount = mockSessionCount + 1 }
         assertFalse { data.isNewSession }
 
-        event.onResume()
+        event.onAppForeground()
 
         verify(VerifyMode.not) { appStorage.sessionCount = mockSessionCount + 1 }
 
@@ -195,7 +195,7 @@ internal class MainViewModelTest {
     }
 
     @Test
-    fun `onResume setupInterstitialAdTimer`() = runTest {
+    fun `onAppForeground setupInterstitialAdTimer`() = runTest {
         val mockSessionCount = Random.nextLong()
 
         every { reviewConfigService.config }
@@ -220,7 +220,7 @@ internal class MainViewModelTest {
             .returns(nowAsLong() - 1.seconds.inWholeMilliseconds)
 
         viewModel.effect.onSubscription {
-            viewModel.onResume()
+            viewModel.onAppForeground()
         }.firstOrNull { // has to use firstOrNull with true returning lambda for loop
             assertTrue { viewModel.data.adVisibility }
             assertTrue { viewModel.data.adJob.isActive }
@@ -240,7 +240,7 @@ internal class MainViewModelTest {
     }
 
     @Test
-    fun `onResume checkAppUpdate nothing happens when check update returns null`() =
+    fun `onAppForeground checkAppUpdate nothing happens when check update returns null`() =
         with(viewModel) {
             val mockSessionCount = Random.nextLong()
 
@@ -259,7 +259,7 @@ internal class MainViewModelTest {
             every { appConfigRepository.shouldShowAppReview() }
                 .returns(true)
 
-            event.onResume()
+            event.onAppForeground()
 
             assertFalse { data.isAppUpdateShown }
 
@@ -267,7 +267,7 @@ internal class MainViewModelTest {
         }
 
     @Test
-    fun `onResume checkAppUpdate app review should ask when check update returns not null`() =
+    fun `onAppForeground checkAppUpdate app review should ask when check update returns not null`() =
         runTest {
             val mockSessionCount = Random.nextLong()
             val mockBoolean = Random.nextBoolean()
@@ -291,7 +291,7 @@ internal class MainViewModelTest {
                 .returns("")
 
             viewModel.effect.onSubscription {
-                viewModel.onResume()
+                viewModel.onAppForeground()
             }.firstOrNull().let {
                 assertNotNull(it)
                 assertIs<MainEffect.AppUpdateEffect>(it)
@@ -305,7 +305,7 @@ internal class MainViewModelTest {
         }
 
     @Test
-    fun `onResume checkReview should request review when shouldShowAppReview returns true`() =
+    fun `onAppForeground checkReview should request review when shouldShowAppReview returns true`() =
         runTest {
             val mockSessionCount = Random.nextLong()
 
@@ -325,7 +325,7 @@ internal class MainViewModelTest {
                 .returns(true)
 
             viewModel.effect.onSubscription {
-                viewModel.onResume()
+                viewModel.onAppForeground()
             }.firstOrNull().let {
                 assertNotNull(it)
                 assertIs<MainEffect.RequestReview>(it)
@@ -337,7 +337,7 @@ internal class MainViewModelTest {
         }
 
     @Test
-    fun `onResume checkReview should do nothing when shouldShowAppReview returns false`() =
+    fun `onAppForeground checkReview should do nothing when shouldShowAppReview returns false`() =
         with(viewModel) {
             val mockSessionCount = Random.nextLong()
 
@@ -356,13 +356,13 @@ internal class MainViewModelTest {
             every { appConfigRepository.shouldShowAppReview() }
                 .returns(false)
 
-            onResume()
+            onAppForeground()
 
             verify { appConfigRepository.shouldShowAppReview() }
         }
 
     @Test
-    fun `onResume updates the latest states`() = runTest {
+    fun `onAppForeground updates the latest states`() = runTest {
         every { appConfigRepository.checkAppUpdate(false) }
             .returns(false)
 
@@ -393,7 +393,7 @@ internal class MainViewModelTest {
 
         viewModel.state
             .onSubscription {
-                viewModel.event.onResume()
+                viewModel.event.onAppForeground()
             }.firstOrNull().let {
                 assertNotNull(it)
                 assertEquals(newIsFirstRun, it.shouldOnboardUser)
diff --git a/client/viewmodel/selectcurrency/client-viewmodel-selectcurrency.gradle.kts b/client/viewmodel/selectcurrency/client-viewmodel-selectcurrency.gradle.kts
index f5ee3b6e24..3ab104df9e 100644
--- a/client/viewmodel/selectcurrency/client-viewmodel-selectcurrency.gradle.kts
+++ b/client/viewmodel/selectcurrency/client-viewmodel-selectcurrency.gradle.kts
@@ -27,6 +27,10 @@ kotlin {
 
             Modules.Client.DataSource.apply {
                 implementation(project(currency))
+                implementation(project(watcher))
+            }
+            Modules.Client.Storage.apply {
+                implementation(project(calculation))
             }
 
             Modules.Common.Core.apply {
diff --git a/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencySEED.kt b/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencySEED.kt
index 468d37c91a..e755a987c4 100644
--- a/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencySEED.kt
+++ b/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencySEED.kt
@@ -3,6 +3,7 @@ package com.oztechan.ccc.client.viewmodel.selectcurrency
 import com.oztechan.ccc.client.core.viewmodel.BaseEffect
 import com.oztechan.ccc.client.core.viewmodel.BaseEvent
 import com.oztechan.ccc.client.core.viewmodel.BaseState
+import com.oztechan.ccc.client.viewmodel.selectcurrency.model.SelectCurrencyPurpose
 import com.oztechan.ccc.common.core.model.Currency
 
 // State
@@ -14,12 +15,12 @@ data class SelectCurrencyState(
 
 // Event
 interface SelectCurrencyEvent : BaseEvent {
-    fun onItemClick(currency: Currency)
+    fun onItemClick(currency: Currency, purpose: SelectCurrencyPurpose)
     fun onSelectClick()
 }
 
 // Effect
 sealed class SelectCurrencyEffect : BaseEffect {
-    data class CurrencyChange(val newBase: String) : SelectCurrencyEffect()
+    data object CurrencySelected : SelectCurrencyEffect()
     data object OpenCurrencies : SelectCurrencyEffect()
 }
diff --git a/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencyViewModel.kt b/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencyViewModel.kt
index 5a335bdfd2..44aa2421b3 100644
--- a/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencyViewModel.kt
+++ b/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencyViewModel.kt
@@ -8,12 +8,18 @@ import com.oztechan.ccc.client.core.shared.constants.MINIMUM_ACTIVE_CURRENCY
 import com.oztechan.ccc.client.core.viewmodel.BaseData
 import com.oztechan.ccc.client.core.viewmodel.SEEDViewModel
 import com.oztechan.ccc.client.datasource.currency.CurrencyDataSource
+import com.oztechan.ccc.client.datasource.watcher.WatcherDataSource
+import com.oztechan.ccc.client.storage.calculation.CalculationStorage
+import com.oztechan.ccc.client.viewmodel.selectcurrency.model.SelectCurrencyPurpose
 import com.oztechan.ccc.common.core.model.Currency
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 
 class SelectCurrencyViewModel(
-    currencyDataSource: CurrencyDataSource
+    private val calculationStorage: CalculationStorage,
+    currencyDataSource: CurrencyDataSource,
+    private val watcherDataSource: WatcherDataSource
 ) : SEEDViewModel<SelectCurrencyState, SelectCurrencyEffect, SelectCurrencyEvent, BaseData>(
     initialState = SelectCurrencyState()
 ),
@@ -33,9 +39,23 @@ class SelectCurrencyViewModel(
     }
 
     // region Event
-    override fun onItemClick(currency: Currency) {
-        Logger.d { "SelectCurrencyViewModel onItemClick ${currency.code}" }
-        sendEffect { SelectCurrencyEffect.CurrencyChange(currency.code) }
+    override fun onItemClick(currency: Currency, purpose: SelectCurrencyPurpose) {
+        Logger.d { "SelectCurrencyViewModel onItemClick ${currency.code} $purpose" }
+        viewModelScope.launch {
+            when (purpose) {
+                SelectCurrencyPurpose.Base -> calculationStorage.currentBase = currency.code
+                is SelectCurrencyPurpose.Source -> watcherDataSource.updateWatcherBaseById(
+                    currency.code,
+                    purpose.watcher.id
+                )
+
+                is SelectCurrencyPurpose.Target -> watcherDataSource.updateWatcherTargetById(
+                    currency.code,
+                    purpose.watcher.id
+                )
+            }
+            sendEffect { SelectCurrencyEffect.CurrencySelected }
+        }
     }
 
     override fun onSelectClick() {
diff --git a/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/di/ClientViewModelSelectCurrencyModule.kt b/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/di/ClientViewModelSelectCurrencyModule.kt
index 44356c362b..4f554890e5 100644
--- a/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/di/ClientViewModelSelectCurrencyModule.kt
+++ b/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/di/ClientViewModelSelectCurrencyModule.kt
@@ -5,5 +5,5 @@ import com.oztechan.ccc.client.viewmodel.selectcurrency.SelectCurrencyViewModel
 import org.koin.dsl.module
 
 val clientViewModelSelectCurrencyModule = module {
-    viewModelDefinition { SelectCurrencyViewModel(get()) }
+    viewModelDefinition { SelectCurrencyViewModel(get(), get(), get()) }
 }
diff --git a/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/model/SelectCurrencyPurpose.kt b/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/model/SelectCurrencyPurpose.kt
new file mode 100644
index 0000000000..6206c68032
--- /dev/null
+++ b/client/viewmodel/selectcurrency/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/model/SelectCurrencyPurpose.kt
@@ -0,0 +1,9 @@
+package com.oztechan.ccc.client.viewmodel.selectcurrency.model
+
+import com.oztechan.ccc.common.core.model.Watcher
+
+sealed class SelectCurrencyPurpose {
+    data object Base : SelectCurrencyPurpose()
+    data class Source(val watcher: Watcher) : SelectCurrencyPurpose()
+    data class Target(val watcher: Watcher) : SelectCurrencyPurpose()
+}
diff --git a/client/viewmodel/selectcurrency/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencyViewModelTest.kt b/client/viewmodel/selectcurrency/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencyViewModelTest.kt
index 532f1946c7..f6f58c82c8 100644
--- a/client/viewmodel/selectcurrency/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencyViewModelTest.kt
+++ b/client/viewmodel/selectcurrency/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/selectcurrency/SelectCurrencyViewModelTest.kt
@@ -6,10 +6,16 @@ package com.oztechan.ccc.client.viewmodel.selectcurrency
 import co.touchlab.kermit.CommonWriter
 import co.touchlab.kermit.Logger
 import com.oztechan.ccc.client.datasource.currency.CurrencyDataSource
+import com.oztechan.ccc.client.datasource.watcher.WatcherDataSource
+import com.oztechan.ccc.client.storage.calculation.CalculationStorage
+import com.oztechan.ccc.client.viewmodel.selectcurrency.model.SelectCurrencyPurpose
+import com.oztechan.ccc.common.core.model.Watcher
+import dev.mokkery.MockMode
 import dev.mokkery.answering.returns
 import dev.mokkery.every
 import dev.mokkery.mock
 import dev.mokkery.verify
+import dev.mokkery.verifySuspend
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flowOf
@@ -30,10 +36,12 @@ import com.oztechan.ccc.common.core.model.Currency as CurrencyCommon
 internal class SelectCurrencyViewModelTest {
 
     private val viewModel: SelectCurrencyViewModel by lazy {
-        SelectCurrencyViewModel(currencyDataSource)
+        SelectCurrencyViewModel(calculationStorage, currencyDataSource, watcherDataSource)
     }
 
     private val currencyDataSource = mock<CurrencyDataSource>()
+    private val calculationStorage = mock<CalculationStorage>(MockMode.autoUnit)
+    private val watcherDataSource = mock<WatcherDataSource>(MockMode.autoUnit)
 
     private val currencyDollar = CurrencyCommon("USD", "Dollar", "$", "", true)
     private val currencyEuro = CurrencyCommon("Eur", "Euro", "", "", true)
@@ -95,12 +103,42 @@ internal class SelectCurrencyViewModelTest {
 
     @Test
     fun onItemClick() = runTest {
+        val watcher = Watcher(1, "USD", "EUR", true, 1.0)
+        // Base
         viewModel.effect.onSubscription {
-            viewModel.event.onItemClick(currencyDollar)
+            viewModel.event.onItemClick(currencyDollar, SelectCurrencyPurpose.Base)
         }.firstOrNull().let {
             assertNotNull(it)
-            assertIs<SelectCurrencyEffect.CurrencyChange>(it)
-            assertEquals(currencyDollar.code, it.newBase)
+            assertIs<SelectCurrencyEffect.CurrencySelected>(it)
+            verify { calculationStorage.currentBase = currencyDollar.code }
+        }
+
+        // Source
+        viewModel.effect.onSubscription {
+            viewModel.event.onItemClick(currencyDollar, SelectCurrencyPurpose.Source(watcher))
+        }.firstOrNull().let {
+            assertNotNull(it)
+            assertIs<SelectCurrencyEffect.CurrencySelected>(it)
+            verifySuspend {
+                watcherDataSource.updateWatcherBaseById(
+                    currencyDollar.code,
+                    watcher.id
+                )
+            }
+        }
+
+        // Target
+        viewModel.effect.onSubscription {
+            viewModel.event.onItemClick(currencyDollar, SelectCurrencyPurpose.Target(watcher))
+        }.firstOrNull().let {
+            assertNotNull(it)
+            assertIs<SelectCurrencyEffect.CurrencySelected>(it)
+            verifySuspend {
+                watcherDataSource.updateWatcherTargetById(
+                    currencyDollar.code,
+                    watcher.id
+                )
+            }
         }
     }
 
diff --git a/client/viewmodel/watchers/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/watchers/WatchersSEED.kt b/client/viewmodel/watchers/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/watchers/WatchersSEED.kt
index 02845f1d61..9d1bbf2960 100644
--- a/client/viewmodel/watchers/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/watchers/WatchersSEED.kt
+++ b/client/viewmodel/watchers/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/watchers/WatchersSEED.kt
@@ -22,9 +22,9 @@ sealed class WatchersEffect : BaseEffect {
 
 interface WatchersEvent : BaseEvent {
     fun onBackClick()
-    fun onBaseClick(watcher: Watcher)
+    fun onSourceClick(watcher: Watcher)
     fun onTargetClick(watcher: Watcher)
-    fun onBaseChanged(watcher: Watcher, newBase: String)
+    fun onSourceChanged(watcher: Watcher, newBase: String)
     fun onTargetChanged(watcher: Watcher, newTarget: String)
     fun onAddClick()
     fun onDeleteClick(watcher: Watcher)
diff --git a/client/viewmodel/watchers/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/watchers/WatchersViewModel.kt b/client/viewmodel/watchers/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/watchers/WatchersViewModel.kt
index 2815cb0d7f..413e7bce59 100644
--- a/client/viewmodel/watchers/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/watchers/WatchersViewModel.kt
+++ b/client/viewmodel/watchers/src/commonMain/kotlin/com/oztechan/ccc/client/viewmodel/watchers/WatchersViewModel.kt
@@ -41,8 +41,8 @@ class WatchersViewModel(
         sendEffect { WatchersEffect.Back }
     }
 
-    override fun onBaseClick(watcher: Watcher) {
-        Logger.d { "WatcherViewModel onBaseClick $watcher" }
+    override fun onSourceClick(watcher: Watcher) {
+        Logger.d { "WatcherViewModel onSourceClick $watcher" }
         sendEffect { WatchersEffect.SelectBase(watcher) }
     }
 
@@ -51,8 +51,8 @@ class WatchersViewModel(
         sendEffect { WatchersEffect.SelectTarget(watcher) }
     }
 
-    override fun onBaseChanged(watcher: Watcher, newBase: String) {
-        Logger.d { "WatcherViewModel onBaseChanged $watcher $newBase" }
+    override fun onSourceChanged(watcher: Watcher, newBase: String) {
+        Logger.d { "WatcherViewModel onSourceChanged $watcher $newBase" }
         viewModelScope.launch {
             watcherDataSource.updateWatcherBaseById(newBase, watcher.id)
         }
diff --git a/client/viewmodel/watchers/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/watchers/WatchersViewModelTest.kt b/client/viewmodel/watchers/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/watchers/WatchersViewModelTest.kt
index 6b4441d0da..1a436b4b67 100644
--- a/client/viewmodel/watchers/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/watchers/WatchersViewModelTest.kt
+++ b/client/viewmodel/watchers/src/commonTest/kotlin/com/oztechan/ccc/client/viewmodel/watchers/WatchersViewModelTest.kt
@@ -113,9 +113,9 @@ internal class WatchersViewModelTest {
     }
 
     @Test
-    fun onBaseClick() = runTest {
+    fun onSourceClick() = runTest {
         viewModel.effect.onSubscription {
-            viewModel.event.onBaseClick(watcher)
+            viewModel.event.onSourceClick(watcher)
         }.firstOrNull().let {
             assertNotNull(it)
             assertIs<WatchersEffect.SelectBase>(it)
@@ -135,9 +135,9 @@ internal class WatchersViewModelTest {
     }
 
     @Test
-    fun onBaseChanged() {
+    fun onSourceChanged() {
         val mockBase = "mock"
-        viewModel.event.onBaseChanged(watcher, mockBase)
+        viewModel.event.onSourceChanged(watcher, mockBase)
 
         runTest {
             verifySuspend { watcherDataSource.updateWatcherBaseById(mockBase, watcher.id) }
diff --git a/common/core/model/src/commonMain/kotlin/com/oztechan/ccc/common/core/model/Watcher.kt b/common/core/model/src/commonMain/kotlin/com/oztechan/ccc/common/core/model/Watcher.kt
index 25f3fecf5b..843eec7ee4 100644
--- a/common/core/model/src/commonMain/kotlin/com/oztechan/ccc/common/core/model/Watcher.kt
+++ b/common/core/model/src/commonMain/kotlin/com/oztechan/ccc/common/core/model/Watcher.kt
@@ -2,7 +2,7 @@ package com.oztechan.ccc.common.core.model
 
 data class Watcher(
     val id: Long,
-    val base: String,
+    val source: String,
     val target: String,
     val isGreater: Boolean,
     val rate: Double,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d02d944de2..5b2b1bdbb8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
 
-kotlin = "2.0.10"
-androidGradlePlugin = "8.5.2"
+kotlin = "2.0.20"
+androidGradlePlugin = "8.6.0"
 jetbrainsCompose = "1.6.11"
 glance = "1.1.0"
-mokkery = "2.2.0"
-activityCompose = "1.9.1"
+mokkery = "2.3.0"
+activityCompose = "1.9.2"
 navigationCompose = "2.7.0-alpha07"
 detekt = "1.23.6"
-androidDesugaring = "2.0.4"
+androidDesugaring = "2.1.1"
 androidMaterial = "1.12.0"
 constraintLayout = "2.1.4"
 koinCore = "3.5.6"
@@ -17,7 +17,7 @@ koinAndroid = "3.5.6"
 koinKtor = "3.5.6"
 ktor = "2.3.12"
 multiplatformSettings = "1.1.1"
-firebaseAnalytics = "22.0.2"
+firebaseAnalytics = "22.1.0"
 firebaseRemoteConfig = "22.0.0"
 googleServices = "4.4.2"
 firebasePer = "21.0.1"
@@ -25,18 +25,18 @@ firebasePerPlugin = "1.4.2"
 firebaseCrashlyticsPlugin = "3.0.2"
 googleAds = "23.3.0"
 googleUmp = "3.0.0"
-huaweiAds = "3.4.73.301"
+huaweiAds = "3.4.74.300"
 huaweiOsm = "1.3.35"
-navigation = "2.7.7"
+navigation = "2.8.0"
 playCoreReview = "2.0.1"
-kotlinXDateTime = "0.6.0"
+kotlinXDateTime = "0.6.1"
 coroutines = "1.8.1"
 billing = "7.0.0"
 leakCanary = "2.14"
 sqlDelight = "1.5.5"
-lifecycle = "2.8.4"
-mokoResources = "0.24.1"
-buildKonfig = "0.15.1"
+lifecycle = "2.8.5"
+mokoResources = "0.24.2"
+buildKonfig = "0.15.2"
 splashScreen = "1.0.1"
 kover = "0.8.3"
 rootBeer = "0.1.0"
diff --git a/ios/CCC.xcodeproj/project.pbxproj b/ios/CCC.xcodeproj/project.pbxproj
index d6dad9b858..578996e93f 100644
--- a/ios/CCC.xcodeproj/project.pbxproj
+++ b/ios/CCC.xcodeproj/project.pbxproj
@@ -12,7 +12,6 @@
 		5C0ABFE02A9390D6002904AC /* CurrenciesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0ABFDF2A9390D6002904AC /* CurrenciesView.swift */; };
 		5C0ABFE22A93A88C002904AC /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0ABFE12A93A88C002904AC /* SettingsView.swift */; };
 		5C0ABFE42A93B1E4002904AC /* PremiumView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0ABFE32A93B1E4002904AC /* PremiumView.swift */; };
-		5C0ABFE82A96A2EF002904AC /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0ABFE72A96A2EF002904AC /* MainView.swift */; };
 		5C0ABFEA2A974C76002904AC /* SelectCurrencyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0ABFE92A974C76002904AC /* SelectCurrencyView.swift */; };
 		5C0ABFEC2A975532002904AC /* WatchersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C0ABFEB2A975532002904AC /* WatchersView.swift */; };
 		5C17581A25BC74BD00D16BD9 /* SettingsRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C17581925BC74BD00D16BD9 /* SettingsRootView.swift */; };
@@ -40,6 +39,7 @@
 		5C3EB6D828775AFF001E822A /* GoogleMobileAds in Frameworks */ = {isa = PBXBuildFile; productRef = 5C3EB6D728775AFF001E822A /* GoogleMobileAds */; };
 		5C4B53692818057F00D10185 /* WatchersRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B53682818057F00D10185 /* WatchersRootView.swift */; };
 		5C4B536B2818066000D10185 /* WatchersToolbarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C4B536A2818066000D10185 /* WatchersToolbarView.swift */; };
+		5C50C1C12C7CF19300D90F4A /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 5C50C1C02C7CF19300D90F4A /* FirebaseAnalytics */; };
 		5C5B0E7C28A4084200FACFDE /* AnalyticsManagerImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5B0E7B28A4084200FACFDE /* AnalyticsManagerImpl.swift */; };
 		5C5C0BA42874B8450061AEF9 /* NavigationStack in Frameworks */ = {isa = PBXBuildFile; productRef = 5C5C0BA32874B8450061AEF9 /* NavigationStack */; };
 		5C5C71E92922BBD200733C49 /* ViewExt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C5C71E82922BBD200733C49 /* ViewExt.swift */; };
@@ -52,12 +52,10 @@
 		5C693EBA25C4AFF800C9373E /* SelectCurrenciesBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C693EB925C4AFF800C9373E /* SelectCurrenciesBottomView.swift */; };
 		5C8FDBDD25BF3FBE00F280FF /* ObservableSEEDViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C8FDBDC25BF3FBE00F280FF /* ObservableSEEDViewModel.swift */; };
 		5C94AC32282FA4B2004C9B3D /* CurrencyImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C94AC31282FA4B2004C9B3D /* CurrencyImageView.swift */; };
-		5C9645D628A137FE001DC24E /* EnvironmentUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9645D528A137FE001DC24E /* EnvironmentUtil.swift */; };
-		5C9A59BB25C350DE006745B0 /* MainRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9A59BA25C350DE006745B0 /* MainRootView.swift */; };
+		5C9A59BB25C350DE006745B0 /* MainScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9A59BA25C350DE006745B0 /* MainScene.swift */; };
 		5C9C75C82603A36A00D66FDD /* ToolbarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C9C75C72603A36A00D66FDD /* ToolbarButton.swift */; };
 		5CB954BF26932408007632DC /* AdaptiveBannerAdView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB954BE26932408007632DC /* AdaptiveBannerAdView.swift */; };
 		5CBFC9472AC2E43800E2CE61 /* KermitExt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CBFC9462AC2E43800E2CE61 /* KermitExt.swift */; };
-		5CC009602BD912AD004AEDE5 /* FirebaseAnalyticsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 5CC0095F2BD912AD004AEDE5 /* FirebaseAnalyticsSwift */; };
 		5CC009622BD912AD004AEDE5 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 5CC009612BD912AD004AEDE5 /* FirebaseCrashlytics */; };
 		5CC009642BD912AD004AEDE5 /* FirebasePerformance in Frameworks */ = {isa = PBXBuildFile; productRef = 5CC009632BD912AD004AEDE5 /* FirebasePerformance */; };
 		5CCFB5882A9B9F13002DF46B /* BugReportSlideRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CCFB5872A9B9F13002DF46B /* BugReportSlideRootView.swift */; };
@@ -95,7 +93,6 @@
 		5C0ABFDF2A9390D6002904AC /* CurrenciesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrenciesView.swift; sourceTree = "<group>"; };
 		5C0ABFE12A93A88C002904AC /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
 		5C0ABFE32A93B1E4002904AC /* PremiumView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PremiumView.swift; sourceTree = "<group>"; };
-		5C0ABFE72A96A2EF002904AC /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
 		5C0ABFE92A974C76002904AC /* SelectCurrencyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectCurrencyView.swift; sourceTree = "<group>"; };
 		5C0ABFEB2A975532002904AC /* WatchersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchersView.swift; sourceTree = "<group>"; };
 		5C17581925BC74BD00D16BD9 /* SettingsRootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsRootView.swift; sourceTree = "<group>"; };
@@ -132,8 +129,7 @@
 		5C693EB925C4AFF800C9373E /* SelectCurrenciesBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectCurrenciesBottomView.swift; sourceTree = "<group>"; };
 		5C8FDBDC25BF3FBE00F280FF /* ObservableSEEDViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObservableSEEDViewModel.swift; sourceTree = "<group>"; };
 		5C94AC31282FA4B2004C9B3D /* CurrencyImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyImageView.swift; sourceTree = "<group>"; };
-		5C9645D528A137FE001DC24E /* EnvironmentUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnvironmentUtil.swift; sourceTree = "<group>"; };
-		5C9A59BA25C350DE006745B0 /* MainRootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainRootView.swift; sourceTree = "<group>"; };
+		5C9A59BA25C350DE006745B0 /* MainScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainScene.swift; sourceTree = "<group>"; };
 		5C9C75C72603A36A00D66FDD /* ToolbarButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarButton.swift; sourceTree = "<group>"; };
 		5CACB69328A7EF1800A2D13C /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
 		5CB954BE26932408007632DC /* AdaptiveBannerAdView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdaptiveBannerAdView.swift; sourceTree = "<group>"; };
@@ -162,7 +158,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5CC009602BD912AD004AEDE5 /* FirebaseAnalyticsSwift in Frameworks */,
+				5C50C1C12C7CF19300D90F4A /* FirebaseAnalytics in Frameworks */,
 				5C34B8CA295903AD009C84AB /* PopupView in Frameworks */,
 				5CC009642BD912AD004AEDE5 /* FirebasePerformance in Frameworks */,
 				5CC009622BD912AD004AEDE5 /* FirebaseCrashlytics in Frameworks */,
@@ -208,8 +204,7 @@
 		5C31E42728141EDF008C42B9 /* Main */ = {
 			isa = PBXGroup;
 			children = (
-				5C9A59BA25C350DE006745B0 /* MainRootView.swift */,
-				5C0ABFE72A96A2EF002904AC /* MainView.swift */,
+				5C9A59BA25C350DE006745B0 /* MainScene.swift */,
 			);
 			path = Main;
 			sourceTree = "<group>";
@@ -329,7 +324,6 @@
 				5C8FDBDC25BF3FBE00F280FF /* ObservableSEEDViewModel.swift */,
 				5CF57E39269588060081E4BB /* RewardedAd.swift */,
 				5CF57E3B2695A3B20081E4BB /* InterstitialAd.swift */,
-				5C9645D528A137FE001DC24E /* EnvironmentUtil.swift */,
 				5C5C71EE2922C06F00733C49 /* SecretUtil.swift */,
 				5C5C71E82922BBD200733C49 /* ViewExt.swift */,
 				5C5C71EA2922BC0300733C49 /* ResourceExt.swift */,
@@ -428,9 +422,9 @@
 				5C5C0BA32874B8450061AEF9 /* NavigationStack */,
 				5C3EB6D728775AFF001E822A /* GoogleMobileAds */,
 				5C34B8C9295903AD009C84AB /* PopupView */,
-				5CC0095F2BD912AD004AEDE5 /* FirebaseAnalyticsSwift */,
 				5CC009612BD912AD004AEDE5 /* FirebaseCrashlytics */,
 				5CC009632BD912AD004AEDE5 /* FirebasePerformance */,
+				5C50C1C02C7CF19300D90F4A /* FirebaseAnalytics */,
 			);
 			productName = CCC;
 			productReference = 7555FF7B242A565900829871 /* CCC_I.app */;
@@ -509,7 +503,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\nif [ \"${CONFIGURATION}\" = \"Release\" ]; then\n    \"${BUILD_DIR%/Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\"\nfi\n";
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\n\"${BUILD_DIR%/Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\"\n";
 		};
 		7555FFB5242A651A00829871 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -536,7 +530,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				5C314CBE25BA0AC0007B22D8 /* CurrenciesRootView.swift in Sources */,
-				5C0ABFE82A96A2EF002904AC /* MainView.swift in Sources */,
 				5C94AC32282FA4B2004C9B3D /* CurrencyImageView.swift in Sources */,
 				5C4B536B2818066000D10185 /* WatchersToolbarView.swift in Sources */,
 				5CF898D42823C1F900712580 /* WatcherItem.swift in Sources */,
@@ -562,7 +555,7 @@
 				5C31E43128142110008C42B9 /* CurrenciesItemView.swift in Sources */,
 				5C31E42028141CA4008C42B9 /* OutputView.swift in Sources */,
 				5CEAF774295F2ECC0018C7FA /* DeviceUtil.swift in Sources */,
-				5C9A59BB25C350DE006745B0 /* MainRootView.swift in Sources */,
+				5C9A59BB25C350DE006745B0 /* MainScene.swift in Sources */,
 				5CBFC9472AC2E43800E2CE61 /* KermitExt.swift in Sources */,
 				5C34B8CC29590500009C84AB /* SnackView.swift in Sources */,
 				5C5D09362562EBDE00DA9C4A /* Koin.swift in Sources */,
@@ -573,7 +566,6 @@
 				5C31E42D28142058008C42B9 /* SelectionView.swift in Sources */,
 				5C0ABFEA2A974C76002904AC /* SelectCurrencyView.swift in Sources */,
 				5CCFB58C2A9B9FFA002DF46B /* PremiumSlideRootView.swift in Sources */,
-				5C9645D628A137FE001DC24E /* EnvironmentUtil.swift in Sources */,
 				5C5D093C2562EC2D00DA9C4A /* CalculatorRootView.swift in Sources */,
 				5CCFB58A2A9B9F8F002DF46B /* IntroSlideRootView.swift in Sources */,
 				5C0ABFE02A9390D6002904AC /* CurrenciesView.swift in Sources */,
@@ -650,7 +642,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -706,7 +698,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -729,7 +721,7 @@
 					"$(SRCROOT)/../ios/provider/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 					"$(SRCROOT)/../client/core/res/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",
 				);
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				INFOPLIST_FILE = CCC/Resources/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -804,7 +796,7 @@
 			repositoryURL = "https://github.com/exyte/PopupView.git";
 			requirement = {
 				kind = exactVersion;
-				version = 2.10.2;
+				version = 3.0.3;
 			};
 		};
 		5C3EB6D628775AFF001E822A /* XCRemoteSwiftPackageReference "swift-package-manager-google-mobile-ads" */ = {
@@ -812,7 +804,7 @@
 			repositoryURL = "https://github.com/googleads/swift-package-manager-google-mobile-ads.git";
 			requirement = {
 				kind = exactVersion;
-				version = 11.6.0;
+				version = 11.8.0;
 			};
 		};
 		5C5C0BA22874B8450061AEF9 /* XCRemoteSwiftPackageReference "swiftui-navigation-stack" */ = {
@@ -828,7 +820,7 @@
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
 			requirement = {
 				kind = exactVersion;
-				version = 10.28.1;
+				version = 11.1.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
@@ -844,16 +836,16 @@
 			package = 5C3EB6D628775AFF001E822A /* XCRemoteSwiftPackageReference "swift-package-manager-google-mobile-ads" */;
 			productName = GoogleMobileAds;
 		};
+		5C50C1C02C7CF19300D90F4A /* FirebaseAnalytics */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 5CC0095E2BD912AD004AEDE5 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
+			productName = FirebaseAnalytics;
+		};
 		5C5C0BA32874B8450061AEF9 /* NavigationStack */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 5C5C0BA22874B8450061AEF9 /* XCRemoteSwiftPackageReference "swiftui-navigation-stack" */;
 			productName = NavigationStack;
 		};
-		5CC0095F2BD912AD004AEDE5 /* FirebaseAnalyticsSwift */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 5CC0095E2BD912AD004AEDE5 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
-			productName = FirebaseAnalyticsSwift;
-		};
 		5CC009612BD912AD004AEDE5 /* FirebaseCrashlytics */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 5CC0095E2BD912AD004AEDE5 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
diff --git a/ios/CCC.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/CCC.xcworkspace/xcshareddata/swiftpm/Package.resolved
index c0233d568d..8b991a4614 100644
--- a/ios/CCC.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ios/CCC.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/abseil-cpp-binary.git",
       "state" : {
-        "revision" : "748c7837511d0e6a507737353af268484e1745e2",
-        "version" : "1.2024011601.1"
+        "revision" : "194a6706acbd25e4ef639bcaddea16e8758a3e27",
+        "version" : "1.2024011602.0"
       }
     },
     {
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/app-check.git",
       "state" : {
-        "revision" : "076b241a625e25eac22f8849be256dfb960fcdfe",
-        "version" : "10.19.1"
+        "revision" : "21fe1af9be463a359aaf8d96789ef73fc3760d09",
+        "version" : "11.0.1"
       }
     },
     {
@@ -23,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/firebase/firebase-ios-sdk",
       "state" : {
-        "revision" : "e57841b296d04370ea23580f908881b0ccab17b9",
-        "version" : "10.28.1"
+        "revision" : "9118aca998dbe2ceac45d64b21a91c6376928df7",
+        "version" : "11.1.0"
       }
     },
     {
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleAppMeasurement.git",
       "state" : {
-        "revision" : "fe727587518729046fc1465625b9afd80b5ab361",
-        "version" : "10.28.0"
+        "revision" : "07a2f57d147d2bf368a0d2dcb5579ff082d9e44f",
+        "version" : "11.1.0"
       }
     },
     {
@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleDataTransport.git",
       "state" : {
-        "revision" : "a637d318ae7ae246b02d7305121275bc75ed5565",
-        "version" : "9.4.0"
+        "revision" : "617af071af9aa1d6a091d59a202910ac482128f9",
+        "version" : "10.1.0"
       }
     },
     {
@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GoogleUtilities.git",
       "state" : {
-        "revision" : "57a1d307f42df690fdef2637f3e5b776da02aad6",
-        "version" : "7.13.3"
+        "revision" : "53156c7ec267db846e6b64c9f4c4e31ba4cf75eb",
+        "version" : "8.0.2"
       }
     },
     {
@@ -59,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/grpc-binary.git",
       "state" : {
-        "revision" : "e9fad491d0673bdda7063a0341fb6b47a30c5359",
-        "version" : "1.62.2"
+        "revision" : "f56d8fc3162de9a498377c7b6cea43431f4f5083",
+        "version" : "1.65.1"
       }
     },
     {
@@ -104,8 +104,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/exyte/PopupView.git",
       "state" : {
-        "revision" : "9e45d522b565147053572113985cc37cdedb59cf",
-        "version" : "2.10.2"
+        "revision" : "259f45a4fcc42ea4ebb3ab61e8d6d6dfc4f652ed",
+        "version" : "3.0.3"
       }
     },
     {
@@ -122,8 +122,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/googleads/swift-package-manager-google-mobile-ads.git",
       "state" : {
-        "revision" : "2e4ae78561feac7192c5d8757464546adebb4c7d",
-        "version" : "11.6.0"
+        "revision" : "ee80d8b9fb9c110c35ff0af56cfc672eee4b515e",
+        "version" : "11.8.0"
       }
     },
     {
diff --git a/ios/CCC/Application.swift b/ios/CCC/Application.swift
index 2f3381c660..5edde111e1 100644
--- a/ios/CCC/Application.swift
+++ b/ios/CCC/Application.swift
@@ -6,32 +6,19 @@
 //  Copyright © 2020 orgName. All rights reserved.
 //
 
-import BackgroundTasks
 import FirebaseCore
 import GoogleMobileAds
 import Provider
 import SwiftUI
 
 var logger: KermitLogger = {
-    return LoggerKt.doInitLogger(isCrashlyticsEnabled: EnvironmentUtil.isRelease)
+    return LoggerKt.doInitLogger()
 }()
 
 @main
 struct Application: App {
-    @Environment(\.scenePhase) private var scenePhase
-
-    private let notificationManager = NotificationManager()
-    private let backgroundRepository: BackgroundRepository
-
-    private let taskID = "com.oztechan.ccc.CCC.fetch"
-    private let earliestTaskPeriod: Double = 1 * 60 * 60 // 1 hour
-
-    @State private var isWatcherAlertShown = false
-
     init() {
-        if EnvironmentUtil.isRelease {
-            FirebaseApp.configure()
-        }
+        FirebaseApp.configure()
 
         logger.i(message: { "Application init" })
 
@@ -47,79 +34,9 @@ struct Application: App {
         ))
         UICollectionView.appearance().backgroundColor = .clear
         UITableView.appearance().backgroundColor = .clear
-
-        self.backgroundRepository = koin.get()
-
-        registerAppRefresh()
     }
 
     var body: some Scene {
-        WindowGroup {
-            MainRootView()
-                .alert(isPresented: $isWatcherAlertShown) {
-                    AlertView(
-                        title: String(\.txt_watcher_alert_title),
-                        message: String(\.txt_watcher_alert_sub_title),
-                        buttonText: String(\.txt_ok)
-                    )
-                }
-        }.onChange(of: scenePhase) { phase in
-            logger.i(message: { "Application onChange scenePhase \(phase)" })
-
-            if phase == .background {
-                scheduleAppRefresh()
-            }
-        }
-    }
-
-    private func scheduleAppRefresh() {
-        logger.i(message: { "Application scheduleAppRefresh" })
-
-        let request = BGAppRefreshTaskRequest(identifier: taskID)
-        request.earliestBeginDate = Date(timeIntervalSinceNow: earliestTaskPeriod)
-
-        do {
-            try BGTaskScheduler.shared.submit(request)
-        } catch {
-            logger.i(message: { "Application scheduleAppRefresh Could not schedule app refresh: \(error)" })
-        }
-    }
-
-    private func registerAppRefresh() {
-        logger.i(message: { "Application registerAppRefresh" })
-
-        BGTaskScheduler.shared.cancelAllTaskRequests()
-
-        BGTaskScheduler.shared.register(forTaskWithIdentifier: taskID, using: nil) { task in
-            // swiftlint:disable:next force_cast
-            handleAppRefresh(task: task as! BGAppRefreshTask)
-
-            task.expirationHandler = {
-                logger.i(message: { "Application registerAppRefresh BackgroundTask Expired" })
-
-                task.setTaskCompleted(success: false)
-            }
-        }
-    }
-
-    private func handleAppRefresh(task: BGAppRefreshTask) {
-        logger.i(message: { "Application handleAppRefresh" })
-
-        scheduleAppRefresh()
-
-        if backgroundRepository.shouldSendNotification() {
-            if scenePhase == .background {
-                self.notificationManager.sendNotification(
-                    title: String(\.txt_watcher_alert_title),
-                    body: String(\.txt_watcher_alert_sub_title)
-                )
-            } else {
-                isWatcherAlertShown.toggle()
-            }
-
-            task.setTaskCompleted(success: true)
-        } else {
-            task.setTaskCompleted(success: true)
-        }
+        MainScene()
     }
 }
diff --git a/ios/CCC/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/ios/CCC/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png
index a77fe82159..7f7ecf6416 100644
Binary files a/ios/CCC/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png and b/ios/CCC/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png differ
diff --git a/ios/CCC/Resources/Assets.xcassets/launchImage.imageset/launchImage.png b/ios/CCC/Resources/Assets.xcassets/launchImage.imageset/launchImage.png
index ee40782d97..5b78b4a5db 100644
Binary files a/ios/CCC/Resources/Assets.xcassets/launchImage.imageset/launchImage.png and b/ios/CCC/Resources/Assets.xcassets/launchImage.imageset/launchImage.png differ
diff --git a/ios/CCC/UI/Calculator/CalculatorRootView.swift b/ios/CCC/UI/Calculator/CalculatorRootView.swift
index a90d357d79..baa2849d1d 100644
--- a/ios/CCC/UI/Calculator/CalculatorRootView.swift
+++ b/ios/CCC/UI/Calculator/CalculatorRootView.swift
@@ -62,7 +62,7 @@ struct CalculatorRootView: View {
                 text: String(\.choose_at_least_two_currency),
                 buttonText: String(\.select),
                 buttonAction: {
-                    navigationStack.push(CurrenciesRootView(onBaseChange: { observable.event.onBaseChange(base: $0) }))
+                    navigationStack.push(CurrenciesRootView())
                 }
             )
         }
@@ -79,10 +79,11 @@ struct CalculatorRootView: View {
         }
         .sheet(
             isPresented: $isBarShown,
+            onDismiss: { observable.event.onSheetDismissed() },
             content: {
                 SelectCurrencyRootView(
                     isBarShown: $isBarShown,
-                    onCurrencySelected: { observable.event.onBaseChange(base: $0) }
+                    purpose: SelectCurrencyPurpose.Base()
                 ).environmentObject(navigationStack)
             }
         )
@@ -108,7 +109,7 @@ struct CalculatorRootView: View {
         case is CalculatorEffect.OpenBar:
             isBarShown = true
         case is CalculatorEffect.OpenSettings:
-            navigationStack.push(SettingsRootView(onBaseChange: { observable.event.onBaseChange(base: $0) }))
+            navigationStack.push(SettingsRootView())
         case is CalculatorEffect.ShowPasteRequest:
             isPasteRequestSnackShown.toggle()
         case let copyToClipboardEffect as CalculatorEffect.CopyToClipboard:
diff --git a/ios/CCC/UI/Calculator/CalculatorView.swift b/ios/CCC/UI/Calculator/CalculatorView.swift
index 6672b807bc..3669deddb0 100644
--- a/ios/CCC/UI/Calculator/CalculatorView.swift
+++ b/ios/CCC/UI/Calculator/CalculatorView.swift
@@ -55,7 +55,7 @@ struct CalculatorView: View {
                         }
                         .listRowInsets(.init())
                         .listRowBackground(\.background)
-                        .animation(.default)
+                        .animation(.default, value: state)
                     }
                     .withClearBackground(color: Color(\.background))
                     .padding(bottom: 4.cp())
diff --git a/ios/CCC/UI/Calculator/ConversionStateView.swift b/ios/CCC/UI/Calculator/ConversionStateView.swift
index cfc4644c5c..0c6bf9a992 100644
--- a/ios/CCC/UI/Calculator/ConversionStateView.swift
+++ b/ios/CCC/UI/Calculator/ConversionStateView.swift
@@ -22,6 +22,6 @@ struct ConversionStateView: View {
                 .font(relative: .caption2)
         }
         .padding(.bottom, 3.cp())
-        .animation(.default)
+        .animation(.default, value: text)
     }
 }
diff --git a/ios/CCC/UI/Calculator/InputView.swift b/ios/CCC/UI/Calculator/InputView.swift
index 1eb10c38b6..fed1b556dc 100644
--- a/ios/CCC/UI/Calculator/InputView.swift
+++ b/ios/CCC/UI/Calculator/InputView.swift
@@ -25,7 +25,7 @@ struct InputView: View {
                 .fixedSize(horizontal: false, vertical: true)
                 .foregroundColor(\.text)
                 .font(relative: .title2)
-                .animation(.none)
+                .animation(.none, value: input)
                 .onLongPressGesture {
                     onInputLongClick()
                 }
diff --git a/ios/CCC/UI/Calculator/OutputView.swift b/ios/CCC/UI/Calculator/OutputView.swift
index e65e3785eb..dea36be492 100644
--- a/ios/CCC/UI/Calculator/OutputView.swift
+++ b/ios/CCC/UI/Calculator/OutputView.swift
@@ -42,7 +42,7 @@ struct OutputView: View {
             }
             .frame(minWidth: 0, maxWidth: .infinity, alignment: .bottomLeading)
             .padding(.horizontal, 20.cp())
-            .animation(.default)
+            .animation(.default, value: output)
         }
         .contentShape(Rectangle())
         .lineLimit(1)
diff --git a/ios/CCC/UI/Currencies/CurrenciesRootView.swift b/ios/CCC/UI/Currencies/CurrenciesRootView.swift
index 71e6e6e156..f78f7e3bff 100644
--- a/ios/CCC/UI/Currencies/CurrenciesRootView.swift
+++ b/ios/CCC/UI/Currencies/CurrenciesRootView.swift
@@ -24,8 +24,6 @@ struct CurrenciesRootView: View {
 
     private let analyticsManager: AnalyticsManager = koin.get()
 
-    var onBaseChange: (String) -> Void
-
     var body: some View {
         CurrenciesView(
             event: observable.event,
@@ -50,8 +48,6 @@ struct CurrenciesRootView: View {
             navigationStack.push(CalculatorRootView())
         case is CurrenciesEffect.Back:
             navigationStack.pop()
-        case let changeBaseEffect as CurrenciesEffect.ChangeBase:
-            onBaseChange(changeBaseEffect.newBase)
         default:
             logger.i(message: { "CurrenciesRootView unknown effect" })
         }
diff --git a/ios/CCC/UI/Currencies/CurrenciesView.swift b/ios/CCC/UI/Currencies/CurrenciesView.swift
index d0695f2ce3..e2a521c50f 100644
--- a/ios/CCC/UI/Currencies/CurrenciesView.swift
+++ b/ios/CCC/UI/Currencies/CurrenciesView.swift
@@ -63,7 +63,7 @@ struct CurrenciesView: View {
                     AdaptiveBannerAdView(unitID: "BANNER_AD_UNIT_ID_CURRENCIES").adapt()
                 }
             }
-            .animation(.default)
+            .animation(.default, value: state)
             .navigationBarHidden(true)
         }
     }
diff --git a/ios/CCC/UI/Main/MainRootView.swift b/ios/CCC/UI/Main/MainRootView.swift
deleted file mode 100644
index 10b98385da..0000000000
--- a/ios/CCC/UI/Main/MainRootView.swift
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-//  MainView.swift
-//  CCC
-//
-//  Created by Mustafa Ozhan on 28/01/2021.
-//  Copyright © 2021 orgName. All rights reserved.
-//
-
-import GoogleMobileAds
-import NavigationStack
-import Provider
-import SwiftUI
-
-struct MainRootView: View {
-    @StateObject var observable = ObservableSEEDViewModel<
-        MainState,
-        MainEffect,
-        MainEvent,
-        MainData,
-        MainViewModel
-    >()
-
-    var body: some View {
-        MainView(
-            state: observable.state
-        )
-        .onAppear {
-            observable.startObserving()
-            observable.event.onResume()
-        }
-        .onDisappear {
-            observable.stopObserving()
-            observable.event.onPause()
-        }
-        .onReceive(observable.effect) { onEffect(effect: $0) }
-    }
-
-    private func onEffect(effect: MainEffect) {
-        logger.i(message: { "MainRootView onEffect \(effect.description)" })
-        switch effect {
-        case is MainEffect.ShowInterstitialAd:
-            InterstitialAd().show()
-        default:
-            logger.i(message: { "MainRootView unknown effect" })
-        }
-    }
-}
diff --git a/ios/CCC/UI/Main/MainScene.swift b/ios/CCC/UI/Main/MainScene.swift
new file mode 100644
index 0000000000..c6d371fe82
--- /dev/null
+++ b/ios/CCC/UI/Main/MainScene.swift
@@ -0,0 +1,146 @@
+//
+//  MainScene.swift
+//  CCC
+//
+//  Created by Mustafa Ozhan on 28/01/2021.
+//  Copyright © 2021 orgName. All rights reserved.
+//
+
+import GoogleMobileAds
+import NavigationStack
+import Provider
+import SwiftUI
+import BackgroundTasks
+
+struct MainScene: Scene {
+	@Environment(\.scenePhase) private var scenePhase
+	@State private var isWatcherAlertShown = false
+	@StateObject var observable = ObservableSEEDViewModel<
+		MainState,
+		MainEffect,
+		MainEvent,
+		MainData,
+		MainViewModel
+	>()
+	private let notificationManager = NotificationManager()
+	private let backgroundRepository: BackgroundRepository = koin.get()
+
+	private let taskID = "com.oztechan.ccc.CCC.fetch"
+	private let earliestTaskPeriod: Double = 1 * 60 * 60 // 1 hour
+
+	init() {
+		registerAppRefresh()
+	}
+
+    var body: some Scene {
+        WindowGroup {
+            NavigationStackView(
+                transitionType: .default,
+                easing: Animation.easeInOut
+            ) {
+                if scenePhase == .inactive {
+                    EmptyView()
+                } else {
+                    if observable.state.shouldOnboardUser {
+                        IntroSlideRootView()
+                    } else {
+                        CalculatorRootView()
+                    }
+                }
+            }.onAppear {
+                observable.startObserving()
+            }.onDisappear {
+                observable.stopObserving()
+            }.onReceive(observable.effect) {
+                onEffect(effect: $0)
+            }.alert(isPresented: $isWatcherAlertShown) {
+                AlertView(
+                    title: String(\.txt_watcher_alert_title),
+                    message: String(\.txt_watcher_alert_sub_title),
+                    buttonText: String(\.txt_ok)
+                )
+            }
+        }.onChange(of: scenePhase) { phase in
+            onScenePhaseChange(phase: phase)
+        }
+    }
+
+    private func onScenePhaseChange(phase: ScenePhase) {
+        logger.i(message: { "MainScene onChange scenePhase \(phase)" })
+
+        switch phase {
+        case .active:
+            observable.event.onAppForeground()
+        case .inactive:
+            // only when come from active, since it visits inactive while coming from background
+            if scenePhase == .active {
+                observable.event.onAppBackground()
+            }
+        case .background:
+            scheduleAppRefresh()
+        @unknown default:
+            logger.w(message: { "MainScene unknown scenePhase \(phase)" })
+        }
+    }
+
+	private func onEffect(effect: MainEffect) {
+		logger.i(message: { "MainScene onEffect \(effect.description)" })
+		switch effect {
+		case is MainEffect.ShowInterstitialAd:
+			InterstitialAd().show()
+		default:
+			logger.i(message: { "MainScene unknown effect" })
+		}
+	}
+
+	private func scheduleAppRefresh() {
+		logger.i(message: { "MainScene scheduleAppRefresh" })
+
+		let request = BGAppRefreshTaskRequest(identifier: taskID)
+		request.earliestBeginDate = Date(timeIntervalSinceNow: earliestTaskPeriod)
+
+		do {
+			try BGTaskScheduler.shared.submit(request)
+		} catch {
+			logger.i(message: { "MainScene scheduleAppRefresh Could not schedule app refresh: \(error)" })
+		}
+	}
+
+	private func registerAppRefresh() {
+		logger.i(message: { "MainScene registerAppRefresh" })
+
+		BGTaskScheduler.shared.cancelAllTaskRequests()
+
+		BGTaskScheduler.shared.register(forTaskWithIdentifier: taskID, using: nil) { task in
+			// swiftlint:disable:next force_cast
+			handleAppRefresh(task: task as! BGAppRefreshTask)
+
+			task.expirationHandler = {
+				logger.i(message: { "MainScene registerAppRefresh BackgroundTask Expired" })
+
+				task.setTaskCompleted(success: false)
+			}
+		}
+	}
+
+	private func handleAppRefresh(task: BGAppRefreshTask) {
+		logger.i(message: { "MainScene handleAppRefresh" })
+
+		scheduleAppRefresh()
+
+		if backgroundRepository.shouldSendNotification() {
+			if scenePhase == .background {
+				self.notificationManager.sendNotification(
+					title: String(\.txt_watcher_alert_title),
+					body: String(\.txt_watcher_alert_sub_title)
+				)
+			} else {
+				isWatcherAlertShown.toggle()
+			}
+
+			task.setTaskCompleted(success: true)
+		} else {
+			task.setTaskCompleted(success: true)
+		}
+	}
+}
diff --git a/ios/CCC/UI/Main/MainView.swift b/ios/CCC/UI/Main/MainView.swift
deleted file mode 100644
index dbac5a7b80..0000000000
--- a/ios/CCC/UI/Main/MainView.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-//  MainView.swift
-//  CCC
-//
-//  Created by Mustafa Ozhan on 23.08.23.
-//  Copyright © 2023 orgName. All rights reserved.
-//
-
-import SwiftUI
-import Provider
-import NavigationStack
-
-struct MainView: View {
-    let state: MainState
-
-    var body: some View {
-        NavigationStackView(
-            transitionType: .default,
-            easing: Animation.easeInOut
-        ) {
-            if state.shouldOnboardUser {
-                IntroSlideRootView()
-            } else {
-                CalculatorRootView()
-            }
-        }
-    }
-}
diff --git a/ios/CCC/UI/SelectCurrency/SelectCurrencyRootView.swift b/ios/CCC/UI/SelectCurrency/SelectCurrencyRootView.swift
index 7523992979..3c4d332923 100644
--- a/ios/CCC/UI/SelectCurrency/SelectCurrencyRootView.swift
+++ b/ios/CCC/UI/SelectCurrency/SelectCurrencyRootView.swift
@@ -24,12 +24,13 @@ struct SelectCurrencyRootView: View {
 
     private let analyticsManager: AnalyticsManager = koin.get()
 
-    var onCurrencySelected: (String) -> Void
+    var purpose: SelectCurrencyPurpose
 
     var body: some View {
         SelectCurrencyView(
             event: observable.event,
-            state: observable.state
+            state: observable.state,
+            purpose: purpose
         )
         .onAppear {
             observable.startObserving()
@@ -42,11 +43,10 @@ struct SelectCurrencyRootView: View {
     private func onEffect(effect: SelectCurrencyEffect) {
         logger.i(message: { "SelectCurrencyRootView onEffect \(effect.description)" })
         switch effect {
-        case let currencyChangeEffect as SelectCurrencyEffect.CurrencyChange:
-            onCurrencySelected(currencyChangeEffect.newBase)
+        case is SelectCurrencyEffect.CurrencySelected:
             isBarShown = false
         case is SelectCurrencyEffect.OpenCurrencies:
-            navigationStack.push(CurrenciesRootView(onBaseChange: onCurrencySelected))
+            navigationStack.push(CurrenciesRootView())
         default:
             logger.i(message: { "SelectCurrencyRootView unknown effect" })
         }
diff --git a/ios/CCC/UI/SelectCurrency/SelectCurrencyView.swift b/ios/CCC/UI/SelectCurrency/SelectCurrencyView.swift
index 3d75343009..8276915b52 100644
--- a/ios/CCC/UI/SelectCurrency/SelectCurrencyView.swift
+++ b/ios/CCC/UI/SelectCurrency/SelectCurrencyView.swift
@@ -14,6 +14,7 @@ struct SelectCurrencyView: View {
 
     var event: SelectCurrencyEvent
     var state: SelectCurrencyState
+    var purpose: SelectCurrencyPurpose
 
     var body: some View {
         ZStack {
@@ -31,7 +32,7 @@ struct SelectCurrencyView: View {
                     Form {
                         List(state.currencyList, id: \.code) { currency in
                             SelectCurrencyItemView(item: currency)
-                                .onTapGesture { event.onItemClick(currency: currency) }
+                                .onTapGesture { event.onItemClick(currency: currency, purpose: purpose) }
                                 .frame(minWidth: 0, maxWidth: .infinity, alignment: .center)
                         }
                         .listRowInsets(.init())
diff --git a/ios/CCC/UI/Settings/SettingsRootView.swift b/ios/CCC/UI/Settings/SettingsRootView.swift
index 42427f48a7..29199dd007 100644
--- a/ios/CCC/UI/Settings/SettingsRootView.swift
+++ b/ios/CCC/UI/Settings/SettingsRootView.swift
@@ -31,8 +31,6 @@ struct SettingsRootView: View {
 
     private let analyticsManager: AnalyticsManager = koin.get()
 
-    var onBaseChange: ((String) -> Void)
-
     var body: some View {
         SettingsView(
             event: observable.event,
@@ -74,7 +72,7 @@ struct SettingsRootView: View {
         case is SettingsEffect.Back:
             navigationStack.pop()
         case is SettingsEffect.OpenCurrencies:
-            navigationStack.push(CurrenciesRootView(onBaseChange: onBaseChange))
+            navigationStack.push(CurrenciesRootView())
         case is SettingsEffect.OpenWatchers:
             navigationStack.push(WatchersRootView())
         case is SettingsEffect.FeedBack:
diff --git a/ios/CCC/UI/Slides/BugReportSlideRootView.swift b/ios/CCC/UI/Slides/BugReportSlideRootView.swift
index 593e24c6e9..e4ba1d9f65 100644
--- a/ios/CCC/UI/Slides/BugReportSlideRootView.swift
+++ b/ios/CCC/UI/Slides/BugReportSlideRootView.swift
@@ -24,7 +24,7 @@ struct BugReportSlideRootView: View {
             subTitle1: String(\.slide_bug_report_text_1),
             subTitle2: String(\.slide_bug_report_text_2),
             buttonText: String(\.got_it),
-            buttonAction: { navigationStack.push(CurrenciesRootView(onBaseChange: { _ in })) }
+            buttonAction: { navigationStack.push(CurrenciesRootView()) }
         )
         .onAppear {
             analyticsManager.trackScreen(screenName: ScreenName.Slider(position: 2))
diff --git a/ios/CCC/UI/Watchers/WatcherItem.swift b/ios/CCC/UI/Watchers/WatcherItem.swift
index 22324b5fcb..5436702114 100644
--- a/ios/CCC/UI/Watchers/WatcherItem.swift
+++ b/ios/CCC/UI/Watchers/WatcherItem.swift
@@ -16,7 +16,7 @@ struct WatcherItem: View {
     @State private var relationSelection = 0
     @State private var amount = ""
 
-    @Binding var isBaseBarShown: Bool
+    @Binding var isSourceBarShown: Bool
     @Binding var isTargetBarShown: Bool
 
     let watcher: Provider.Watcher
@@ -26,8 +26,8 @@ struct WatcherItem: View {
         HStack {
             Text(String(\.one)).font(relative: .body)
 
-            CurrencyImageView(imageName: watcher.base)
-                .onTapGesture { event.onBaseClick(watcher: watcher) }
+            CurrencyImageView(imageName: watcher.source)
+                .onTapGesture { event.onSourceClick(watcher: watcher) }
 
             Picker("", selection: $relationSelection) {
                 Text(String(\.txt_smaller))
@@ -73,6 +73,23 @@ struct WatcherItem: View {
         .onAppear {
             relationSelection = watcher.isGreater ? 1 : 0
             amount = "\(watcher.rate)"
-        }
+        }.sheet(
+            isPresented: $isSourceBarShown,
+            content: {
+                SelectCurrencyRootView(
+                    isBarShown: $isSourceBarShown,
+                    purpose: SelectCurrencyPurpose.Source(watcher: watcher)
+                )
+            }
+        )
+        .sheet(
+            isPresented: $isTargetBarShown,
+            content: {
+                SelectCurrencyRootView(
+                    isBarShown: $isTargetBarShown,
+                    purpose: SelectCurrencyPurpose.Target(watcher: watcher)
+                )
+            }
+        )
     }
 }
diff --git a/ios/CCC/UI/Watchers/WatchersRootView.swift b/ios/CCC/UI/Watchers/WatchersRootView.swift
index a8983c2f84..50fd148bc7 100644
--- a/ios/CCC/UI/Watchers/WatchersRootView.swift
+++ b/ios/CCC/UI/Watchers/WatchersRootView.swift
@@ -21,8 +21,8 @@ struct WatchersRootView: View {
         WatchersViewModel
     >()
     @StateObject var notificationManager = NotificationManager()
-    @State var baseBarInfo = BarInfo(isShown: false, watcher: nil)
-    @State var targetBarInfo = BarInfo(isShown: false, watcher: nil)
+    @State var isSourceBarShown = false
+    @State var isTargetBarShown = false
     @State var isInvalidInputSnackShown = false
     @State var isMaxWatchersSnackShown = false
     @State var isTooBigInputSnackShown = false
@@ -34,8 +34,8 @@ struct WatchersRootView: View {
             event: observable.event,
             state: observable.state,
             authorizationStatus: notificationManager.authorizationStatus,
-            baseBarInfo: $baseBarInfo,
-            targetBarInfo: $targetBarInfo
+            isSourceBarShown: $isSourceBarShown,
+            isTargetBarShown: $isTargetBarShown
         )
         .snack(isPresented: $isInvalidInputSnackShown) {
             SnackView(text: String(\.text_invalid_input))
@@ -46,34 +46,6 @@ struct WatchersRootView: View {
         .snack(isPresented: $isTooBigInputSnackShown) {
             SnackView(text: String(\.text_too_big_input))
         }
-        .sheet(
-            isPresented: $baseBarInfo.isShown,
-            content: {
-                SelectCurrencyRootView(
-                    isBarShown: $baseBarInfo.isShown,
-                    onCurrencySelected: {
-                        observable.event.onBaseChanged(
-                            watcher: baseBarInfo.watcher!,
-                            newBase: $0
-                        )
-                    }
-                ).environmentObject(navigationStack)
-            }
-        )
-        .sheet(
-            isPresented: $targetBarInfo.isShown,
-            content: {
-                SelectCurrencyRootView(
-                    isBarShown: $targetBarInfo.isShown,
-                    onCurrencySelected: {
-                        observable.event.onTargetChanged(
-                            watcher: targetBarInfo.watcher!,
-                            newTarget: $0
-                        )
-                    }
-                ).environmentObject(navigationStack)
-            }
-        )
         .onAppear {
             observable.startObserving()
             notificationManager.reloadAuthorisationStatus()
@@ -89,7 +61,7 @@ struct WatchersRootView: View {
         .onChange(of: notificationManager.authorizationStatus) {
             onAuthorisationChange(authorizationStatus: $0)
         }
-        .animation(.default)
+        .animation(.default, value: observable.state)
     }
 
     private func onEffect(effect: WatchersEffect) {
@@ -97,12 +69,10 @@ struct WatchersRootView: View {
         switch effect {
         case is WatchersEffect.Back:
             navigationStack.pop()
-        case let selectBaseEffect as WatchersEffect.SelectBase:
-            baseBarInfo.watcher = selectBaseEffect.watcher
-            baseBarInfo.isShown.toggle()
-        case let selectTargetEffect as WatchersEffect.SelectTarget:
-            targetBarInfo.watcher = selectTargetEffect.watcher
-            targetBarInfo.isShown.toggle()
+        case is WatchersEffect.SelectBase:
+            isSourceBarShown.toggle()
+        case is WatchersEffect.SelectTarget:
+            isTargetBarShown .toggle()
         case is WatchersEffect.TooBigInput:
             isTooBigInputSnackShown.toggle()
         case is WatchersEffect.InvalidInput:
@@ -127,9 +97,4 @@ struct WatchersRootView: View {
             break
         }
     }
-
-    public struct BarInfo {
-        var isShown: Bool
-        var watcher: Provider.Watcher?
-    }
 }
diff --git a/ios/CCC/UI/Watchers/WatchersView.swift b/ios/CCC/UI/Watchers/WatchersView.swift
index 61bde8024e..a4a94a070a 100644
--- a/ios/CCC/UI/Watchers/WatchersView.swift
+++ b/ios/CCC/UI/Watchers/WatchersView.swift
@@ -8,6 +8,7 @@
 
 import Provider
 import SwiftUI
+import NavigationStack
 
 struct WatchersView: View {
     @Environment(\.colorScheme) private var colorScheme
@@ -16,8 +17,8 @@ struct WatchersView: View {
     var state: WatchersState
     var authorizationStatus: UNAuthorizationStatus?
 
-    @Binding var baseBarInfo: WatchersRootView.BarInfo
-    @Binding var targetBarInfo: WatchersRootView.BarInfo
+    @Binding var isSourceBarShown: Bool
+    @Binding var isTargetBarShown: Bool
 
     var body: some View {
         ZStack {
@@ -33,8 +34,8 @@ struct WatchersView: View {
                     Form {
                         List(state.watcherList, id: \.id) { watcher in
                             WatcherItem(
-                                isBaseBarShown: $baseBarInfo.isShown,
-                                isTargetBarShown: $targetBarInfo.isShown,
+                                isSourceBarShown: $isSourceBarShown,
+                                isTargetBarShown: $isTargetBarShown,
                                 watcher: watcher,
                                 event: event
                             )
diff --git a/ios/CCC/Util/DeviceUtil.swift b/ios/CCC/Util/DeviceUtil.swift
index e51cf0a607..4bfbd7f18d 100644
--- a/ios/CCC/Util/DeviceUtil.swift
+++ b/ios/CCC/Util/DeviceUtil.swift
@@ -10,8 +10,13 @@ import UIKit
 
 public struct DeviceUtil {
     public static func getBottomNotchHeight() -> Double {
-        return Double(
-            UIApplication.shared.windows.first?.safeAreaInsets.bottom ?? 0
-        )
+        let keyWindow = UIApplication.shared.connectedScenes
+            .filter({ $0.activationState == .foregroundActive })
+            .map({ $0 as? UIWindowScene })
+            .compactMap({ $0 })
+            .first?.windows
+            .filter({ $0.isKeyWindow }).first
+
+        return Double(keyWindow?.safeAreaInsets.bottom ?? 0)
     }
 }
diff --git a/ios/CCC/Util/EnvironmentUtil.swift b/ios/CCC/Util/EnvironmentUtil.swift
deleted file mode 100644
index bce0733884..0000000000
--- a/ios/CCC/Util/EnvironmentUtil.swift
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  EnvironmentUtil.swift
-//  CCC
-//
-//  Created by Mustafa Ozhan on 08.08.22.
-//  Copyright © 2022 orgName. All rights reserved.
-//
-
-import Foundation
-
-public struct EnvironmentUtil {
-    public static var isRelease: Bool {
-        #if DEBUG
-        return false
-        #else
-        return true
-        #endif
-    }
-}
diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock
index 4b1a23c0ba..f8384fb33b 100644
--- a/ios/Gemfile.lock
+++ b/ios/Gemfile.lock
@@ -10,17 +10,17 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.965.0)
-    aws-sdk-core (3.201.5)
+    aws-partitions (1.975.0)
+    aws-sdk-core (3.205.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.88.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-kms (1.91.0)
+      aws-sdk-core (~> 3, >= 3.205.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.158.0)
-      aws-sdk-core (~> 3, >= 3.201.0)
+    aws-sdk-s3 (1.162.0)
+      aws-sdk-core (~> 3, >= 3.205.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.9.1)
@@ -159,7 +159,7 @@ GEM
     httpclient (2.8.3)
     jmespath (1.6.2)
     json (2.7.2)
-    jwt (2.8.2)
+    jwt (2.9.0)
       base64
     mini_magick (4.13.2)
     mini_mime (1.1.5)
@@ -178,8 +178,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.5)
-      strscan
+    rexml (3.3.7)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -192,7 +191,6 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -202,7 +200,7 @@ GEM
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
     xcodeproj (1.25.0)
       CFPropertyList (>= 2.3.3, < 4.0)
diff --git a/ios/Package.swift b/ios/Package.swift
index 9ac9f07383..94dda31bcb 100644
--- a/ios/Package.swift
+++ b/ios/Package.swift
@@ -14,15 +14,15 @@ let package = Package(
     dependencies: [
         .package(
             url: "https://github.com/firebase/firebase-ios-sdk",
-            from: "10.28.1"
+            from: "11.1.0"
         ),
         .package(
             url: "https://github.com/googleads/swift-package-manager-google-mobile-ads.git",
-            from: "11.6.0"
+            from: "11.8.0"
         ),
         .package(
             url: "https://github.com/exyte/PopupView.git",
-            from: "2.10.1"
+            from: "3.0.3"
         ),
         .package(
             url: "https://github.com/matteopuc/swiftui-navigation-stack",
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
index 51fdba086b..d2881ab075 100644
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -86,7 +86,10 @@ platform :ios do
                 configuration: "Release"
             )
             pilot(skip_waiting_for_build_processing: true)
-            upload_crashlytics_symbols
+            upload_symbols_to_crashlytics(
+                dsym_path: "../ios/CCC.app.dSYM.zip",
+                binary_path: "../ios/scripts/upload-symbols",
+            )
         end
 
         lane :distributeRelease do
@@ -97,7 +100,10 @@ platform :ios do
                 firebase_cli_token: ENV["FIREBASE_CLI_TOKEN"],
                 ipa_path: "../ios/CCC.ipa"
             )
-            upload_crashlytics_symbols
+            upload_symbols_to_crashlytics(
+                dsym_path: "../ios/CCC.app.dSYM.zip",
+                binary_path: "../ios/scripts/upload-symbols",
+            )
         end
 
         lane :distributeDebug do
@@ -108,6 +114,10 @@ platform :ios do
                 firebase_cli_token: ENV["FIREBASE_CLI_TOKEN"],
                 ipa_path: "../ios/CCC_I.ipa"
             )
+            upload_symbols_to_crashlytics(
+                dsym_path: "../ios/CCC_I.app.dSYM.zip",
+                binary_path: "../ios/scripts/upload-symbols",
+            )
         end
 
         # Sub lines
@@ -164,11 +174,4 @@ platform :ios do
                 },
             )
         end
-
-        lane :upload_crashlytics_symbols do
-            upload_symbols_to_crashlytics(
-                dsym_path: "../ios/CCC.app.dSYM.zip",
-                binary_path: "../ios/scripts/upload-symbols",
-            )
-        end
 end
\ No newline at end of file
diff --git a/ios/provider/src/iosMain/kotlin/com/oztechan/ccc/ios/provider/Logger.kt b/ios/provider/src/iosMain/kotlin/com/oztechan/ccc/ios/provider/Logger.kt
index cf42b3de26..87951fc6eb 100644
--- a/ios/provider/src/iosMain/kotlin/com/oztechan/ccc/ios/provider/Logger.kt
+++ b/ios/provider/src/iosMain/kotlin/com/oztechan/ccc/ios/provider/Logger.kt
@@ -5,12 +5,9 @@ import com.github.submob.logmob.initCrashlytics
 import com.github.submob.logmob.initLogger
 
 @Suppress("unused")
-fun initLogger(isCrashlyticsEnabled: Boolean): Logger {
+fun initLogger(): Logger {
     // should be before initCrashlytics
     initLogger()
-
-    if (isCrashlyticsEnabled) {
-        initCrashlytics()
-    }
+    initCrashlytics()
     return Logger
 }
diff --git a/ios/repository/background/src/commonMain/kotlin/com/oztechan/ccc/ios/repository/background/BackgroundRepositoryImpl.kt b/ios/repository/background/src/commonMain/kotlin/com/oztechan/ccc/ios/repository/background/BackgroundRepositoryImpl.kt
index cef2125d6b..cdbe98c12b 100644
--- a/ios/repository/background/src/commonMain/kotlin/com/oztechan/ccc/ios/repository/background/BackgroundRepositoryImpl.kt
+++ b/ios/repository/background/src/commonMain/kotlin/com/oztechan/ccc/ios/repository/background/BackgroundRepositoryImpl.kt
@@ -22,7 +22,7 @@ internal class BackgroundRepositoryImpl(
         runBlocking {
             watchersDataSource.getWatchers().forEach { watcher ->
 
-                runCatching { backendApiService.getConversion(watcher.base) }
+                runCatching { backendApiService.getConversion(watcher.source) }
                     .onSuccess {
                         it.getRateFromCode(watcher.target)?.let { rate ->
                             when {
diff --git a/ios/repository/background/src/commonTest/kotlin/com/oztechan/ccc/ios/repository/background/BackgroundRepositoryTest.kt b/ios/repository/background/src/commonTest/kotlin/com/oztechan/ccc/ios/repository/background/BackgroundRepositoryTest.kt
index d50757aecb..ee50be2b00 100644
--- a/ios/repository/background/src/commonTest/kotlin/com/oztechan/ccc/ios/repository/background/BackgroundRepositoryTest.kt
+++ b/ios/repository/background/src/commonTest/kotlin/com/oztechan/ccc/ios/repository/background/BackgroundRepositoryTest.kt
@@ -49,14 +49,14 @@ internal class BackgroundRepositoryTest {
         everySuspend { watcherDataSource.getWatchers() }
             .returns(listOf(watcher))
 
-        everySuspend { backendApiService.getConversion(watcher.base) }
+        everySuspend { backendApiService.getConversion(watcher.source) }
             .throws(Exception())
 
         assertFalse { subject.shouldSendNotification() }
 
         verifySuspend { watcherDataSource.getWatchers() }
 
-        verifySuspend { backendApiService.getConversion(watcher.base) }
+        verifySuspend { backendApiService.getConversion(watcher.source) }
     }
 
     @Test
@@ -66,14 +66,14 @@ internal class BackgroundRepositoryTest {
         everySuspend { watcherDataSource.getWatchers() }
             .returns(listOf(watcher))
 
-        everySuspend { backendApiService.getConversion(watcher.base) }
-            .returns(Conversion(base = watcher.base, usd = watcher.rate + 1))
+        everySuspend { backendApiService.getConversion(watcher.source) }
+            .returns(Conversion(base = watcher.source, usd = watcher.rate + 1))
 
         assertTrue { subject.shouldSendNotification() }
 
         verifySuspend { watcherDataSource.getWatchers() }
 
-        verifySuspend { backendApiService.getConversion(watcher.base) }
+        verifySuspend { backendApiService.getConversion(watcher.source) }
     }
 
     @Test
@@ -84,13 +84,13 @@ internal class BackgroundRepositoryTest {
             everySuspend { watcherDataSource.getWatchers() }
                 .returns(listOf(watcher))
 
-            everySuspend { backendApiService.getConversion(watcher.base) }
-                .returns(Conversion(base = watcher.base, usd = watcher.rate - 1))
+            everySuspend { backendApiService.getConversion(watcher.source) }
+                .returns(Conversion(base = watcher.source, usd = watcher.rate - 1))
 
             assertTrue { subject.shouldSendNotification() }
 
             verifySuspend { watcherDataSource.getWatchers() }
 
-            verifySuspend { backendApiService.getConversion(watcher.base) }
+            verifySuspend { backendApiService.getConversion(watcher.source) }
         }
 }
diff --git a/renovate.json b/renovate.json
index d912f27270..3905c4e7ae 100644
--- a/renovate.json
+++ b/renovate.json
@@ -21,9 +21,8 @@
   "packageRules": [
     {
       "matchPackagePatterns": [
-        "^org.jetbrains.kotlin:kotlin",
+        "^org.jetbrains.kotlin",
         "^com.google.devtools.ksp",
-        "^androidx.compose.compiler",
         "^org.jetbrains.compose"
       ],
       "groupName": "kotlin"
diff --git a/submodule/basemob b/submodule/basemob
index 0e49a1bc58..65b1d34931 160000
--- a/submodule/basemob
+++ b/submodule/basemob
@@ -1 +1 @@
-Subproject commit 0e49a1bc58e4fa711706a97e1efd9a4aaa81af89
+Subproject commit 65b1d349314a915fff9339f7b1db8f22dce05085
diff --git a/submodule/logmob b/submodule/logmob
index 744a46a3de..b2752881a3 160000
--- a/submodule/logmob
+++ b/submodule/logmob
@@ -1 +1 @@
-Subproject commit 744a46a3deeced69b06ad763499fb5d58347bfe3
+Subproject commit b2752881a37579ccc3f485cdc201f89bb1365687
diff --git a/submodule/parsermob b/submodule/parsermob
index afd024cccc..fac0b21ccd 160000
--- a/submodule/parsermob
+++ b/submodule/parsermob
@@ -1 +1 @@
-Subproject commit afd024ccccb75d7d8bd6b367791034b16f631e81
+Subproject commit fac0b21ccd25bdc4d61393b4c65cb4e151236516
diff --git a/submodule/scopemob b/submodule/scopemob
index 3591e8bd7a..34b38ad5a6 160000
--- a/submodule/scopemob
+++ b/submodule/scopemob
@@ -1 +1 @@
-Subproject commit 3591e8bd7a2529dfe56763c387ff310364f48511
+Subproject commit 34b38ad5a6de4018f1713e472c8dd185c145b83b