diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 53cf6be9..d74472a5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -154,7 +154,7 @@ jobs:
           gpg -d --passphrase "${{ secrets.KEY_STORE_PASSWORD }}" --batch release.keystore.asc > release.keystore
 
       - name: Generate Release Bundle
-        run: ./gradlew bundleRelease
+        run: ./gradlew bundleProductionRelease
         env:
           SIGNING_KEY_ALIAS: ${{ secrets.ALIAS }}
           SIGNING_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
@@ -164,13 +164,13 @@ jobs:
         uses: actions/upload-artifact@master
         with:
           name: bundle
-          path: app/build/outputs/bundle/release/app-release.aab
+          path: app/build/outputs/bundle/productionRelease/app-production-release.aab
 
       - name: Upload mapping.txt
         uses: actions/upload-artifact@master
         with:
           name: mapping.txt
-          path: app/build/outputs/mapping/release/mapping.txt
+          path: app/build/outputs/mapping/productionRelease/mapping.txt
 
   deploy-play-store:
     needs: [ build ]
diff --git a/.gitignore b/.gitignore
index de9dafac..32c6d91a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,19 +42,7 @@ proguard/
 captures/
 
 # IntelliJ
-*.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-.idea/jarRepositories.xml
-# Android Studio 3 in .gitignore file.
-.idea/caches
-.idea/modules.xml
-# Comment next line if keeping position of elements in Navigation Editor is relevant for you
-.idea/navEditor.xml
+.idea/
 
 # Keystore files
 *.jks
diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
index de4e3f0f..7c444f41 100644
--- a/.idea/androidTestResultsUserPreferences.xml
+++ b/.idea/androidTestResultsUserPreferences.xml
@@ -16,6 +16,19 @@
             </AndroidTestResultsTableState>
           </value>
         </entry>
+        <entry key="-506303101">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Pixel_7_Pro_API_34" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
         <entry key="110657887">
           <value>
             <AndroidTestResultsTableState>
@@ -108,6 +121,19 @@
             </AndroidTestResultsTableState>
           </value>
         </entry>
+        <entry key="1609278631">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Nexus_5X_API_32" value="120" />
+                  <entry key="Tests" value="360" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
         <entry key="1628745879">
           <value>
             <AndroidTestResultsTableState>
@@ -127,6 +153,7 @@
               <option name="preferredColumnWidths">
                 <map>
                   <entry key="Duration" value="90" />
+                  <entry key="Pixel_7_Pro_API_34" value="120" />
                   <entry key="Resizable_API_33" value="120" />
                   <entry key="Tests" value="360" />
                 </map>
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 47c03a9e..bc51078b 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -2,6 +2,9 @@
 <project version="4">
   <component name="deploymentTargetDropDown">
     <value>
+      <entry key="ClearableChipTest">
+        <State />
+      </entry>
       <entry key="app">
         <State>
           <targetSelectedWithDropDown>
@@ -15,7 +18,7 @@
               </deviceKey>
             </Target>
           </targetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2023-10-13T16:07:10.127641Z" />
+          <timeTargetWasSelectedWithDropDown value="2023-10-15T19:01:19.243197Z" />
         </State>
       </entry>
     </value>
diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
new file mode 100644
index 00000000..26da98e5
--- /dev/null
+++ b/.idea/kotlinScripting.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinScriptingSettings">
+    <scriptDefinition className="org.jetbrains.kotlin.scripting.resolve.KotlinScriptDefinitionFromAnnotatedTemplate" definitionName="KotlinBuildScript">
+      <order>2147483647</order>
+    </scriptDefinition>
+  </component>
+</project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 330ca749..92f59c21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,40 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased] 
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [2.2.0] 2023-10-23
+
+### Added
+- Add ability to order task dragging the cards on the agenda screen
+- Add themed icon
+- Add custom logger
+- Configure build variants to differentiate between develop and production
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+- Fix change due date when postponing a task
+- Fix calendar expanded localization. Previously the week days were not localized at all and the month needed to recompose to show the proper translation. Now the whole calendar is reactive and recomposes as soon as the language gets changed via the system settings
+
+### Security
+
 ## [2.1.0] 2023-10-19
 
 ### Added
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1b61441c..8bc62ee8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.costular.atomtasks.Versioning
+
 plugins {
     id("atomtasks.android.application")
     kotlin("kapt")
@@ -15,8 +17,8 @@ android {
 
     defaultConfig {
         applicationId = "com.costular.atomtasks"
-        versionCode = 11
-        versionName = "2.1.0"
+        versionCode = Versioning.VersionCode
+        versionName = Versioning.VersionName
         testInstrumentationRunner = "com.costular.atomtasks.core.testing.AtomTestRunner"
 
         javaCompileOptions {
@@ -36,8 +38,18 @@ android {
         }
     }
 
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
+
     signingConfigs {
-        create("release") {
+        create("production") {
             storeFile = rootProject.file("release.keystore")
             storePassword = System.getenv("SIGNING_STORE_PASSWORD")
             keyAlias = System.getenv("SIGNING_KEY_ALIAS")
@@ -46,26 +58,8 @@ android {
     }
 
     buildTypes {
-        getByName("release") {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
-            signingConfig = signingConfigs.getByName("release")
-        }
-        getByName("debug") {
-            isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
-        }
-    }
-
-    packagingOptions {
-        resources.excludes.add("META-INF/licenses/**")
-        resources.excludes.add("META-INF/AL2.0")
-        resources.excludes.add("META-INF/LGPL2.1")
-    }
-
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
+        release {
+            signingConfig = signingConfigs.getByName("production")
         }
     }
 }
@@ -84,6 +78,7 @@ dependencies {
     implementation(project(":core:ui"))
     implementation(project(":core:designsystem"))
     implementation(projects.core.notifications)
+    implementation(projects.core.logging)
     implementation(project(":data"))
     implementation(project(":feature:agenda"))
     implementation(project(":feature:createtask"))
@@ -103,7 +98,6 @@ dependencies {
     implementation(libs.appcompat)
     implementation(libs.lifecycle.compose)
     implementation(libs.viewmodel)
-    implementation(libs.timber)
     implementation(libs.hilt)
     kapt(libs.hilt.compiler)
     implementation(libs.hilt.work)
diff --git a/app/config/detekt/detekt.yml b/app/config/detekt/detekt.yml
index 29ff4c08..041bb849 100644
--- a/app/config/detekt/detekt.yml
+++ b/app/config/detekt/detekt.yml
@@ -740,7 +740,7 @@ style:
   UnusedPrivateMember:
     active: true
     allowedNames: ''
-    ignoreAnnotated: ['Preview']
+    ignoreAnnotated: ['Preview', 'VariantsPreview', 'LargeFontPreview', 'DarkPreview']
   UnusedPrivateProperty:
     active: true
     allowedNames: '_|ignored|expected|serialVersionUID'
diff --git a/app/src/debug/kotlin/com/costular/atomtasks/Logger.kt b/app/src/debug/kotlin/com/costular/atomtasks/Logger.kt
deleted file mode 100644
index 358d07f3..00000000
--- a/app/src/debug/kotlin/com/costular/atomtasks/Logger.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.costular.atomtasks
-
-import android.content.Context
-import timber.log.Timber
-
-object Logger {
-    fun invoke(context: Context) {
-        Timber.plant(Timber.DebugTree())
-    }
-}
diff --git a/app/src/development/res/drawable/ic_launcher_background.xml b/app/src/development/res/drawable/ic_launcher_background.xml
new file mode 100644
index 00000000..ca3826a4
--- /dev/null
+++ b/app/src/development/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+</vector>
diff --git a/app/src/development/res/drawable/ic_launcher_foreground.xml b/app/src/development/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 00000000..a08ad67c
--- /dev/null
+++ b/app/src/development/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#000000">
+  <group android:scaleX="0.58"
+      android:scaleY="0.58"
+      android:translateX="5.04"
+      android:translateY="5.04">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM7.68,14.98H6V9h1.71c1.28,0 1.71,1.03 1.71,1.71l0,2.56C9.42,13.95 9,14.98 7.68,14.98zM12.38,11.46v1.07h-1.18v1.39h1.93v1.07h-2.25c-0.4,0.01 -0.74,-0.31 -0.75,-0.71V9.75c-0.01,-0.4 0.31,-0.74 0.71,-0.75h2.28l0,1.07h-1.92v1.39H12.38zM16.88,14.23c-0.48,1.11 -1.33,0.89 -1.71,0L13.77,9h1.18l1.07,4.11L17.09,9h1.18L16.88,14.23z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7.77,10.12H7.14v3.77h0.63c0.14,0 0.28,-0.05 0.42,-0.16c0.14,-0.1 0.21,-0.26 0.21,-0.47v-2.52c0,-0.21 -0.07,-0.37 -0.21,-0.47C8.05,10.17 7.91,10.12 7.77,10.12z"/>
+  </group>
+</vector>
diff --git a/app/src/development/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/development/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000..7353dbd1
--- /dev/null
+++ b/app/src/development/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/development/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/development/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..7353dbd1
--- /dev/null
+++ b/app/src/development/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/development/res/mipmap-hdpi/ic_launcher.webp b/app/src/development/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 00000000..58a8dc46
Binary files /dev/null and b/app/src/development/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/app/src/development/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/development/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..46b6dee4
Binary files /dev/null and b/app/src/development/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/app/src/development/res/mipmap-mdpi/ic_launcher.webp b/app/src/development/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 00000000..65e4610c
Binary files /dev/null and b/app/src/development/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/app/src/development/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/development/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..c73c3dd0
Binary files /dev/null and b/app/src/development/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/app/src/development/res/mipmap-xhdpi/ic_launcher.webp b/app/src/development/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 00000000..a40daae8
Binary files /dev/null and b/app/src/development/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/app/src/development/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/development/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..d9d9d819
Binary files /dev/null and b/app/src/development/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/app/src/development/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/development/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 00000000..24c36c0b
Binary files /dev/null and b/app/src/development/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/app/src/development/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/development/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..1d1f28ec
Binary files /dev/null and b/app/src/development/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/app/src/development/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/development/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 00000000..7a11f2fa
Binary files /dev/null and b/app/src/development/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/app/src/development/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/development/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 00000000..ef87f000
Binary files /dev/null and b/app/src/development/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/app/src/development/res/values/ic_launcher_background.xml b/app/src/development/res/values/ic_launcher_background.xml
new file mode 100644
index 00000000..580410bc
--- /dev/null
+++ b/app/src/development/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FCE99E</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/java/com/costular/atomtasks/ui/AtomTasksApp.kt b/app/src/main/java/com/costular/atomtasks/ui/AtomTasksApp.kt
index 0bf3b77b..b4e8b3a2 100644
--- a/app/src/main/java/com/costular/atomtasks/ui/AtomTasksApp.kt
+++ b/app/src/main/java/com/costular/atomtasks/ui/AtomTasksApp.kt
@@ -4,8 +4,13 @@ import android.app.Application
 import android.util.Log
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
-import com.costular.atomtasks.Logger
+import com.costular.atomtasks.BuildConfig
+import com.costular.atomtasks.core.logging.AtomLogger
+import com.costular.atomtasks.core.logging.FirebaseAtomLogger
+import com.costular.atomtasks.core.logging.LogcatAtomLogger
 import com.costular.atomtasks.tasks.manager.AutoforwardManager
+import com.google.firebase.crashlytics.ktx.crashlytics
+import com.google.firebase.ktx.Firebase
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
 
@@ -24,7 +29,17 @@ class AtomTasksApp : Application(), Configuration.Provider {
     }
 
     private fun init() {
-        Logger.invoke(this)
+        initLogger()
+    }
+
+    private fun initLogger() {
+        val logger = if (BuildConfig.DEBUG) {
+            LogcatAtomLogger()
+        } else {
+            FirebaseAtomLogger(Firebase.crashlytics)
+        }
+
+        AtomLogger.initialize(logger)
     }
 
     override fun getWorkManagerConfiguration() =
diff --git a/core/ui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 79%
rename from core/ui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 8ae0e296..1e48b4cc 100644
--- a/core/ui/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@mipmap/ic_launcher_background" />
     <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>
diff --git a/core/ui/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/core/ui/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-hdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_background.png
diff --git a/core/ui/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/core/ui/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/core/ui/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-mdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_background.png
diff --git a/core/ui/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/core/ui/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-xhdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
diff --git a/core/ui/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
diff --git a/core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
diff --git a/core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from core/ui/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/app/src/release/kotlin/com/costular/atomtasks/Logger.kt b/app/src/release/kotlin/com/costular/atomtasks/Logger.kt
deleted file mode 100644
index 25e8ef23..00000000
--- a/app/src/release/kotlin/com/costular/atomtasks/Logger.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.costular.atomtasks
-
-import android.content.Context
-
-object Logger {
-    fun invoke(context: Context) {
-        // Release should not log anything :)
-    }
-}
diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
index ec3f318b..50cf2bf6 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt
@@ -1,5 +1,7 @@
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import com.costular.atomtasks.configureAndroidCompose
+import com.costular.atomtasks.configureBuildTypes
+import com.costular.atomtasks.configureFlavors
 import com.costular.atomtasks.configureKotlinAndroid
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -15,6 +17,8 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
 
             extensions.configure<BaseAppModuleExtension> {
                 configureKotlinAndroid(this)
+                configureFlavors(this)
+                configureBuildTypes(this)
                 configureAndroidCompose(this)
                 defaultConfig.targetSdk = 34
             }
diff --git a/build-logic/convention/src/main/kotlin/com/costular/atomtasks/BuildVariants.kt b/build-logic/convention/src/main/kotlin/com/costular/atomtasks/BuildVariants.kt
new file mode 100644
index 00000000..48989cfe
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/costular/atomtasks/BuildVariants.kt
@@ -0,0 +1,58 @@
+package com.costular.atomtasks
+
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.ApplicationProductFlavor
+import com.android.build.api.dsl.CommonExtension
+import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
+
+enum class FlavorDimension(
+    val naming: String
+) {
+    Environment("environment")
+}
+
+enum class Flavor(
+    val naming: String,
+    val dimension: FlavorDimension,
+    val applicationIdSuffix: String? = null,
+) {
+    Development("development", FlavorDimension.Environment, applicationIdSuffix = ".dev"),
+    Production("production", FlavorDimension.Environment)
+}
+
+fun configureFlavors(commonExtensions: CommonExtension<*, *, *, *, *>) {
+    commonExtensions.apply {
+        flavorDimensions += FlavorDimension.Environment.naming
+        productFlavors {
+            Flavor.values().forEach { flavor ->
+                create(flavor.naming) {
+                    dimension = flavor.dimension.naming
+                    if (this@apply is ApplicationExtension && this is ApplicationProductFlavor) {
+                        flavor.applicationIdSuffix?.let {
+                            applicationIdSuffix = it
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+fun configureBuildTypes(baseAppModuleExtension: BaseAppModuleExtension) {
+    with (baseAppModuleExtension) {
+        buildTypes {
+            getByName("release") {
+                isDebuggable = false
+                isMinifyEnabled = true
+                isShrinkResources = true
+                proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            }
+            getByName("debug") {
+                isDebuggable = true
+                isMinifyEnabled = false
+                isShrinkResources = false
+                proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            }
+        }
+    }
+}
diff --git a/build-logic/convention/src/main/kotlin/com/costular/atomtasks/Versioning.kt b/build-logic/convention/src/main/kotlin/com/costular/atomtasks/Versioning.kt
new file mode 100644
index 00000000..c33e82e3
--- /dev/null
+++ b/build-logic/convention/src/main/kotlin/com/costular/atomtasks/Versioning.kt
@@ -0,0 +1,6 @@
+package com.costular.atomtasks
+
+object Versioning {
+    const val VersionCode = 12
+    const val VersionName = "2.2.0"
+}
diff --git a/common/tasks/build.gradle.kts b/common/tasks/build.gradle.kts
index f214516b..1383b4bf 100644
--- a/common/tasks/build.gradle.kts
+++ b/common/tasks/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
     implementation(projects.core.analytics)
     implementation(projects.data)
     implementation(projects.core.notifications)
+    implementation(projects.core.logging)
 
     implementation(libs.compose.activity)
     implementation(libs.compose.foundation)
@@ -38,11 +39,11 @@ dependencies {
     implementation(libs.hilt.navigation.compose)
     implementation(libs.hilt.work)
     implementation(libs.work)
-    implementation(libs.timber)
     implementation(libs.compose.destinations)
     implementation(libs.accompanist.permissions)
     kapt(libs.hilt.ext.compiler)
     api(libs.reordeable)
+    implementation(libs.balloon)
 
     testImplementation(projects.common.tasks)
     testImplementation(projects.core.testing)
diff --git a/common/tasks/src/main/java/com/costular/atomtasks/tasks/interactor/PostponeTaskUseCase.kt b/common/tasks/src/main/java/com/costular/atomtasks/tasks/interactor/PostponeTaskUseCase.kt
index 8fef9c2a..4a53b6d8 100644
--- a/common/tasks/src/main/java/com/costular/atomtasks/tasks/interactor/PostponeTaskUseCase.kt
+++ b/common/tasks/src/main/java/com/costular/atomtasks/tasks/interactor/PostponeTaskUseCase.kt
@@ -1,5 +1,6 @@
 package com.costular.atomtasks.tasks.interactor
 
+import com.costular.atomtasks.core.logging.atomLog
 import com.costular.atomtasks.tasks.manager.TaskReminderManager
 import com.costular.core.Either
 import com.costular.core.toError
@@ -14,6 +15,7 @@ class PostponeTaskUseCase @Inject constructor(
     private val getTaskByIdInteractor: GetTaskByIdInteractor,
     private val updateTaskReminderInteractor: UpdateTaskReminderInteractor,
     private val taskReminderManager: TaskReminderManager,
+    private val updateTaskUseCase: UpdateTaskUseCase,
 ) : UseCase<PostponeTaskUseCase.Params, Either<PostponeTaskFailure, Unit>> {
 
     data class Params(
@@ -32,6 +34,14 @@ class PostponeTaskUseCase @Inject constructor(
                 return PostponeTaskFailure.MissingReminder.toError()
             }
 
+            updateTaskUseCase.invoke(
+                UpdateTaskUseCase.Params(
+                    taskId = task.id,
+                    name = task.name,
+                    date = params.day,
+                    reminderTime = params.time,
+                )
+            )
             updateTaskReminderInteractor(
                 UpdateTaskReminderInteractor.Params(
                     taskId = params.taskId,
@@ -39,12 +49,14 @@ class PostponeTaskUseCase @Inject constructor(
                     date = params.day,
                 ),
             )
+
             taskReminderManager.set(
                 taskId = task.id,
                 localDateTime = params.day.atTime(params.time)
             )
             Unit.toResult()
         } catch (e: Exception) {
+            atomLog { e }
             PostponeTaskFailure.Unknown.toError()
         }
     }
diff --git a/common/tasks/src/main/java/com/costular/atomtasks/tasks/model/TaskList.kt b/common/tasks/src/main/java/com/costular/atomtasks/tasks/model/TaskList.kt
index 80c6c5ed..8b9e921b 100644
--- a/common/tasks/src/main/java/com/costular/atomtasks/tasks/model/TaskList.kt
+++ b/common/tasks/src/main/java/com/costular/atomtasks/tasks/model/TaskList.kt
@@ -13,8 +13,10 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -23,11 +25,23 @@ import com.costular.atomtasks.core.ui.R
 import com.costular.atomtasks.core.ui.utils.VariantsPreview
 import com.costular.designsystem.theme.AppTheme
 import com.costular.designsystem.theme.AtomTheme
+import com.skydoves.balloon.ArrowOrientation
+import com.skydoves.balloon.Balloon
+import com.skydoves.balloon.BalloonAnimation
+import com.skydoves.balloon.BalloonSizeSpec
+import com.skydoves.balloon.compose.Balloon
+import com.skydoves.balloon.compose.rememberBalloonBuilder
+import com.skydoves.balloon.compose.setArrowColor
+import com.skydoves.balloon.compose.setBackgroundColor
+import com.skydoves.balloon.compose.setTextColor
 import java.time.LocalDate
 import java.time.LocalTime
+import kotlinx.coroutines.delay
 import org.burnoutcrew.reorderable.ReorderableItem
 import org.burnoutcrew.reorderable.ReorderableLazyListState
+import org.burnoutcrew.reorderable.detectReorderAfterLongPress
 import org.burnoutcrew.reorderable.rememberReorderableLazyListState
+import org.burnoutcrew.reorderable.reorderable
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -36,35 +50,90 @@ fun TaskList(
     onClick: (Task) -> Unit,
     onMarkTask: (taskId: Long, isDone: Boolean) -> Unit,
     state: ReorderableLazyListState,
+    shouldShowTaskOrderTutorial: Boolean,
+    onDismissTaskOrderTutorial: () -> Unit,
     modifier: Modifier = Modifier,
     padding: PaddingValues = PaddingValues(0.dp),
 ) {
     if (tasks.isEmpty()) {
         Empty(modifier.padding(AppTheme.dimens.contentMargin))
     } else {
-        LazyColumn(
-            modifier = modifier,
-            state = state.listState,
-            contentPadding = padding,
-            verticalArrangement = Arrangement.spacedBy(8.dp),
-        ) {
-            items(tasks, { it.id }) { task ->
-                ReorderableItem(state, key = task.id) { isDragging ->
-                    TaskCard(
-                        title = task.name,
-                        onMark = { onMarkTask(task.id, !task.isDone) },
-                        onOpen = { onClick(task) },
-                        reminder = task.reminder,
-                        isFinished = task.isDone,
-                        modifier = Modifier.fillMaxWidth().animateItemPlacement(),
-                        isBeingDragged = isDragging,
-                    )
+        val backgroundColor = MaterialTheme.colorScheme.inverseSurface
+        val textColor = MaterialTheme.colorScheme.inverseOnSurface
+
+        val builder = rememberBuilder(backgroundColor, textColor, onDismissTaskOrderTutorial)
+
+        Balloon(
+            builder = builder,
+            balloonContent = {
+                Text(
+                    text = stringResource(R.string.agenda_tutorial_task_order),
+                    style = MaterialTheme.typography.bodySmall,
+                    color = textColor,
+                )
+            },
+        ) { balloonWindow ->
+            LaunchedEffect(shouldShowTaskOrderTutorial) {
+                if (shouldShowTaskOrderTutorial) {
+                    delay(TooltipDelay)
+                    balloonWindow.showAlignTop(yOff = TooltipYOffset)
+                } else {
+                    balloonWindow.dismiss()
+                }
+            }
+
+            LazyColumn(
+                modifier = modifier
+                    .reorderable(state)
+                    .detectReorderAfterLongPress(state),
+                state = state.listState,
+                contentPadding = padding,
+                verticalArrangement = Arrangement.spacedBy(TooltipPadding.dp),
+            ) {
+                items(tasks, { it.id }) { task ->
+                    ReorderableItem(state, key = task.id) { isDragging ->
+                        TaskCard(
+                            title = task.name,
+                            onMark = { onMarkTask(task.id, !task.isDone) },
+                            onOpen = { onClick(task) },
+                            reminder = task.reminder,
+                            isFinished = task.isDone,
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .animateItemPlacement(),
+                            isBeingDragged = isDragging,
+                        )
+                    }
                 }
             }
         }
     }
 }
 
+@Composable
+private fun rememberBuilder(
+    backgroundColor: Color,
+    textColor: Color,
+    onDismissTaskOrderTutorial: () -> Unit
+): Balloon.Builder {
+    val builder = rememberBalloonBuilder {
+        setCornerRadius(TooltipCornerRadius)
+        setBalloonAnimation(BalloonAnimation.FADE)
+        setBackgroundColor(backgroundColor)
+        setArrowColor(backgroundColor)
+        setTextColor(textColor)
+        setPadding(TooltipPadding)
+        setArrowOrientation(ArrowOrientation.BOTTOM)
+        setHeight(BalloonSizeSpec.WRAP)
+        setWidth(BalloonSizeSpec.WRAP)
+        setMarginHorizontal(TooltipHorizontalMargin)
+        setOnBalloonDismissListener {
+            onDismissTaskOrderTutorial()
+        }
+    }
+    return builder
+}
+
 @Composable
 fun Empty(
     modifier: Modifier = Modifier,
@@ -145,6 +214,14 @@ private fun TaskListPreview() {
             ),
             onClick = {},
             onMarkTask = { _, _ -> },
+            shouldShowTaskOrderTutorial = false,
+            onDismissTaskOrderTutorial = {},
         )
     }
 }
+
+private const val TooltipCornerRadius = 4f
+private const val TooltipHorizontalMargin = 24
+private const val TooltipDelay = 2000L
+private const val TooltipYOffset = 48
+private const val TooltipPadding = 8
diff --git a/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/AutoforwardTasksWorker.kt b/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/AutoforwardTasksWorker.kt
index 10b82238..9f7dbfd1 100644
--- a/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/AutoforwardTasksWorker.kt
+++ b/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/AutoforwardTasksWorker.kt
@@ -6,6 +6,7 @@ import androidx.work.CoroutineWorker
 import androidx.work.PeriodicWorkRequest
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkerParameters
+import com.costular.atomtasks.core.logging.atomLog
 import com.costular.atomtasks.tasks.interactor.AutoforwardTasksUseCase
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
@@ -25,6 +26,7 @@ class AutoforwardTasksWorker @AssistedInject constructor(
             autoforwardTasksUseCase(AutoforwardTasksUseCase.Params(LocalDate.now()))
             Result.success()
         } catch (e: Exception) {
+            atomLog { e }
             Result.failure()
         }
     }
diff --git a/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/MarkTaskAsDoneWorker.kt b/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/MarkTaskAsDoneWorker.kt
index ea09f7d6..fffefb95 100644
--- a/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/MarkTaskAsDoneWorker.kt
+++ b/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/MarkTaskAsDoneWorker.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import androidx.hilt.work.HiltWorker
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
+import com.costular.atomtasks.core.logging.atomLog
 import com.costular.atomtasks.notifications.TaskNotificationManager
 import com.costular.atomtasks.tasks.interactor.UpdateTaskIsDoneInteractor
 import dagger.assisted.Assisted
@@ -36,6 +37,7 @@ class MarkTaskAsDoneWorker @AssistedInject constructor(
 
             Result.success()
         } catch (e: Exception) {
+            atomLog { e }
             Result.failure()
         }
     }
diff --git a/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/NotifyTaskWorker.kt b/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/NotifyTaskWorker.kt
index 06950e53..72b63941 100644
--- a/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/NotifyTaskWorker.kt
+++ b/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/NotifyTaskWorker.kt
@@ -4,12 +4,12 @@ import android.content.Context
 import androidx.hilt.work.HiltWorker
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
+import com.costular.atomtasks.core.logging.atomLog
 import com.costular.atomtasks.notifications.TaskNotificationManager
 import com.costular.atomtasks.tasks.interactor.GetTaskByIdInteractor
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.flow.first
-import timber.log.Timber
 
 @Suppress("TooGenericExceptionCaught", "SwallowedException")
 @HiltWorker
@@ -48,7 +48,7 @@ class NotifyTaskWorker @AssistedInject constructor(
             taskNotificationManager.remindTask(task.id, task.name)
             Result.success()
         } catch (e: Exception) {
-            Timber.e(e)
+            atomLog { e }
             Result.failure()
         }
     }
diff --git a/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/SetTasksRemindersWorker.kt b/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/SetTasksRemindersWorker.kt
index 41458c70..002a077e 100644
--- a/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/SetTasksRemindersWorker.kt
+++ b/common/tasks/src/main/java/com/costular/atomtasks/tasks/worker/SetTasksRemindersWorker.kt
@@ -5,6 +5,7 @@ import androidx.hilt.work.HiltWorker
 import androidx.work.CoroutineWorker
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkerParameters
+import com.costular.atomtasks.core.logging.atomLog
 import com.costular.atomtasks.tasks.interactor.GetTasksWithReminderInteractor
 import com.costular.atomtasks.tasks.manager.TaskReminderManager
 import dagger.assisted.Assisted
@@ -29,6 +30,7 @@ class SetTasksRemindersWorker @AssistedInject constructor(
             }
             Result.success()
         } catch (e: Exception) {
+            atomLog { e }
             Result.failure()
         }
 
diff --git a/common/tasks/src/test/java/com/costular/atomtasks/tasks/interactor/PostponeTaskUseCaseTest.kt b/common/tasks/src/test/java/com/costular/atomtasks/tasks/interactor/PostponeTaskUseCaseTest.kt
index 083ec71b..fe07b3da 100644
--- a/common/tasks/src/test/java/com/costular/atomtasks/tasks/interactor/PostponeTaskUseCaseTest.kt
+++ b/common/tasks/src/test/java/com/costular/atomtasks/tasks/interactor/PostponeTaskUseCaseTest.kt
@@ -1,8 +1,8 @@
 package com.costular.atomtasks.tasks.interactor
 
+import com.costular.atomtasks.tasks.manager.TaskReminderManager
 import com.costular.atomtasks.tasks.model.Reminder
 import com.costular.atomtasks.tasks.model.Task
-import com.costular.atomtasks.tasks.manager.TaskReminderManager
 import com.costular.core.toError
 import com.google.common.truth.Truth
 import io.mockk.coEvery
@@ -22,6 +22,7 @@ class PostponeTaskUseCaseTest {
     private val getTaskByIdInteractor: GetTaskByIdInteractor = mockk(relaxed = true)
     private val updateTaskReminderInteractor: UpdateTaskReminderInteractor = mockk(relaxed = true)
     private val taskReminderManager: TaskReminderManager = mockk(relaxed = true)
+    private val updateTaskUseCase: UpdateTaskUseCase = mockk(relaxed = true)
 
     @Before
     fun setUp() {
@@ -29,6 +30,7 @@ class PostponeTaskUseCaseTest {
             getTaskByIdInteractor = getTaskByIdInteractor,
             updateTaskReminderInteractor = updateTaskReminderInteractor,
             taskReminderManager = taskReminderManager,
+            updateTaskUseCase = updateTaskUseCase,
         )
     }
 
@@ -98,6 +100,34 @@ class PostponeTaskUseCaseTest {
         }
     }
 
+    @Test
+    fun `Should update task due date when postpone a task`() = runTest {
+        givenTaskWithReminder()
+
+        val taskId = 1L
+        val day = LocalDate.now().plusDays(1)
+        val time = LocalTime.of(21, 0)
+
+        sut.invoke(
+            PostponeTaskUseCase.Params(
+                taskId = taskId,
+                day = day,
+                time = time,
+            )
+        )
+
+        coEvery {
+            updateTaskUseCase.invoke(
+                UpdateTaskUseCase.Params(
+                    taskId = taskId,
+                    name = "Whatever",
+                    date = day,
+                    reminderTime = time
+                )
+            )
+        }
+    }
+
     private fun givenTaskWithoutReminder() {
         every { getTaskByIdInteractor.flow } returns flowOf(
             Task(
diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
index 2609f9d7..a1232331 100644
--- a/core/designsystem/build.gradle.kts
+++ b/core/designsystem/build.gradle.kts
@@ -44,8 +44,8 @@ dependencies {
     testImplementation(libs.truth)
     testImplementation(libs.turbine)
     testImplementation(libs.mockk)
-
     testImplementation(projects.core.testing)
+
     androidTestImplementation(projects.core.testing)
     androidTestImplementation(libs.android.junit)
     androidTestImplementation(libs.coroutines.test)
diff --git a/core/designsystem/src/androidTest/java/com/costular/designsystem/components/ClearableChipTest.kt b/core/designsystem/src/androidTest/java/com/costular/designsystem/components/ClearableChipTest.kt
index 61f5e10f..500211eb 100644
--- a/core/designsystem/src/androidTest/java/com/costular/designsystem/components/ClearableChipTest.kt
+++ b/core/designsystem/src/androidTest/java/com/costular/designsystem/components/ClearableChipTest.kt
@@ -6,11 +6,11 @@ import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
+import com.costular.atomtasks.core.testing.interactions.callbackTester
+import com.costular.atomtasks.core.testing.interactions.shouldBeCalledOnce
 import com.costular.atomtasks.core.testing.ui.AndroidTest
 import com.costular.atomtasks.core.testing.ui.getString
 import dagger.hilt.android.testing.HiltAndroidTest
-import io.mockk.mockk
-import io.mockk.verify
 import org.junit.Test
 import com.costular.atomtasks.core.ui.R
 
@@ -60,7 +60,7 @@ class ClearableChipTest : AndroidTest() {
 
     @Test
     fun shouldCallCallback_whenClickClear_givenChipIsSelected() {
-        val callback: () -> Unit = mockk(relaxed = true)
+        val callback = callbackTester(Unit)
 
         composeTestRule.setContent {
             ClearableChip(
@@ -76,6 +76,6 @@ class ClearableChipTest : AndroidTest() {
         clearButton.assertIsDisplayed()
             .performClick()
 
-        verify { callback() }
+        callback.shouldBeCalledOnce()
     }
 }
diff --git a/core/designsystem/src/main/java/com/costular/designsystem/components/DatePicker.kt b/core/designsystem/src/main/java/com/costular/designsystem/components/DatePicker.kt
index 8691338d..647874d1 100644
--- a/core/designsystem/src/main/java/com/costular/designsystem/components/DatePicker.kt
+++ b/core/designsystem/src/main/java/com/costular/designsystem/components/DatePicker.kt
@@ -30,9 +30,12 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.costular.atomtasks.coreui.utils.ofLocalized
 import com.costular.core.util.DateTimeFormatters
 import com.costular.designsystem.theme.AppTheme
+import com.costular.designsystem.theme.AtomTheme
 import com.kizitonwose.calendar.compose.HorizontalCalendar
 import com.kizitonwose.calendar.compose.rememberCalendarState
 import com.kizitonwose.calendar.core.CalendarDay
@@ -43,7 +46,6 @@ import com.kizitonwose.calendar.core.yearMonth
 import java.time.LocalDate
 import java.time.YearMonth
 import java.time.format.TextStyle
-import java.util.Locale
 
 @Composable
 fun DatePicker(
@@ -85,7 +87,7 @@ private fun MonthHeader(
 ) {
     Column {
         MonthHeader(
-            month = DateTimeFormatters.monthFormatter.format(month.yearMonth),
+            month = month.yearMonth.ofLocalized(DateTimeFormatters.monthFormatter)
         )
 
         Spacer(Modifier.height(AppTheme.dimens.spacingLarge))
@@ -97,7 +99,7 @@ private fun MonthHeader(
                 CompositionLocalProvider(LocalContentColor provides mediumEmphasis) {
                     Text(
                         textAlign = TextAlign.Center,
-                        text = dayOfWeek.getDisplayName(TextStyle.SHORT, Locale.ROOT),
+                        text = dayOfWeek.ofLocalized(TextStyle.SHORT),
                         modifier = Modifier
                             .weight(1f)
                             .wrapContentHeight(),
@@ -166,3 +168,13 @@ fun MonthHeader(
         textAlign = TextAlign.Center,
     )
 }
+
+@Preview(showBackground = true)
+@Composable
+fun DatePickerPreview() {
+    AtomTheme {
+        DatePicker(
+            onDateSelected = {},
+        )
+    }
+}
diff --git a/core/designsystem/src/main/java/com/costular/designsystem/components/HorizontalCalendar.kt b/core/designsystem/src/main/java/com/costular/designsystem/components/HorizontalCalendar.kt
index 08f0dc88..98ae4903 100644
--- a/core/designsystem/src/main/java/com/costular/designsystem/components/HorizontalCalendar.kt
+++ b/core/designsystem/src/main/java/com/costular/designsystem/components/HorizontalCalendar.kt
@@ -22,6 +22,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.costular.atomtasks.coreui.date.Day
 import com.costular.atomtasks.coreui.date.asDay
+import com.costular.atomtasks.coreui.utils.ofLocalized
 import com.costular.core.util.DateTimeFormatters.shortDayOfWeekFormatter
 import com.costular.core.util.WeekUtil
 import com.costular.designsystem.theme.AtomTheme
@@ -56,7 +57,7 @@ private fun RowScope.CalendarDay(
     modifier: Modifier = Modifier,
 ) {
     val day = date.dayOfMonth
-    val weekDay = shortDayOfWeekFormatter.format(date.dayOfWeek)
+    val weekDay = shortDayOfWeekFormatter.ofLocalized(date.dayOfWeek)
 
     val cardColors = if (isSelected) {
         CardDefaults.outlinedCardColors(containerColor = MaterialTheme.colorScheme.primaryContainer)
diff --git a/core/logging/.gitignore b/core/logging/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/core/logging/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/logging/build.gradle.kts b/core/logging/build.gradle.kts
new file mode 100644
index 00000000..50c36b4e
--- /dev/null
+++ b/core/logging/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    id("atomtasks.android.library")
+    id("atomtasks.detekt")
+    id("kotlin-kapt")
+}
+
+android {
+    namespace = "com.costular.atomtasks.core.logger.firebase"
+}
+
+dependencies {
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.crashlytics)
+}
diff --git a/core/logging/consumer-rules.pro b/core/logging/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/core/logging/proguard-rules.pro b/core/logging/proguard-rules.pro
new file mode 100644
index 00000000..481bb434
--- /dev/null
+++ b/core/logging/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/core/logging/src/main/AndroidManifest.xml b/core/logging/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..8bdb7e14
--- /dev/null
+++ b/core/logging/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
diff --git a/core/logging/src/main/java/com/costular/atomtasks/core/logging/AtomLogger.kt b/core/logging/src/main/java/com/costular/atomtasks/core/logging/AtomLogger.kt
new file mode 100644
index 00000000..3989d410
--- /dev/null
+++ b/core/logging/src/main/java/com/costular/atomtasks/core/logging/AtomLogger.kt
@@ -0,0 +1,52 @@
+package com.costular.atomtasks.core.logging
+
+interface AtomLogger {
+    fun log(level: LogLevel, tag: String, text: String)
+    fun log(level: LogLevel, tag: String, exceptionParams: Map<String, Any?>, throwable: Throwable)
+
+    companion object {
+
+        @PublishedApi
+        internal var logger: AtomLogger = NoOpLogger
+
+        fun initialize(logger: AtomLogger) {
+            synchronized(this) {
+                this.logger = logger
+            }
+        }
+    }
+}
+
+inline fun Any.atomLog(
+    level: LogLevel? = null,
+    tag: String? = null,
+    exceptionParams: Map<String, Any?> = emptyMap(),
+    subject: () -> Any,
+) {
+    if (AtomLogger.logger != NoOpLogger) {
+        val tagOrCallingClass = tag ?: this::class.java.simpleName
+
+        when (val subjectValue = subject()) {
+            is Throwable -> AtomLogger.logger.log(
+                level ?: LogLevel.ERROR,
+                tagOrCallingClass,
+                exceptionParams,
+                subjectValue
+            )
+            else -> AtomLogger.logger.log(
+                level ?: LogLevel.DEBUG,
+                tagOrCallingClass,
+                subjectValue.toString()
+            )
+        }
+    }
+}
+
+inline fun atomLog(
+    level: LogLevel? = null,
+    tag: String? = null,
+    exceptionParams: Map<String, Any?> = emptyMap(),
+    subject: () -> Any,
+) {
+    AtomLogger.atomLog(level, tag ?: "", exceptionParams, subject)
+}
diff --git a/core/logging/src/main/java/com/costular/atomtasks/core/logging/FirebaseAtomLogger.kt b/core/logging/src/main/java/com/costular/atomtasks/core/logging/FirebaseAtomLogger.kt
new file mode 100644
index 00000000..d6119faf
--- /dev/null
+++ b/core/logging/src/main/java/com/costular/atomtasks/core/logging/FirebaseAtomLogger.kt
@@ -0,0 +1,26 @@
+package com.costular.atomtasks.core.logging
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+
+class FirebaseAtomLogger(
+    private val crashlytics: FirebaseCrashlytics
+) : AtomLogger {
+    override fun log(level: LogLevel, tag: String, text: String) {
+        crashlytics.log("${System.currentTimeMillis()} | [${level.name}] | $tag: $text")
+    }
+
+    override fun log(
+        level: LogLevel,
+        tag: String,
+        exceptionParams: Map<String, Any?>,
+        throwable: Throwable
+    ) {
+        crashlytics.apply {
+            val paramsFormed = exceptionParams.entries.joinToString("") {
+                "${it.key}=${it.value};"
+            }
+            setCustomKey("atom-logger", paramsFormed)
+            recordException(throwable)
+        }
+    }
+}
diff --git a/core/logging/src/main/java/com/costular/atomtasks/core/logging/LogLevel.kt b/core/logging/src/main/java/com/costular/atomtasks/core/logging/LogLevel.kt
new file mode 100644
index 00000000..ec844442
--- /dev/null
+++ b/core/logging/src/main/java/com/costular/atomtasks/core/logging/LogLevel.kt
@@ -0,0 +1,9 @@
+package com.costular.atomtasks.core.logging
+
+enum class LogLevel {
+    VERBOSE,
+    DEBUG,
+    INFO,
+    WARN,
+    ERROR,
+}
diff --git a/core/logging/src/main/java/com/costular/atomtasks/core/logging/LogcatAtomLogger.kt b/core/logging/src/main/java/com/costular/atomtasks/core/logging/LogcatAtomLogger.kt
new file mode 100644
index 00000000..62a15d75
--- /dev/null
+++ b/core/logging/src/main/java/com/costular/atomtasks/core/logging/LogcatAtomLogger.kt
@@ -0,0 +1,33 @@
+package com.costular.atomtasks.core.logging
+
+import android.util.Log
+
+class LogcatAtomLogger : AtomLogger {
+    override fun log(level: LogLevel, tag: String, text: String) {
+        Log.println(level.asLogcatLevel(), tag, text)
+    }
+
+    override fun log(
+        level: LogLevel,
+        tag: String,
+        exceptionParams: Map<String, Any?>,
+        throwable: Throwable
+    ) {
+        val androidLogLevel = level.asLogcatLevel()
+
+        Log.println(androidLogLevel, tag, throwable.stackTraceToString())
+
+        exceptionParams.forEach {
+            Log.println(androidLogLevel, tag, "${it.key} ==> ${it.value}")
+        }
+    }
+
+    private fun LogLevel.asLogcatLevel(): Int =
+        when (this) {
+            LogLevel.VERBOSE -> Log.VERBOSE
+            LogLevel.DEBUG -> Log.DEBUG
+            LogLevel.INFO -> Log.INFO
+            LogLevel.WARN -> Log.WARN
+            LogLevel.ERROR -> Log.ERROR
+        }
+}
diff --git a/core/logging/src/main/java/com/costular/atomtasks/core/logging/NoOpLogger.kt b/core/logging/src/main/java/com/costular/atomtasks/core/logging/NoOpLogger.kt
new file mode 100644
index 00000000..ce19a0e0
--- /dev/null
+++ b/core/logging/src/main/java/com/costular/atomtasks/core/logging/NoOpLogger.kt
@@ -0,0 +1,16 @@
+package com.costular.atomtasks.core.logging
+
+object NoOpLogger : AtomLogger {
+    @Suppress("EmptyFunctionBlock")
+    override fun log(level: LogLevel, tag: String, text: String) {
+    }
+
+    @Suppress("EmptyFunctionBlock")
+    override fun log(
+        level: LogLevel,
+        tag: String,
+        exceptionParams: Map<String, Any?>,
+        throwable: Throwable
+    ) {
+    }
+}
diff --git a/core/src/main/java/com/costular/core/util/DateTimeFormatters.kt b/core/src/main/java/com/costular/core/util/DateTimeFormatters.kt
index a52b27e2..052033ff 100644
--- a/core/src/main/java/com/costular/core/util/DateTimeFormatters.kt
+++ b/core/src/main/java/com/costular/core/util/DateTimeFormatters.kt
@@ -6,8 +6,7 @@ import java.time.format.FormatStyle
 import java.util.Locale
 
 object DateTimeFormatters {
-    val shortDayOfWeekFormatter =
-        DateTimeFormatter.ofPattern("EEEEE", Locale.getDefault())
+    val shortDayOfWeekFormatter = DateTimeFormatter.ofPattern("E")
     val dateFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)
     val monthFormatter = DateTimeFormatter.ofPattern("MMMM yyyy")
 
diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts
index 317661e5..697451c4 100644
--- a/core/testing/build.gradle.kts
+++ b/core/testing/build.gradle.kts
@@ -27,4 +27,6 @@ dependencies {
     implementation(libs.coroutines.test)
     implementation(libs.androidx.test)
     implementation(libs.compose.ui.test)
+
+    api(libs.truth)
 }
diff --git a/core/testing/src/main/java/com/costular/atomtasks/coretesting/AtomTestRunner.kt b/core/testing/src/main/java/com/costular/atomtasks/core/testing/AtomTestRunner.kt
similarity index 100%
rename from core/testing/src/main/java/com/costular/atomtasks/coretesting/AtomTestRunner.kt
rename to core/testing/src/main/java/com/costular/atomtasks/core/testing/AtomTestRunner.kt
diff --git a/core/testing/src/main/java/com/costular/atomtasks/coretesting/MainCoroutineRule.kt b/core/testing/src/main/java/com/costular/atomtasks/core/testing/MainCoroutineRule.kt
similarity index 100%
rename from core/testing/src/main/java/com/costular/atomtasks/coretesting/MainCoroutineRule.kt
rename to core/testing/src/main/java/com/costular/atomtasks/core/testing/MainCoroutineRule.kt
diff --git a/core/testing/src/main/java/com/costular/atomtasks/coretesting/MviViewModelTest.kt b/core/testing/src/main/java/com/costular/atomtasks/core/testing/MviViewModelTest.kt
similarity index 100%
rename from core/testing/src/main/java/com/costular/atomtasks/coretesting/MviViewModelTest.kt
rename to core/testing/src/main/java/com/costular/atomtasks/core/testing/MviViewModelTest.kt
diff --git a/core/testing/src/main/java/com/costular/atomtasks/coretesting/di/TestDispatcherModule.kt b/core/testing/src/main/java/com/costular/atomtasks/core/testing/di/TestDispatcherModule.kt
similarity index 100%
rename from core/testing/src/main/java/com/costular/atomtasks/coretesting/di/TestDispatcherModule.kt
rename to core/testing/src/main/java/com/costular/atomtasks/core/testing/di/TestDispatcherModule.kt
diff --git a/core/testing/src/main/java/com/costular/atomtasks/coretesting/di/TestDispatcherProviderModule.kt b/core/testing/src/main/java/com/costular/atomtasks/core/testing/di/TestDispatcherProviderModule.kt
similarity index 100%
rename from core/testing/src/main/java/com/costular/atomtasks/coretesting/di/TestDispatcherProviderModule.kt
rename to core/testing/src/main/java/com/costular/atomtasks/core/testing/di/TestDispatcherProviderModule.kt
diff --git a/core/testing/src/main/java/com/costular/atomtasks/core/testing/interactions/CallbackTester.kt b/core/testing/src/main/java/com/costular/atomtasks/core/testing/interactions/CallbackTester.kt
new file mode 100644
index 00000000..cc82d223
--- /dev/null
+++ b/core/testing/src/main/java/com/costular/atomtasks/core/testing/interactions/CallbackTester.kt
@@ -0,0 +1,18 @@
+package com.costular.atomtasks.core.testing.interactions
+
+import com.google.common.truth.Truth.assertThat
+
+class CallbackTester<Value>(private val block: () -> Value) : () -> Value {
+    var invokeCount = 0
+    override operator fun invoke(): Value {
+        invokeCount++
+        return block()
+    }
+}
+
+fun <Value> callbackTester(computedValue: Value) =
+    CallbackTester { computedValue }
+
+fun <T> CallbackTester<T>.shouldBeCalledOnce() {
+    assertThat(invokeCount).isEqualTo(1)
+}
diff --git a/core/testing/src/main/java/com/costular/atomtasks/coretesting/net/TestDispatcherProvider.kt b/core/testing/src/main/java/com/costular/atomtasks/core/testing/net/TestDispatcherProvider.kt
similarity index 100%
rename from core/testing/src/main/java/com/costular/atomtasks/coretesting/net/TestDispatcherProvider.kt
rename to core/testing/src/main/java/com/costular/atomtasks/core/testing/net/TestDispatcherProvider.kt
diff --git a/core/testing/src/main/java/com/costular/atomtasks/coretesting/ui/AndroidTest.kt b/core/testing/src/main/java/com/costular/atomtasks/core/testing/ui/AndroidTest.kt
similarity index 100%
rename from core/testing/src/main/java/com/costular/atomtasks/coretesting/ui/AndroidTest.kt
rename to core/testing/src/main/java/com/costular/atomtasks/core/testing/ui/AndroidTest.kt
diff --git a/core/testing/src/main/java/com/costular/atomtasks/coretesting/ui/ComposeProvider.kt b/core/testing/src/main/java/com/costular/atomtasks/core/testing/ui/ComposeProvider.kt
similarity index 100%
rename from core/testing/src/main/java/com/costular/atomtasks/coretesting/ui/ComposeProvider.kt
rename to core/testing/src/main/java/com/costular/atomtasks/core/testing/ui/ComposeProvider.kt
diff --git a/core/testing/src/main/java/com/costular/atomtasks/coretesting/ui/ComposeTestRuleExtensions.kt b/core/testing/src/main/java/com/costular/atomtasks/core/testing/ui/ComposeTestRuleExtensions.kt
similarity index 100%
rename from core/testing/src/main/java/com/costular/atomtasks/coretesting/ui/ComposeTestRuleExtensions.kt
rename to core/testing/src/main/java/com/costular/atomtasks/core/testing/ui/ComposeTestRuleExtensions.kt
diff --git a/core/testing/src/main/java/com/costular/atomtasks/coretesting/ui/Robot.kt b/core/testing/src/main/java/com/costular/atomtasks/core/testing/ui/Robot.kt
similarity index 100%
rename from core/testing/src/main/java/com/costular/atomtasks/coretesting/ui/Robot.kt
rename to core/testing/src/main/java/com/costular/atomtasks/core/testing/ui/Robot.kt
diff --git a/core/ui/src/main/java/com/costular/atomtasks/coreui/utils/DateTimeExtensions.kt b/core/ui/src/main/java/com/costular/atomtasks/coreui/utils/DateTimeExtensions.kt
index ae4ab13a..ad20ce8a 100644
--- a/core/ui/src/main/java/com/costular/atomtasks/coreui/utils/DateTimeExtensions.kt
+++ b/core/ui/src/main/java/com/costular/atomtasks/coreui/utils/DateTimeExtensions.kt
@@ -4,7 +4,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalConfiguration
 import com.costular.core.util.DateTimeFormatters.formatTime
+import java.time.DayOfWeek
 import java.time.LocalTime
+import java.time.YearMonth
+import java.time.format.DateTimeFormatter
+import java.time.format.TextStyle
+import java.time.temporal.TemporalAccessor
 
 @Composable
 fun LocalTime.ofLocalizedTime(): String {
@@ -13,3 +18,27 @@ fun LocalTime.ofLocalizedTime(): String {
         this.formatTime(locale)
     }
 }
+
+@Composable
+fun YearMonth.ofLocalized(formatter: DateTimeFormatter): String {
+    val locale = LocalConfiguration.current.locale
+    return remember(this, locale) {
+        this.format(formatter.withLocale(locale))
+    }
+}
+
+@Composable
+fun DayOfWeek.ofLocalized(style: TextStyle): String {
+    val locale = LocalConfiguration.current.locale
+    return remember(this, locale) {
+        this.getDisplayName(style, locale)
+    }
+}
+
+@Composable
+fun DateTimeFormatter.ofLocalized(temporalAccessor: TemporalAccessor): String {
+    val locale = LocalConfiguration.current.locale
+    return remember(this, locale) {
+        this.withLocale(locale).format(temporalAccessor)
+    }
+}
diff --git a/core/ui/src/main/res/values-es/strings.xml b/core/ui/src/main/res/values-es/strings.xml
index 1335b2f0..748e6d71 100644
--- a/core/ui/src/main/res/values-es/strings.xml
+++ b/core/ui/src/main/res/values-es/strings.xml
@@ -66,4 +66,5 @@
     <string name="create_task_notification_permission_rationale_dismiss">No gracias</string>
     <string name="create_task_notification_permission_rationale_confirm">Vale</string>
     <string name="settings_about_title">Sobre Atom</string>
+    <string name="agenda_tutorial_task_order">¿Quieres ordenar tus tareas? Mantén presionado y arrastra</string>
 </resources>
diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml
index 5aa83ecd..960bea52 100644
--- a/core/ui/src/main/res/values/strings.xml
+++ b/core/ui/src/main/res/values/strings.xml
@@ -27,6 +27,7 @@
     <string name="agenda_mark_as_done">Mark as done</string>
     <string name="agenda_mark_as_undone">Mark as undone</string>
     <string name="agenda_create_new_task">New task</string>
+    <string name="agenda_tutorial_task_order">Want your tasks in order? Long press and drag!</string>
 
     <string name="today">Today</string>
     <string name="create_task_set_date">Choose a Date</string>
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index 5b9060ad..e2970f73 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -24,7 +24,6 @@ dependencies {
     implementation(libs.preferences.datastore)
     implementation(libs.preferences)
     implementation(libs.hilt.work)
-    implementation(libs.timber)
 
     testImplementation(projects.common.tasks)
     testImplementation(libs.android.junit)
diff --git a/data/src/androidTest/java/com/costular/atomtasks/data/database/DatabaseModuleTest.kt b/data/src/androidTest/java/com/costular/atomtasks/data/database/DatabaseModuleTest.kt
index 4ca3257e..f017c292 100644
--- a/data/src/androidTest/java/com/costular/atomtasks/data/database/DatabaseModuleTest.kt
+++ b/data/src/androidTest/java/com/costular/atomtasks/data/database/DatabaseModuleTest.kt
@@ -2,7 +2,6 @@ package com.costular.atomtasks.data.database
 
 import android.content.Context
 import androidx.room.Room
-import com.costular.atomtasks.data.di.DatabaseModule
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.android.qualifiers.ApplicationContext
diff --git a/data/src/main/java/com/costular/atomtasks/data/settings/DataStoreModule.kt b/data/src/main/java/com/costular/atomtasks/data/DataStoreModule.kt
similarity index 96%
rename from data/src/main/java/com/costular/atomtasks/data/settings/DataStoreModule.kt
rename to data/src/main/java/com/costular/atomtasks/data/DataStoreModule.kt
index 1f62402a..b197174f 100644
--- a/data/src/main/java/com/costular/atomtasks/data/settings/DataStoreModule.kt
+++ b/data/src/main/java/com/costular/atomtasks/data/DataStoreModule.kt
@@ -1,4 +1,4 @@
-package com.costular.atomtasks.data.settings
+package com.costular.atomtasks.data
 
 import android.content.Context
 import androidx.datastore.core.DataStore
diff --git a/data/src/main/java/com/costular/atomtasks/data/di/DatabaseModule.kt b/data/src/main/java/com/costular/atomtasks/data/database/DatabaseModule.kt
similarity index 79%
rename from data/src/main/java/com/costular/atomtasks/data/di/DatabaseModule.kt
rename to data/src/main/java/com/costular/atomtasks/data/database/DatabaseModule.kt
index 6eb33ba3..0acb68d5 100644
--- a/data/src/main/java/com/costular/atomtasks/data/di/DatabaseModule.kt
+++ b/data/src/main/java/com/costular/atomtasks/data/database/DatabaseModule.kt
@@ -1,9 +1,7 @@
-package com.costular.atomtasks.data.di
+package com.costular.atomtasks.data.database
 
 import android.content.Context
 import androidx.room.Room
-import com.costular.atomtasks.data.database.AtomTasksDatabase
-import com.costular.atomtasks.data.database.MIGRATION_4_5
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
diff --git a/data/src/main/java/com/costular/atomtasks/data/di/DaosModule.kt b/data/src/main/java/com/costular/atomtasks/data/tasks/DaosModule.kt
similarity index 77%
rename from data/src/main/java/com/costular/atomtasks/data/di/DaosModule.kt
rename to data/src/main/java/com/costular/atomtasks/data/tasks/DaosModule.kt
index 1d4f822c..5a4b0142 100644
--- a/data/src/main/java/com/costular/atomtasks/data/di/DaosModule.kt
+++ b/data/src/main/java/com/costular/atomtasks/data/tasks/DaosModule.kt
@@ -1,8 +1,6 @@
-package com.costular.atomtasks.data.di
+package com.costular.atomtasks.data.tasks
 
 import com.costular.atomtasks.data.database.AtomTasksDatabase
-import com.costular.atomtasks.data.tasks.ReminderDao
-import com.costular.atomtasks.data.tasks.TasksDao
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
diff --git a/data/src/main/java/com/costular/atomtasks/data/tasks/TasksDao.kt b/data/src/main/java/com/costular/atomtasks/data/tasks/TasksDao.kt
index fd3343a4..09e1a8bd 100644
--- a/data/src/main/java/com/costular/atomtasks/data/tasks/TasksDao.kt
+++ b/data/src/main/java/com/costular/atomtasks/data/tasks/TasksDao.kt
@@ -1,6 +1,5 @@
 package com.costular.atomtasks.data.tasks
 
-import android.util.Log
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
@@ -8,7 +7,6 @@ import androidx.room.Query
 import androidx.room.Transaction
 import java.time.LocalDate
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.first
 
 @Suppress("TooManyFunctions")
 @Dao
@@ -61,19 +59,25 @@ interface TasksDao {
 
     @Transaction
     @Query("SELECT * FROM tasks WHERE position = :position AND date = :day")
-    suspend fun getTaskByPosition(day: LocalDate, position: Int): TaskAggregated
+    suspend fun getTaskByPosition(day: LocalDate, position: Int): TaskAggregated?
 
     @Transaction
     suspend fun moveTask(day: LocalDate, fromPosition: Int, toPosition: Int) {
         if (fromPosition == toPosition) return
 
-        val oldTask = getTaskByPosition(day, fromPosition).task
+        val oldTask = getTaskByPosition(day, fromPosition)
+
+        requireNotNull(oldTask?.task) {
+            "Task that's being moved is null for some reason"
+        }
+
+        val oldTaskEntity = oldTask!!.task
 
         val isDownMovement = toPosition > fromPosition
         val shift = if (isDownMovement) -1 else +1
         val tasksToShift = getTasksInRange(day, fromPosition - shift, toPosition)
 
-        updateTaskPosition(oldTask.id, -1)
+        updateTaskPosition(oldTaskEntity.id, -1)
 
         val sortedTasks = if (isDownMovement) {
             tasksToShift.sortedBy { it.task.position }
@@ -87,14 +91,6 @@ interface TasksDao {
                 updateTaskPosition(it.task.id, updatedPosition)
             }
 
-        val latestList = observeAllTasks().first()
-
-        Log.d("Order", "After iterating the list the result is: ")
-        latestList.forEach {
-            Log.d("Order", "Task ${it.task.id} with position ${it.task.position}")
-        }
-
-        Log.d("Order", "Updating ${oldTask.name} to $toPosition")
-        updateTaskPosition(oldTask.id, toPosition)
+        updateTaskPosition(oldTaskEntity.id, toPosition)
     }
 }
diff --git a/data/src/main/java/com/costular/atomtasks/data/tutorial/ShouldShowTaskOrderTutorialUseCase.kt b/data/src/main/java/com/costular/atomtasks/data/tutorial/ShouldShowTaskOrderTutorialUseCase.kt
new file mode 100644
index 00000000..86073537
--- /dev/null
+++ b/data/src/main/java/com/costular/atomtasks/data/tutorial/ShouldShowTaskOrderTutorialUseCase.kt
@@ -0,0 +1,12 @@
+package com.costular.atomtasks.data.tutorial
+
+import com.costular.core.usecase.UseCase
+import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
+
+class ShouldShowTaskOrderTutorialUseCase @Inject constructor(
+    private val tutorialRepository: TutorialRepository,
+) : UseCase<Unit, Flow<Boolean>> {
+    override suspend fun invoke(params: Unit): Flow<Boolean> =
+        tutorialRepository.shouldShowReorderTaskTutorial()
+}
diff --git a/data/src/main/java/com/costular/atomtasks/data/tutorial/TaskOrderTutorialDismissedUseCase.kt b/data/src/main/java/com/costular/atomtasks/data/tutorial/TaskOrderTutorialDismissedUseCase.kt
new file mode 100644
index 00000000..879f53a3
--- /dev/null
+++ b/data/src/main/java/com/costular/atomtasks/data/tutorial/TaskOrderTutorialDismissedUseCase.kt
@@ -0,0 +1,12 @@
+package com.costular.atomtasks.data.tutorial
+
+import com.costular.core.usecase.UseCase
+import javax.inject.Inject
+
+class TaskOrderTutorialDismissedUseCase @Inject constructor(
+    private val tutorialRepository: TutorialRepository,
+) : UseCase<Unit, Unit> {
+    override suspend fun invoke(params: Unit) {
+        tutorialRepository.reorderTaskShown()
+    }
+}
diff --git a/data/src/main/java/com/costular/atomtasks/data/tutorial/TutorialModule.kt b/data/src/main/java/com/costular/atomtasks/data/tutorial/TutorialModule.kt
new file mode 100644
index 00000000..a480ec15
--- /dev/null
+++ b/data/src/main/java/com/costular/atomtasks/data/tutorial/TutorialModule.kt
@@ -0,0 +1,15 @@
+package com.costular.atomtasks.data.tutorial
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class TutorialModule {
+    @Binds
+    abstract fun bindsTutorialRepository(
+        tutorialRepositoryImpl: TutorialRepositoryImpl,
+    ): TutorialRepository
+}
diff --git a/data/src/main/java/com/costular/atomtasks/data/tutorial/TutorialRepository.kt b/data/src/main/java/com/costular/atomtasks/data/tutorial/TutorialRepository.kt
new file mode 100644
index 00000000..60da1bea
--- /dev/null
+++ b/data/src/main/java/com/costular/atomtasks/data/tutorial/TutorialRepository.kt
@@ -0,0 +1,8 @@
+package com.costular.atomtasks.data.tutorial
+
+import kotlinx.coroutines.flow.Flow
+
+interface TutorialRepository {
+    fun shouldShowReorderTaskTutorial(): Flow<Boolean>
+    suspend fun reorderTaskShown()
+}
diff --git a/data/src/main/java/com/costular/atomtasks/data/tutorial/TutorialRepositoryImpl.kt b/data/src/main/java/com/costular/atomtasks/data/tutorial/TutorialRepositoryImpl.kt
new file mode 100644
index 00000000..d421885a
--- /dev/null
+++ b/data/src/main/java/com/costular/atomtasks/data/tutorial/TutorialRepositoryImpl.kt
@@ -0,0 +1,27 @@
+package com.costular.atomtasks.data.tutorial
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+class TutorialRepositoryImpl @Inject constructor(
+    private val dataStore: DataStore<Preferences>,
+) : TutorialRepository {
+
+    private val preferenceShowTaskOrderTutorial = booleanPreferencesKey("tutorial_task_order")
+    val showTaskOrderTutorial: Flow<Boolean> = dataStore.data.map { preferences ->
+        preferences[preferenceShowTaskOrderTutorial] ?: true
+    }
+
+    override fun shouldShowReorderTaskTutorial(): Flow<Boolean> = showTaskOrderTutorial
+
+    override suspend fun reorderTaskShown() {
+        dataStore.edit { settings ->
+            settings[preferenceShowTaskOrderTutorial] = false
+        }
+    }
+}
diff --git a/feature/agenda/src/androidTest/java/com/costular/atomtasks/agenda/AgendaTest.kt b/feature/agenda/src/androidTest/java/com/costular/atomtasks/agenda/AgendaTest.kt
index 66f870e3..d122a9b2 100644
--- a/feature/agenda/src/androidTest/java/com/costular/atomtasks/agenda/AgendaTest.kt
+++ b/feature/agenda/src/androidTest/java/com/costular/atomtasks/agenda/AgendaTest.kt
@@ -178,6 +178,7 @@ class AgendaTest : AndroidTest() {
                 onToggleExpandCollapse = {},
                 onMoveTask = { _, _ -> },
                 onDragTask = { _, _ -> },
+                onDismissTaskOrderTutorial = {},
             )
         }
     }
diff --git a/feature/agenda/src/main/java/com/costular/atomtasks/agenda/AgendaScreen.kt b/feature/agenda/src/main/java/com/costular/atomtasks/agenda/AgendaScreen.kt
index 40f41e3e..ec74ce65 100644
--- a/feature/agenda/src/main/java/com/costular/atomtasks/agenda/AgendaScreen.kt
+++ b/feature/agenda/src/main/java/com/costular/atomtasks/agenda/AgendaScreen.kt
@@ -128,6 +128,7 @@ internal fun AgendaScreen(
         onToggleExpandCollapse = viewModel::toggleHeader,
         onMoveTask = viewModel::onMoveTask,
         onDragTask = viewModel::onDragTask,
+        onDismissTaskOrderTutorial = viewModel::orderTaskTutorialDismissed,
     )
 }
 
@@ -178,6 +179,7 @@ fun AgendaScreen(
     onToggleExpandCollapse: () -> Unit,
     onMoveTask: (Int, Int) -> Unit,
     onDragTask: (ItemPosition, ItemPosition) -> Unit,
+    onDismissTaskOrderTutorial: () -> Unit,
 ) {
     if (state.deleteTaskAction is DeleteTaskAction.Shown) {
         RemoveTaskDialog(
@@ -207,6 +209,7 @@ fun AgendaScreen(
             modifier = Modifier.supportWideScreen(),
             onMoveTask = onMoveTask,
             onDragTask = onDragTask,
+            onDismissTaskOrderTutorial = onDismissTaskOrderTutorial,
         )
     }
 }
@@ -218,6 +221,7 @@ private fun TasksContent(
     onMarkTask: (Long, Boolean) -> Unit,
     onDragTask: (ItemPosition, ItemPosition) -> Unit,
     onMoveTask: (Int, Int) -> Unit,
+    onDismissTaskOrderTutorial: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val haptic = LocalHapticFeedback.current
@@ -238,6 +242,8 @@ private fun TasksContent(
                         haptic.performHapticFeedback(HapticFeedbackType.LongPress)
                     }
                 },
+                shouldShowTaskOrderTutorial = state.shouldShowCardOrderTutorial,
+                onDismissTaskOrderTutorial = onDismissTaskOrderTutorial,
                 padding = PaddingValues(
                     horizontal = AppTheme.dimens.contentMargin,
                     vertical = AppTheme.dimens.spacingLarge,
@@ -347,9 +353,9 @@ private fun AgendaHeader(
                 label = "Header calendar",
             ) { isCollapsed ->
                 if (isCollapsed) {
-                    HeaderCalendarCollapsed(state.selectedDay, onSelectDate)
-                } else {
                     HeaderCalendarExpanded(state.selectedDay, onSelectDate)
+                } else {
+                    HeaderCalendarCollapsed(state.selectedDay, onSelectDate)
                 }
             }
         }
@@ -357,7 +363,7 @@ private fun AgendaHeader(
 }
 
 @Composable
-private fun HeaderCalendarCollapsed(
+private fun HeaderCalendarExpanded(
     selectedDay: Day,
     onSelectDate: (LocalDate) -> Unit,
 ) {
@@ -372,7 +378,7 @@ private fun HeaderCalendarCollapsed(
 }
 
 @Composable
-private fun HeaderCalendarExpanded(
+private fun HeaderCalendarCollapsed(
     selectedDay: Day,
     onSelectDate: (LocalDate) -> Unit,
 ) {
@@ -444,6 +450,7 @@ fun AgendaPreview() {
             openTaskAction = {},
             onMoveTask = { _, _ -> },
             onDragTask = { _, _ -> },
+            onDismissTaskOrderTutorial = {},
         )
     }
 }
diff --git a/feature/agenda/src/main/java/com/costular/atomtasks/agenda/AgendaState.kt b/feature/agenda/src/main/java/com/costular/atomtasks/agenda/AgendaState.kt
index 5e3f4e38..bd139b07 100644
--- a/feature/agenda/src/main/java/com/costular/atomtasks/agenda/AgendaState.kt
+++ b/feature/agenda/src/main/java/com/costular/atomtasks/agenda/AgendaState.kt
@@ -11,6 +11,8 @@ data class AgendaState(
     val tasks: TasksState = TasksState.Uninitialized,
     val deleteTaskAction: DeleteTaskAction = DeleteTaskAction.Hidden,
     val isHeaderExpanded: Boolean = false,
+    val fromToPositions: Pair<Int, Int>? = null,
+    val shouldShowCardOrderTutorial: Boolean = false,
 ) {
     companion object {
         val Empty = AgendaState()
diff --git a/feature/agenda/src/main/java/com/costular/atomtasks/agenda/AgendaViewModel.kt b/feature/agenda/src/main/java/com/costular/atomtasks/agenda/AgendaViewModel.kt
index 20ae446c..d5e17dd1 100644
--- a/feature/agenda/src/main/java/com/costular/atomtasks/agenda/AgendaViewModel.kt
+++ b/feature/agenda/src/main/java/com/costular/atomtasks/agenda/AgendaViewModel.kt
@@ -8,15 +8,17 @@ import com.costular.atomtasks.agenda.analytics.AgendaAnalytics.ConfirmDelete
 import com.costular.atomtasks.agenda.analytics.AgendaAnalytics.ExpandCalendar
 import com.costular.atomtasks.agenda.analytics.AgendaAnalytics.MarkTaskAsDone
 import com.costular.atomtasks.agenda.analytics.AgendaAnalytics.MarkTaskAsNotDone
+import com.costular.atomtasks.agenda.analytics.AgendaAnalytics.NavigateToDay
 import com.costular.atomtasks.agenda.analytics.AgendaAnalytics.OrderTask
 import com.costular.atomtasks.agenda.analytics.AgendaAnalytics.SelectToday
 import com.costular.atomtasks.agenda.analytics.AgendaAnalytics.ShowConfirmDeleteDialog
-import com.costular.atomtasks.agenda.analytics.AgendaAnalytics.NavigateToDay
 import com.costular.atomtasks.analytics.AtomAnalytics
 import com.costular.atomtasks.core.ui.mvi.MviViewModel
 import com.costular.atomtasks.coreui.date.asDay
-import com.costular.atomtasks.tasks.interactor.ObserveTasksUseCase
+import com.costular.atomtasks.data.tutorial.ShouldShowTaskOrderTutorialUseCase
+import com.costular.atomtasks.data.tutorial.TaskOrderTutorialDismissedUseCase
 import com.costular.atomtasks.tasks.interactor.MoveTaskUseCase
+import com.costular.atomtasks.tasks.interactor.ObserveTasksUseCase
 import com.costular.atomtasks.tasks.interactor.RemoveTaskInteractor
 import com.costular.atomtasks.tasks.interactor.UpdateTaskIsDoneInteractor
 import com.costular.atomtasks.tasks.manager.AutoforwardManager
@@ -30,7 +32,7 @@ import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 import org.burnoutcrew.reorderable.ItemPosition
 
-@Suppress("TooManyFunctions")
+@Suppress("TooManyFunctions", "LongParameterList")
 @HiltViewModel
 class AgendaViewModel @Inject constructor(
     private val observeTasksUseCase: ObserveTasksUseCase,
@@ -39,11 +41,23 @@ class AgendaViewModel @Inject constructor(
     private val autoforwardManager: AutoforwardManager,
     private val moveTaskUseCase: MoveTaskUseCase,
     private val atomAnalytics: AtomAnalytics,
+    private val shouldShowTaskOrderTutorialUseCase: ShouldShowTaskOrderTutorialUseCase,
+    private val taskOrderTutorialDismissedUseCase: TaskOrderTutorialDismissedUseCase
 ) : MviViewModel<AgendaState>(AgendaState()) {
 
     init {
         loadTasks()
         scheduleAutoforwardTasks()
+        retrieveTutorials()
+    }
+
+    private fun retrieveTutorials() {
+        viewModelScope.launch {
+            shouldShowTaskOrderTutorialUseCase(Unit)
+                .collect {
+                    setState { copy(shouldShowCardOrderTutorial = it) }
+                }
+        }
     }
 
     private fun scheduleAutoforwardTasks() {
@@ -108,15 +122,17 @@ class AgendaViewModel @Inject constructor(
         val tasks = data.tasks
 
         if (tasks is TasksState.Success) {
-            val toIndex = tasks.data.indexOfFirst { it.id == to.key }
-            val fromIndex = tasks.data.indexOfFirst { it.id == from.key }
+            val toTask = tasks.data.first { it.id == to.key }
+            val fromTask = tasks.data.first { it.id == from.key }
+
+            if (from.index < 0 || to.index < 0) return
 
-            if (toIndex < 0 || fromIndex < 0) return
             setState {
                 copy(
+                    fromToPositions = Pair(fromTask.position, toTask.position),
                     tasks = TasksState.Success(
                         tasks.data.toMutableList().apply {
-                            add(toIndex, removeAt(fromIndex))
+                            add(from.index, removeAt(to.index))
                         }.toImmutableList(),
                     ),
                 )
@@ -124,22 +140,26 @@ class AgendaViewModel @Inject constructor(
         }
     }
 
+    @Suppress("UnusedParameter")
     fun onMoveTask(from: Int, to: Int) {
         viewModelScope.launch {
             val state = state.value
 
-            if (state.tasks is TasksState.Success) {
+            if (state.tasks is TasksState.Success && state.fromToPositions != null) {
                 moveTaskUseCase(
                     MoveTaskUseCase.Params(
                         day = state.selectedDay.date,
-                        fromPosition = from + 1,
-                        toPosition = to + 1,
+                        fromPosition = state.fromToPositions.first,
+                        toPosition = state.fromToPositions.second
                     ),
                 )
             }
-        }
 
-        atomAnalytics.track(OrderTask)
+            setState {
+                copy(fromToPositions = null)
+            }
+            atomAnalytics.track(OrderTask)
+        }
     }
 
     fun dismissDelete() {
@@ -176,4 +196,10 @@ class AgendaViewModel @Inject constructor(
     fun onCreateTask() {
         atomAnalytics.track(AgendaAnalytics.CreateNewTask)
     }
+
+    fun orderTaskTutorialDismissed() {
+        viewModelScope.launch {
+            taskOrderTutorialDismissedUseCase(Unit)
+        }
+    }
 }
diff --git a/feature/agenda/src/test/java/com/costular/atomtasks/agenda/AgendaViewModelTest.kt b/feature/agenda/src/test/java/com/costular/atomtasks/agenda/AgendaViewModelTest.kt
index bf566f2c..f6af619c 100644
--- a/feature/agenda/src/test/java/com/costular/atomtasks/agenda/AgendaViewModelTest.kt
+++ b/feature/agenda/src/test/java/com/costular/atomtasks/agenda/AgendaViewModelTest.kt
@@ -6,12 +6,15 @@ import com.costular.atomtasks.agenda.DeleteTaskAction.Shown
 import com.costular.atomtasks.agenda.analytics.AgendaAnalytics
 import com.costular.atomtasks.analytics.AtomAnalytics
 import com.costular.atomtasks.core.testing.MviViewModelTest
-import com.costular.atomtasks.tasks.interactor.ObserveTasksUseCase
-import com.costular.atomtasks.tasks.model.Task
+import com.costular.atomtasks.data.tutorial.ShouldShowTaskOrderTutorialUseCase
+import com.costular.atomtasks.data.tutorial.TaskOrderTutorialDismissedUseCase
 import com.costular.atomtasks.tasks.interactor.MoveTaskUseCase
+import com.costular.atomtasks.tasks.interactor.ObserveTasksUseCase
 import com.costular.atomtasks.tasks.interactor.RemoveTaskInteractor
 import com.costular.atomtasks.tasks.interactor.UpdateTaskIsDoneInteractor
 import com.costular.atomtasks.tasks.manager.AutoforwardManager
+import com.costular.atomtasks.tasks.model.Task
+import com.costular.core.usecase.invoke
 import com.google.common.truth.Truth.assertThat
 import io.mockk.coEvery
 import io.mockk.coVerify
@@ -37,17 +40,13 @@ class AgendaViewModelTest : MviViewModelTest() {
     private val autoforwardManager: AutoforwardManager = mockk(relaxed = true)
     private val moveTaskUseCase: MoveTaskUseCase = mockk(relaxed = true)
     private val atomAnalytics: AtomAnalytics = mockk(relaxed = true)
+    private val shouldShowTaskOrderTutorialUseCase: ShouldShowTaskOrderTutorialUseCase =
+        mockk(relaxed = true)
+    private val taskOrderTutorialDismissedUseCase: TaskOrderTutorialDismissedUseCase = mockk(relaxed = true)
 
     @Before
     fun setUp() {
-        sut = AgendaViewModel(
-            observeTasksUseCase = observeTasksUseCase,
-            updateTaskIsDoneInteractor = updateTaskIsDoneInteractor,
-            removeTaskInteractor = removeTaskInteractor,
-            autoforwardManager = autoforwardManager,
-            moveTaskUseCase = moveTaskUseCase,
-            atomAnalytics = atomAnalytics,
-        )
+        initializeViewModel()
     }
 
     @Test
@@ -164,8 +163,8 @@ class AgendaViewModelTest : MviViewModelTest() {
     fun `should update state when drag task`() = runTest {
         val expected = DEFAULT_TASKS
         coEvery { observeTasksUseCase.invoke(any()) } returns flowOf(expected)
-        val from = 1
-        val to = 2
+        val from = 0
+        val to = 1
 
         sut.loadTasks()
         sut.onDragTask(ItemPosition(from, TASK1_ID), ItemPosition(to, TASK2ID))
@@ -185,10 +184,35 @@ class AgendaViewModelTest : MviViewModelTest() {
         val to = 1
 
         sut.loadTasks()
+        sut.onDragTask(
+            ItemPosition(from, DEFAULT_TASKS.first().id),
+            ItemPosition(to, DEFAULT_TASKS[1].id)
+        )
         sut.onMoveTask(from, to)
 
         coVerify(exactly = 1) {
-            moveTaskUseCase(MoveTaskUseCase.Params(LocalDate.now(), from + 1, to + 1))
+            moveTaskUseCase(
+                MoveTaskUseCase.Params(
+                    LocalDate.now(),
+                    DEFAULT_TASKS.first().position,
+                    DEFAULT_TASKS[1].position
+                )
+            )
+        }
+    }
+
+    @Test
+    fun `should NOT call usecase when moving a task given the drag task failed`() = runTest {
+        val expected = DEFAULT_TASKS
+        coEvery { observeTasksUseCase.invoke(any()) } returns flowOf(expected)
+        val from = 0
+        val to = 1
+
+        sut.loadTasks()
+        sut.onMoveTask(from, to)
+
+        coVerify(exactly = 0) {
+            moveTaskUseCase(any())
         }
     }
 
@@ -312,6 +336,25 @@ class AgendaViewModelTest : MviViewModelTest() {
         }
     }
 
+    @Test
+    fun `should show order task when land on screen given the tutorial hasn't been shown for the user yet`() =
+        runTest {
+            coEvery { shouldShowTaskOrderTutorialUseCase.invoke() } returns flowOf(true)
+
+            initializeViewModel()
+
+            assertThat(sut.state.value.shouldShowCardOrderTutorial).isTrue()
+        }
+
+    @Test
+    fun `should call taskOrderTutorialUseCase when order task tutorial is dismissed`() = runTest {
+        sut.orderTaskTutorialDismissed()
+
+        coVerify(exactly = 1) {
+            taskOrderTutorialDismissedUseCase.invoke(Unit)
+        }
+    }
+
     companion object {
         const val TASK1_ID = 1L
         const val TASK2ID = 2L
@@ -336,4 +379,17 @@ class AgendaViewModelTest : MviViewModelTest() {
             ),
         )
     }
+
+    private fun initializeViewModel() {
+        sut = AgendaViewModel(
+            observeTasksUseCase = observeTasksUseCase,
+            updateTaskIsDoneInteractor = updateTaskIsDoneInteractor,
+            removeTaskInteractor = removeTaskInteractor,
+            autoforwardManager = autoforwardManager,
+            moveTaskUseCase = moveTaskUseCase,
+            atomAnalytics = atomAnalytics,
+            shouldShowTaskOrderTutorialUseCase = shouldShowTaskOrderTutorialUseCase,
+            taskOrderTutorialDismissedUseCase = taskOrderTutorialDismissedUseCase,
+        )
+    }
 }
diff --git a/feature/settings/src/main/java/com/costular/atomtasks/settings/components/SettingLink.kt b/feature/settings/src/main/java/com/costular/atomtasks/settings/components/SettingLink.kt
index 22bb5185..66ee7d46 100644
--- a/feature/settings/src/main/java/com/costular/atomtasks/settings/components/SettingLink.kt
+++ b/feature/settings/src/main/java/com/costular/atomtasks/settings/components/SettingLink.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.OpenInNew
 import androidx.compose.material.icons.outlined.Code
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -13,8 +14,8 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.costular.atomtasks.core.ui.utils.VariantsPreview
 import com.costular.atomtasks.settings.components.SettingItem
 import com.costular.designsystem.theme.AtomTheme
 
@@ -35,7 +36,7 @@ fun SettingLink(
         },
         title = title,
         end = {
-            Image(
+            Icon(
                 Icons.AutoMirrored.Filled.OpenInNew,
                 contentDescription = null,
                 modifier = Modifier.size(24.dp),
@@ -45,7 +46,7 @@ fun SettingLink(
     )
 }
 
-@Preview(showBackground = true)
+@VariantsPreview
 @Composable
 private fun SettingOptionPrev() {
     AtomTheme {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6a773011..436c584b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,6 +18,7 @@ room = "2.5.2"
 paparazzi = "1.3.1"
 composeDestinations = "1.9.53"
 junit5 = "5.9.0"
+balloon = "1.6.1"
 
 ksp = "1.9.10-1.0.13"
 jacoco = "0.8.7"
@@ -42,7 +43,6 @@ hilt-ext-compiler = { group = "androidx.hilt", name = "hilt-compiler", version.r
 hilt-navigation-compose = "androidx.hilt:hilt-navigation-compose:1.0.0"
 hilt-work = "androidx.hilt:hilt-work:1.0.0"
 hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" }
-timber = "com.jakewharton.timber:timber:5.0.1"
 startup = "androidx.startup:startup-runtime:1.1.1"
 preferences = "androidx.preference:preference-ktx:1.2.1"
 preferences-datastore = "androidx.datastore:datastore-preferences:1.0.0"
@@ -70,12 +70,13 @@ room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
 room-testing = { group = "androidx.room", name = "room-testing", version.ref = "room" }
 calendar = "com.kizitonwose.calendar:compose:2.0.4"
 android-junit = "androidx.test.ext:junit-ktx:1.1.5"
-firebase-bom = "com.google.firebase:firebase-bom:32.2.3"
+firebase-bom = "com.google.firebase:firebase-bom:32.4.0"
 firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" }
-firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" }
+firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" }
 compose-destinations = { module = "io.github.raamcosta.compose-destinations:animations-core", version.ref = "composeDestinations" }
 compose-destinations-ksp = { module = "io.github.raamcosta.compose-destinations:ksp", version.ref = "composeDestinations" }
 reordeable = { group = "org.burnoutcrew.composereorderable", name = "reorderable", version.ref = "reordeable" }
+balloon = { group = "com.github.skydoves", name = "balloon-compose", version.ref = "balloon" }
 
 junit = "junit:junit:4.13.2"
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
diff --git a/screenshot_testing/src/test/java/com/costular/atomtasks/screenshottesting/designsystem/TaskListSnapshotTest.kt b/screenshot_testing/src/test/java/com/costular/atomtasks/screenshottesting/designsystem/TaskListSnapshotTest.kt
index fd979a15..773bfbe6 100644
--- a/screenshot_testing/src/test/java/com/costular/atomtasks/screenshottesting/designsystem/TaskListSnapshotTest.kt
+++ b/screenshot_testing/src/test/java/com/costular/atomtasks/screenshottesting/designsystem/TaskListSnapshotTest.kt
@@ -102,6 +102,8 @@ class TaskListSnapshotTest {
                 onMarkTask = { _, _ -> },
                 modifier = Modifier.fillMaxWidth(),
                 state = rememberReorderableLazyListState(onMove = { _, _ -> }),
+                shouldShowTaskOrderTutorial = false,
+                onDismissTaskOrderTutorial = {},
             )
         }
     }
diff --git a/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[BIG,DARK].png b/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[BIG,DARK].png
index 0e9c6f86..2a9a64ed 100644
Binary files a/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[BIG,DARK].png and b/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[BIG,DARK].png differ
diff --git a/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[BIG,LIGHT].png b/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[BIG,LIGHT].png
index 9976cad7..98cbbf90 100644
Binary files a/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[BIG,LIGHT].png and b/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[BIG,LIGHT].png differ
diff --git a/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[NORMAL,DARK].png b/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[NORMAL,DARK].png
index 8ad6201c..845fa3e9 100644
Binary files a/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[NORMAL,DARK].png and b/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[NORMAL,DARK].png differ
diff --git a/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[NORMAL,LIGHT].png b/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[NORMAL,LIGHT].png
index 6e662719..a680b98c 100644
Binary files a/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[NORMAL,LIGHT].png and b/screenshot_testing/src/test/snapshots/images/com.costular.atomtasks.screenshottesting.designsystem_HorizontalCalendarSnapshotTest_horizontalCalendarTest[NORMAL,LIGHT].png differ
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3003ad68..35c87a95 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -33,3 +33,4 @@ include(":screenshot_testing")
 include(":core:analytics")
 include(":feature:postpone-task")
 include(":core:notifications")
+include(":core:logging")
diff --git a/whatsNew/whatsnew-en-US b/whatsNew/whatsnew-en-US
index 59ed309f..03533f7b 100644
--- a/whatsNew/whatsnew-en-US
+++ b/whatsNew/whatsnew-en-US
@@ -1,4 +1,5 @@
-✨ Bug fixes and some new features like:
-- New Material You design
+New fresh updates ✨
 
-New features coming soon 👀
+- Tasks can be ordered now! 👏🏼
+- Themed icon (from Android 12) now the icon will follow your wallpaper colors
+- Expandable calendar enhancements
diff --git a/whatsNew/whatsnew-es-ES b/whatsNew/whatsnew-es-ES
index 7126ef62..347b023c 100644
--- a/whatsNew/whatsnew-es-ES
+++ b/whatsNew/whatsnew-es-ES
@@ -1,4 +1,5 @@
-✨ Arreglo de errores y algunas funcionalidades nuevas como:
-- Nuevo diseño Material You
+Nuevas funcionalidades directas desde el horno ✨
 
-Pronto más cambios importantes 👀
+- Ahora puedes ordenar las tareas 👏🏼
+- Icono tematizado (a partir de Android 12) ahora el icono de la app seguirá tu fondo de pantalla
+- Mejoras en el calendario mensual expandible