diff --git a/app/src/main/java/com/example/util/simpletimetracker/di/NavigationDialogMapModule.kt b/app/src/main/java/com/example/util/simpletimetracker/di/NavigationDialogMapModule.kt
index 32c3ef23..c20cdf49 100644
--- a/app/src/main/java/com/example/util/simpletimetracker/di/NavigationDialogMapModule.kt
+++ b/app/src/main/java/com/example/util/simpletimetracker/di/NavigationDialogMapModule.kt
@@ -1,6 +1,7 @@
 package com.example.util.simpletimetracker.di
 
 import com.example.util.simpletimetracker.R
+import com.example.util.simpletimetracker.feature_data_edit.dialog.DataEditTypeSelectionDialogFragment
 import com.example.util.simpletimetracker.feature_dialogs.archive.view.ArchiveDialogFragment
 import com.example.util.simpletimetracker.feature_dialogs.cardOrder.view.CardOrderDialogFragment
 import com.example.util.simpletimetracker.feature_dialogs.colorSelection.view.ColorSelectionDialogFragment
@@ -23,6 +24,7 @@ import com.example.util.simpletimetracker.navigation.params.screen.ChartFilterDi
 import com.example.util.simpletimetracker.navigation.params.screen.ColorSelectionDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.DataExportSettingDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.CustomRangeSelectionParams
+import com.example.util.simpletimetracker.navigation.params.screen.DataEditTypeSelectionDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.DateTimeDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.DefaultTypesSelectionDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.DurationDialogParams
@@ -200,4 +202,14 @@ class NavigationDialogMapModule {
             bundleCreatorDelegate(HelpDialogFragment::createBundle)
         )
     }
+
+    @IntoMap
+    @Provides
+    @ScreenKey(DataEditTypeSelectionDialogParams::class)
+    fun dataEditTypeSelectionDialog(): NavigationData {
+        return NavigationData(
+            R.id.dataEditTypeSelectionDialogFragment,
+            BundleCreator.empty()
+        )
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 99447d8d..56351160 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -145,6 +145,11 @@
         android:name="com.example.util.simpletimetracker.feature_dialogs.helpDialog.HelpDialogFragment"
         android:label="HelpDialogFragment"
         tools:layout="@layout/help_dialog_fragment"/>
+    <dialog
+        android:id="@+id/dataEditTypeSelectionDialogFragment"
+        android:name="com.example.util.simpletimetracker.feature_data_edit.dialog.DataEditTypeSelectionDialogFragment"
+        android:label="DataEditTypeSelectionDialogFragment"
+        tools:layout="@layout/data_edit_type_selection_dialog_fragment" />
     <fragment
         android:id="@+id/recordsAllFragment"
         android:name="com.example.util.simpletimetracker.feature_records_all.view.RecordsAllFragment"
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 981ee1f6..7439215f 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -376,6 +376,11 @@ If <b>\"%s\"</b> setting is enabled, app will send events on activity started or
     <!--  Data edit  -->
     <string name="data_edit_hint">These changes cannot be undone. Make sure to create a backup file before doing anything.</string>
     <string name="data_edit_select_records">Select records</string>
+    <string name="data_edit_change_activity">Change activity</string>
+    <string name="data_edit_change_activity_hint">Tags of current activity will be removed.</string>
+    <string name="data_edit_change_comment">Change comment</string>
+    <string name="data_edit_change_add_tag">Add tags</string>
+    <string name="data_edit_change_remove_tag">Remove tags</string>
 
     <!--  Records filter  -->
     <string name="records_filter_activity">Activity</string>
diff --git a/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/dialog/DataEditTypeSelectionDialogFragment.kt b/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/dialog/DataEditTypeSelectionDialogFragment.kt
new file mode 100644
index 00000000..08ea8fc7
--- /dev/null
+++ b/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/dialog/DataEditTypeSelectionDialogFragment.kt
@@ -0,0 +1,83 @@
+package com.example.util.simpletimetracker.feature_data_edit.dialog
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.viewModels
+import com.example.util.simpletimetracker.core.base.BaseBottomSheetFragment
+import com.example.util.simpletimetracker.core.extension.blockContentScroll
+import com.example.util.simpletimetracker.core.extension.getAllFragments
+import com.example.util.simpletimetracker.core.extension.setFullScreen
+import com.example.util.simpletimetracker.core.extension.setSkipCollapsed
+import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
+import com.example.util.simpletimetracker.feature_base_adapter.hint.createHintAdapterDelegate
+import com.example.util.simpletimetracker.feature_base_adapter.loader.createLoaderAdapterDelegate
+import com.example.util.simpletimetracker.feature_base_adapter.recordType.RecordTypeViewData
+import com.example.util.simpletimetracker.feature_base_adapter.recordType.createRecordTypeAdapterDelegate
+import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
+import com.google.android.flexbox.FlexboxLayoutManager
+import com.google.android.flexbox.JustifyContent
+import dagger.hilt.android.AndroidEntryPoint
+import com.example.util.simpletimetracker.feature_data_edit.databinding.DataEditTypeSelectionDialogFragmentBinding as Binding
+
+@AndroidEntryPoint
+class DataEditTypeSelectionDialogFragment : BaseBottomSheetFragment<Binding>() {
+
+    override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
+        Binding::inflate
+
+    private val viewModel: DataEditTypeSelectionViewModel by viewModels()
+
+    private val adapter: BaseRecyclerAdapter by lazy {
+        BaseRecyclerAdapter(
+            createLoaderAdapterDelegate(),
+            createHintAdapterDelegate(),
+            createRecordTypeAdapterDelegate(::dismiss),
+        )
+    }
+
+    private var listener: DataEditTypeSelectionDialogListener? = null
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        when (context) {
+            is DataEditTypeSelectionDialogListener -> {
+                listener = context
+                return
+            }
+            is AppCompatActivity -> {
+                context.getAllFragments()
+                    .firstOrNull { it is DataEditTypeSelectionDialogListener && it.isResumed }
+                    ?.let { listener = it as? DataEditTypeSelectionDialogListener }
+            }
+        }
+    }
+
+    override fun initDialog() {
+        setSkipCollapsed()
+        setFullScreen()
+        blockContentScroll(binding.rvDataEditTypeSelectionContainer)
+    }
+
+    override fun initUi(): Unit = with(binding) {
+        rvDataEditTypeSelectionContainer.apply {
+            layoutManager = FlexboxLayoutManager(requireContext()).apply {
+                flexDirection = FlexDirection.ROW
+                justifyContent = JustifyContent.CENTER
+                flexWrap = FlexWrap.WRAP
+            }
+            adapter = this@DataEditTypeSelectionDialogFragment.adapter
+        }
+    }
+
+    override fun initViewModel(): Unit = with(viewModel) {
+        viewData.observe(adapter::replace)
+    }
+
+    private fun dismiss(item: RecordTypeViewData) {
+        listener?.onTypeSelected(item.id)
+        dismiss()
+    }
+}
\ No newline at end of file
diff --git a/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/dialog/DataEditTypeSelectionDialogListener.kt b/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/dialog/DataEditTypeSelectionDialogListener.kt
new file mode 100644
index 00000000..0f2b2145
--- /dev/null
+++ b/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/dialog/DataEditTypeSelectionDialogListener.kt
@@ -0,0 +1,6 @@
+package com.example.util.simpletimetracker.feature_data_edit.dialog
+
+interface DataEditTypeSelectionDialogListener {
+
+    fun onTypeSelected(typeId: Long)
+}
\ No newline at end of file
diff --git a/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/dialog/DataEditTypeSelectionViewModel.kt b/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/dialog/DataEditTypeSelectionViewModel.kt
new file mode 100644
index 00000000..e4816e68
--- /dev/null
+++ b/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/dialog/DataEditTypeSelectionViewModel.kt
@@ -0,0 +1,67 @@
+package com.example.util.simpletimetracker.feature_data_edit.dialog
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.util.simpletimetracker.core.mapper.RecordTypeViewDataMapper
+import com.example.util.simpletimetracker.core.repo.ResourceRepo
+import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
+import com.example.util.simpletimetracker.domain.interactor.RecordTypeInteractor
+import com.example.util.simpletimetracker.domain.model.RecordType
+import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
+import com.example.util.simpletimetracker.feature_base_adapter.hint.HintViewData
+import com.example.util.simpletimetracker.feature_base_adapter.loader.LoaderViewData
+import com.example.util.simpletimetracker.feature_data_edit.R
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.launch
+
+@HiltViewModel
+class DataEditTypeSelectionViewModel @Inject constructor(
+    private val recordTypeInteractor: RecordTypeInteractor,
+    private val prefsInteractor: PrefsInteractor,
+    private val recordTypeViewDataMapper: RecordTypeViewDataMapper,
+    private val resourceRepo: ResourceRepo,
+) : ViewModel() {
+
+    val viewData: LiveData<List<ViewHolderType>> by lazy {
+        return@lazy MutableLiveData<List<ViewHolderType>>().let { initial ->
+            viewModelScope.launch {
+                initial.value = listOf(LoaderViewData())
+                initial.value = loadViewData()
+            }
+            initial
+        }
+    }
+
+    private var types: List<RecordType> = emptyList()
+
+    private suspend fun getCache(): List<RecordType> {
+        return types.takeUnless { it.isEmpty() } ?: recordTypeInteractor.getAll()
+    }
+
+    private suspend fun loadViewData(): List<ViewHolderType> {
+        val result: MutableList<ViewHolderType> = mutableListOf()
+
+        val numberOfCards = prefsInteractor.getNumberOfCards()
+        val isDarkTheme = prefsInteractor.getDarkMode()
+
+        val typesViewData = getCache().map { type ->
+            recordTypeViewDataMapper.map(
+                recordType = type,
+                numberOfCards = numberOfCards,
+                isDarkTheme = isDarkTheme,
+            )
+        }
+
+        if (typesViewData.isNotEmpty()) {
+            HintViewData(resourceRepo.getString(R.string.activity_hint)).let(result::add)
+            typesViewData.let(result::addAll)
+        } else {
+            HintViewData(resourceRepo.getString(R.string.record_types_empty)).let(result::add)
+        }
+
+        return result
+    }
+}
diff --git a/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/model/DataEditChangeActivityState.kt b/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/model/DataEditChangeActivityState.kt
new file mode 100644
index 00000000..575a823f
--- /dev/null
+++ b/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/model/DataEditChangeActivityState.kt
@@ -0,0 +1,9 @@
+package com.example.util.simpletimetracker.feature_data_edit.model
+
+import com.example.util.simpletimetracker.feature_base_adapter.recordType.RecordTypeViewData
+
+sealed interface DataEditChangeActivityState {
+
+    object Disabled : DataEditChangeActivityState
+    data class Enabled(val viewData: RecordTypeViewData) : DataEditChangeActivityState
+}
\ No newline at end of file
diff --git a/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/view/DataEditFragment.kt b/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/view/DataEditFragment.kt
index e1c1ce91..8ab5f28b 100644
--- a/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/view/DataEditFragment.kt
+++ b/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/view/DataEditFragment.kt
@@ -2,28 +2,68 @@ package com.example.util.simpletimetracker.feature_data_edit.view
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import com.example.util.simpletimetracker.core.base.BaseFragment
+import com.example.util.simpletimetracker.feature_data_edit.dialog.DataEditTypeSelectionDialogListener
+import com.example.util.simpletimetracker.feature_data_edit.model.DataEditChangeActivityState
 import com.example.util.simpletimetracker.feature_data_edit.viewModel.DataEditViewModel
 import com.example.util.simpletimetracker.feature_views.extension.setOnClick
 import dagger.hilt.android.AndroidEntryPoint
 import com.example.util.simpletimetracker.feature_data_edit.databinding.DataEditFragmentBinding as Binding
 
 @AndroidEntryPoint
-class DataEditFragment : BaseFragment<Binding>() {
+class DataEditFragment :
+    BaseFragment<Binding>(),
+    DataEditTypeSelectionDialogListener {
 
     override val inflater: (LayoutInflater, ViewGroup?, Boolean) -> Binding =
         Binding::inflate
 
     private val viewModel: DataEditViewModel by viewModels()
 
-    override fun initUi(): Unit = with(binding) {
+    override fun initUi() = with(binding) {
         btnDataEditSelectRecords.setOnClick(throttle(viewModel::onSelectRecordsClick))
     }
 
+    override fun initUx() = with(binding) {
+        checkboxDataEditChangeActivity.setOnClick(viewModel::onChangeActivityClick)
+    }
+
     override fun initViewModel(): Unit = with(viewModel) {
         with(binding) {
             selectedRecordsCountViewData.observe(tvDataEditSelectedRecords::setText)
+            changeActivityCheckbox.observe {
+                when (it) {
+                    is DataEditChangeActivityState.Disabled -> {
+                        checkboxDataEditChangeActivity.isChecked = false
+                        viewDataEditChangeActivityPreview.isVisible = false
+                    }
+                    is DataEditChangeActivityState.Enabled -> {
+                        checkboxDataEditChangeActivity.isChecked = true
+                        viewDataEditChangeActivityPreview.isVisible = true
+                        viewDataEditChangeActivityPreview.apply {
+                            itemColor = it.viewData.color
+                            itemIcon = it.viewData.iconId
+                            itemIconColor = it.viewData.iconColor
+                            itemIconAlpha = it.viewData.iconAlpha
+                            itemName = it.viewData.name
+                        }
+                    }
+                }
+            }
         }
     }
+
+    override fun onResume() = with(binding) {
+        super.onResume()
+        checkboxDataEditChangeActivity.jumpDrawablesToCurrentState()
+        checkboxDataEditChangeComment.jumpDrawablesToCurrentState()
+        checkboxDataEditAddTag.jumpDrawablesToCurrentState()
+        checkboxDataEditRemoveTag.jumpDrawablesToCurrentState()
+    }
+
+    override fun onTypeSelected(typeId: Long) {
+        viewModel.onTypeSelected(typeId)
+    }
 }
diff --git a/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/viewModel/DataEditViewModel.kt b/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/viewModel/DataEditViewModel.kt
index d6d7c6cb..c20cafa7 100644
--- a/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/viewModel/DataEditViewModel.kt
+++ b/features/feature_data_edit/src/main/java/com/example/util/simpletimetracker/feature_data_edit/viewModel/DataEditViewModel.kt
@@ -6,9 +6,14 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.util.simpletimetracker.core.extension.set
 import com.example.util.simpletimetracker.core.extension.toParams
+import com.example.util.simpletimetracker.core.mapper.RecordTypeViewDataMapper
+import com.example.util.simpletimetracker.domain.interactor.PrefsInteractor
+import com.example.util.simpletimetracker.domain.interactor.RecordTypeInteractor
 import com.example.util.simpletimetracker.domain.model.RecordsFilter
 import com.example.util.simpletimetracker.feature_data_edit.interactor.DateEditViewDataInteractor
+import com.example.util.simpletimetracker.feature_data_edit.model.DataEditChangeActivityState
 import com.example.util.simpletimetracker.navigation.Router
+import com.example.util.simpletimetracker.navigation.params.screen.DataEditTypeSelectionDialogParams
 import com.example.util.simpletimetracker.navigation.params.screen.RecordsFilterParams
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
@@ -18,6 +23,9 @@ import kotlinx.coroutines.launch
 class DataEditViewModel @Inject constructor(
     private val router: Router,
     private val dateEditViewDataInteractor: DateEditViewDataInteractor,
+    private val recordTypeViewDataMapper: RecordTypeViewDataMapper,
+    private val prefsInteractor: PrefsInteractor,
+    private val recordTypeInteractor: RecordTypeInteractor,
 ) : ViewModel() {
 
     val selectedRecordsCountViewData: LiveData<String> by lazy {
@@ -26,8 +34,17 @@ class DataEditViewModel @Inject constructor(
             initial
         }
     }
+    val changeActivityCheckbox: LiveData<DataEditChangeActivityState> by lazy {
+        MutableLiveData<DataEditChangeActivityState>().let { initial ->
+            viewModelScope.launch {
+                initial.value = loadChangeActivityCheckbox()
+            }
+            initial
+        }
+    }
 
     private var filters: List<RecordsFilter> = emptyList()
+    private var newTypeId: Long? = null
 
     fun onSelectRecordsClick() {
         router.setResultListener(FILTER_TAG) {
@@ -39,6 +56,20 @@ class DataEditViewModel @Inject constructor(
         ).let(router::navigate)
     }
 
+    fun onChangeActivityClick() {
+        if (newTypeId == null) {
+            router.navigate(DataEditTypeSelectionDialogParams)
+        } else {
+            newTypeId = null
+            updateChangeActivityCheckbox()
+        }
+    }
+
+    fun onTypeSelected(typeId: Long) {
+        newTypeId = typeId
+        updateChangeActivityCheckbox()
+    }
+
     private fun onFilterSelected(filters: List<RecordsFilter>) {
         this.filters = filters
         updateSelectedRecordsCountViewData()
@@ -53,6 +84,26 @@ class DataEditViewModel @Inject constructor(
         return dateEditViewDataInteractor.getSelectedRecordsCount(filters)
     }
 
+    private fun updateChangeActivityCheckbox() = viewModelScope.launch {
+        val data = loadChangeActivityCheckbox()
+        changeActivityCheckbox.set(data)
+    }
+
+    private suspend fun loadChangeActivityCheckbox(): DataEditChangeActivityState {
+        // TODO move to interactor
+        val type = newTypeId?.let { recordTypeInteractor.get(it) }
+        return if (type == null) {
+            DataEditChangeActivityState.Disabled
+        } else {
+            DataEditChangeActivityState.Enabled(
+                recordTypeViewDataMapper.map(
+                    recordType = type,
+                    isDarkTheme = prefsInteractor.getDarkMode(),
+                )
+            )
+        }
+    }
+
     companion object {
         private const val FILTER_TAG = "date_edit_filter_tag"
     }
diff --git a/features/feature_data_edit/src/main/res/layout/data_edit_fragment.xml b/features/feature_data_edit/src/main/res/layout/data_edit_fragment.xml
index 9e89fdbe..7bfcfb8b 100644
--- a/features/feature_data_edit/src/main/res/layout/data_edit_fragment.xml
+++ b/features/feature_data_edit/src/main/res/layout/data_edit_fragment.xml
@@ -53,20 +53,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="8dp"
                 android:padding="16dp"
-                app:iconTint="?appLightTextColor"
                 android:text="@string/data_edit_select_records"
                 app:icon="@drawable/ic_list_24px"
-                app:iconGravity="end" />
+                app:iconGravity="end"
+                app:iconTint="?appLightTextColor" />
 
             <androidx.cardview.widget.CardView
+                style="@style/SettingsCard"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="6dp"
-                app:cardBackgroundColor="?appCardBackgroundColor"
-                app:cardCornerRadius="8dp"
-                app:cardElevation="2dp"
-                app:cardPreventCornerOverlap="false"
-                app:cardUseCompatPadding="true">
+                android:layout_marginHorizontal="6dp">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
@@ -97,10 +93,155 @@
 
             </androidx.cardview.widget.CardView>
 
-            <com.example.util.simpletimetracker.feature_views.DividerView
+            <androidx.cardview.widget.CardView
+                style="@style/SettingsCard"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="2dp" />
+                android:layout_marginHorizontal="6dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="12dp">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvDataEditChangeActivity"
+                            style="@style/SettingsText"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:paddingTop="0dp"
+                            android:paddingBottom="0dp"
+                            android:text="@string/data_edit_change_activity"
+                            app:layout_constraintEnd_toStartOf="@id/checkboxDataEditChangeActivity"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvDataEditChangeActivityHint"
+                            style="@style/SettingsSecondaryText"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:text="@string/data_edit_change_activity_hint"
+                            android:textColor="?colorSecondary"
+                            app:layout_constraintEnd_toStartOf="@id/checkboxDataEditChangeActivity"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/tvDataEditChangeActivity" />
+
+                        <com.example.util.simpletimetracker.feature_views.RecordTypeView
+                            android:id="@+id/viewDataEditChangeActivityPreview"
+                            style="@style/RecordTypeItem"
+                            android:layout_marginStart="12dp"
+                            android:layout_marginBottom="12dp"
+                            android:visibility="gone"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@id/tvDataEditChangeActivityHint"
+                            tools:visibility="visible" />
+
+                        <androidx.appcompat.widget.AppCompatCheckBox
+                            android:id="@+id/checkboxDataEditChangeActivity"
+                            android:layout_width="wrap_content"
+                            android:layout_height="0dp"
+                            app:layout_constraintBottom_toBottomOf="@id/tvDataEditChangeActivity"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="@id/tvDataEditChangeActivity" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <View
+                        style="@style/SettingsDivider"
+                        android:layout_width="match_parent" />
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvDataEditChangeComment"
+                            style="@style/SettingsText"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:text="@string/data_edit_change_comment"
+                            app:layout_constraintEnd_toStartOf="@id/checkboxDataEditChangeComment"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <androidx.appcompat.widget.AppCompatCheckBox
+                            android:id="@+id/checkboxDataEditChangeComment"
+                            android:layout_width="wrap_content"
+                            android:layout_height="0dp"
+                            app:layout_constraintBottom_toBottomOf="@id/tvDataEditChangeComment"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="@id/tvDataEditChangeComment" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <View
+                        style="@style/SettingsDivider"
+                        android:layout_width="match_parent" />
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvDataEditAddTag"
+                            style="@style/SettingsText"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:text="@string/data_edit_change_add_tag"
+                            app:layout_constraintEnd_toStartOf="@id/checkboxDataEditAddTag"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <androidx.appcompat.widget.AppCompatCheckBox
+                            android:id="@+id/checkboxDataEditAddTag"
+                            android:layout_width="wrap_content"
+                            android:layout_height="0dp"
+                            app:layout_constraintBottom_toBottomOf="@id/tvDataEditAddTag"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="@id/tvDataEditAddTag" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <View
+                        style="@style/SettingsDivider"
+                        android:layout_width="match_parent" />
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvDataEditRemoveTag"
+                            style="@style/SettingsText"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:text="@string/data_edit_change_remove_tag"
+                            app:layout_constraintEnd_toStartOf="@id/checkboxDataEditRemoveTag"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <androidx.appcompat.widget.AppCompatCheckBox
+                            android:id="@+id/checkboxDataEditRemoveTag"
+                            android:layout_width="wrap_content"
+                            android:layout_height="0dp"
+                            app:layout_constraintBottom_toBottomOf="@id/tvDataEditRemoveTag"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="@id/tvDataEditRemoveTag" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </LinearLayout>
+
+            </androidx.cardview.widget.CardView>
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/features/feature_data_edit/src/main/res/layout/data_edit_type_selection_dialog_fragment.xml b/features/feature_data_edit/src/main/res/layout/data_edit_type_selection_dialog_fragment.xml
new file mode 100644
index 00000000..617a53f4
--- /dev/null
+++ b/features/feature_data_edit/src/main/res/layout/data_edit_type_selection_dialog_fragment.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?appDialogBackground"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/ivDataEditTypeSelectionArrow"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="8dp"
+        android:src="@drawable/dialog_arrow"
+        android:tint="?appContrastColor" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvDataEditTypeSelectionContainer"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginVertical="24dp"
+        android:layout_weight="1"
+        tools:listitem="@layout/item_record_type_layout" />
+
+</androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/features/feature_settings/src/main/res/values/styles.xml b/features/feature_settings/src/main/res/values/styles.xml
deleted file mode 100644
index 636e7a4d..00000000
--- a/features/feature_settings/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="SettingsDivider">
-        <item name="android:layout_height">2dp</item>
-        <item name="android:layout_marginStart">8dp</item>
-        <item name="android:layout_marginEnd">8dp</item>
-        <item name="android:background">?appDividerColor</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/features/feature_views/src/main/res/values/styles.xml b/features/feature_views/src/main/res/values/styles.xml
index d9c19968..c0eb09c5 100644
--- a/features/feature_views/src/main/res/values/styles.xml
+++ b/features/feature_views/src/main/res/values/styles.xml
@@ -235,6 +235,13 @@
         <item name="cardElevation">@dimen/record_type_card_elevation</item>
     </style>
 
+    <style name="SettingsDivider">
+        <item name="android:layout_height">2dp</item>
+        <item name="android:layout_marginStart">8dp</item>
+        <item name="android:layout_marginEnd">8dp</item>
+        <item name="android:background">?appDividerColor</item>
+    </style>
+
     <style name="SettingsCard">
         <item name="cardBackgroundColor">?appCardBackgroundColor</item>
         <item name="cardCornerRadius">8dp</item>
diff --git a/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/screen/DataEditTypeSelectionDialogParams.kt b/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/screen/DataEditTypeSelectionDialogParams.kt
new file mode 100644
index 00000000..8cfd80d9
--- /dev/null
+++ b/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/screen/DataEditTypeSelectionDialogParams.kt
@@ -0,0 +1,3 @@
+package com.example.util.simpletimetracker.navigation.params.screen
+
+object DataEditTypeSelectionDialogParams : ScreenParams
\ No newline at end of file