diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/base/BaseActivity.kt b/core/src/main/java/com/example/util/simpletimetracker/core/base/BaseActivity.kt
index db898c536..8a239c4a8 100644
--- a/core/src/main/java/com/example/util/simpletimetracker/core/base/BaseActivity.kt
+++ b/core/src/main/java/com/example/util/simpletimetracker/core/base/BaseActivity.kt
@@ -10,7 +10,6 @@ import com.example.util.simpletimetracker.core.extension.allowDiskWrite
 import com.example.util.simpletimetracker.core.manager.ThemeManager
 import com.example.util.simpletimetracker.core.provider.ContextProvider
 import com.example.util.simpletimetracker.core.utils.applyStatusBarInsets
-import com.example.util.simpletimetracker.core.utils.applySystemBarInsets
 
 abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
 
diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt
index 8540c3dd5..0f93ef593 100644
--- a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt
+++ b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt
@@ -17,7 +17,6 @@ import com.example.util.simpletimetracker.feature_base_adapter.empty.EmptyViewDa
 import com.example.util.simpletimetracker.feature_base_adapter.hint.HintViewData
 import com.example.util.simpletimetracker.feature_base_adapter.hintBig.HintBigViewData
 import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon
-import java.util.SortedMap
 import javax.inject.Inject
 
 class CategoryViewDataMapper @Inject constructor(
diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/RecordTypeInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/RecordTypeInteractor.kt
index afe949ca2..38d6d0365 100644
--- a/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/RecordTypeInteractor.kt
+++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/interactor/RecordTypeInteractor.kt
@@ -2,7 +2,6 @@ package com.example.util.simpletimetracker.domain.interactor
 
 import com.example.util.simpletimetracker.domain.model.CardOrder
 import com.example.util.simpletimetracker.domain.model.RecordType
-import com.example.util.simpletimetracker.domain.repo.ActivityFilterRepo
 import com.example.util.simpletimetracker.domain.repo.RecordRepo
 import com.example.util.simpletimetracker.domain.repo.RecordTagRepo
 import com.example.util.simpletimetracker.domain.repo.RecordToRecordTagRepo
diff --git a/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt b/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt
index 66604426c..49cebc5a7 100644
--- a/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt
+++ b/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/viewModel/ChangeRecordTypeViewModel.kt
@@ -355,7 +355,7 @@ class ChangeRecordTypeViewModel @Inject constructor(
             name = name,
             icon = iconSelectionViewModelDelegateImpl.newIcon,
             color = colorSelectionViewModelDelegateImpl.newColor,
-            instant = newIsInstant
+            instant = newIsInstant,
         )
 
         return recordTypeInteractor.add(recordType)
diff --git a/features/feature_change_record_type/src/main/res/layout/change_record_type_goal_layout.xml b/features/feature_change_record_type/src/main/res/layout/change_record_type_goal_layout.xml
index 8fb9391d4..d72f526f9 100644
--- a/features/feature_change_record_type/src/main/res/layout/change_record_type_goal_layout.xml
+++ b/features/feature_change_record_type/src/main/res/layout/change_record_type_goal_layout.xml
@@ -84,7 +84,7 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/input_field_height"
             android:layout_marginTop="2dp"
-            android:layout_marginEnd="@dimen/input_field_margin"
+            android:layout_marginEnd="@dimen/edit_screen_field_margin_horizontal"
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/fieldRecordTypeGoalType"
@@ -131,7 +131,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginStart="2dp"
-            android:layout_marginEnd="@dimen/edit_screen_field_margin_horizontal"
+            android:layout_marginEnd="8dp"
             android:layout_marginBottom="3dp"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/quickSettings/settings/WidgetQuickSettingsConfigureActivity.kt b/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/quickSettings/settings/WidgetQuickSettingsConfigureActivity.kt
index b9d84b74d..c53ae728e 100644
--- a/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/quickSettings/settings/WidgetQuickSettingsConfigureActivity.kt
+++ b/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/quickSettings/settings/WidgetQuickSettingsConfigureActivity.kt
@@ -34,7 +34,7 @@ class WidgetQuickSettingsConfigureActivity : BaseActivity<Binding>() {
         setResult(RESULT_CANCELED)
     }
 
-    override fun initUx() = with(binding){
+    override fun initUx() = with(binding) {
         layoutWidgetQuickSettingsAllowMultitasking.setOnClick(viewModel::onAllowMultitaskingClicked)
         layoutWidgetQuickSettingsShowTagSelection.setOnClick(viewModel::onShowRecordTagSelectionClicked)
     }
diff --git a/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/single/WidgetSingleTagSelectionActivity.kt b/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/single/WidgetSingleTagSelectionActivity.kt
index bd4279c39..dde0e0017 100644
--- a/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/single/WidgetSingleTagSelectionActivity.kt
+++ b/features/feature_widget/src/main/java/com/example/util/simpletimetracker/feature_widget/single/WidgetSingleTagSelectionActivity.kt
@@ -9,7 +9,6 @@ import com.example.util.simpletimetracker.core.dialog.OnTagSelectedListener
 import com.example.util.simpletimetracker.core.manager.ThemeManager
 import com.example.util.simpletimetracker.core.provider.ContextProvider
 import com.example.util.simpletimetracker.core.utils.activityArgumentDelegate
-import com.example.util.simpletimetracker.core.utils.applyNavBarInsets
 import com.example.util.simpletimetracker.feature_widget.R
 import com.example.util.simpletimetracker.navigation.ScreenFactory
 import com.example.util.simpletimetracker.navigation.params.screen.RecordTagSelectionParams