diff --git a/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt b/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt
index b4d8c35c..b66d3ea5 100644
--- a/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt
+++ b/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt
@@ -96,7 +96,10 @@ class ChangeRecordTypeFragment :
     }
     private val iconCategoriesAdapter: BaseRecyclerAdapter by lazy {
         BaseRecyclerAdapter(
-            createChangeRecordTypeIconCategoryAdapterDelegate(viewModel::onIconCategoryClick)
+            createChangeRecordTypeIconCategoryAdapterDelegate {
+                viewModel.onIconCategoryClick(it)
+                binding.rvChangeRecordTypeIcon.stopScroll()
+            }
         )
     }
     private val categoriesAdapter: BaseRecyclerAdapter by lazy {
@@ -200,6 +203,11 @@ class ChangeRecordTypeFragment :
                 arrowChangeRecordTypeColor.apply {
                     if (opened) rotateDown() else rotateUp()
                 }
+
+                inputChangeRecordTypeName.isVisible = !opened
+                fieldChangeRecordTypeIcon.isVisible = !opened
+                fieldChangeRecordTypeCategory.isVisible = !opened
+                containerChangeRecordTypeGoalTime.isVisible = !opened
             }
             flipIconChooser.observe { opened ->
                 containerChangeRecordTypeIcon.isVisible = opened
@@ -207,6 +215,11 @@ class ChangeRecordTypeFragment :
                 arrowChangeRecordTypeIcon.apply {
                     if (opened) rotateDown() else rotateUp()
                 }
+
+                inputChangeRecordTypeName.isVisible = !opened
+                fieldChangeRecordTypeColor.isVisible = !opened
+                fieldChangeRecordTypeCategory.isVisible = !opened
+                containerChangeRecordTypeGoalTime.isVisible = !opened
             }
             flipCategoryChooser.observe { opened ->
                 rvChangeRecordTypeCategories.isVisible = opened
@@ -214,6 +227,11 @@ class ChangeRecordTypeFragment :
                 arrowChangeRecordTypeCategory.apply {
                     if (opened) rotateDown() else rotateUp()
                 }
+
+                inputChangeRecordTypeName.isVisible = !opened
+                fieldChangeRecordTypeColor.isVisible = !opened
+                fieldChangeRecordTypeIcon.isVisible = !opened
+                containerChangeRecordTypeGoalTime.isVisible = !opened
             }
             keyboardVisibility.observe { visible ->
                 if (visible) showKeyboard(etChangeRecordTypeName) else hideKeyboard()
diff --git a/features/feature_change_record_type/src/main/res/layout/change_record_type_fragment.xml b/features/feature_change_record_type/src/main/res/layout/change_record_type_fragment.xml
index 1bea2170..9bee9b1b 100644
--- a/features/feature_change_record_type/src/main/res/layout/change_record_type_fragment.xml
+++ b/features/feature_change_record_type/src/main/res/layout/change_record_type_fragment.xml
@@ -6,231 +6,256 @@
     android:layout_height="match_parent"
     android:animateLayoutChanges="true">
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/btnChangeRecordTypeDelete"
-        android:layout_width="28dp"
-        android:layout_height="28dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:background="?selectableItemBackgroundBorderless"
-        android:clickable="true"
-        android:focusable="true"
-        android:src="@drawable/archive"
-        android:tint="?appInactiveColor"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
-    <com.example.util.simpletimetracker.feature_views.RecordTypeView
-        android:id="@+id/previewChangeRecordType"
-        style="@style/RecordTypeItem"
-        android:layout_marginTop="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:itemName="Name" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/inputChangeRecordTypeName"
-        style="@style/ChangeItemInputField"
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/containerChangeRecordTypeMain"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="20dp"
-        app:layout_constraintTop_toBottomOf="@id/previewChangeRecordType">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/etChangeRecordTypeName"
-            style="@style/ChangeItemNameEditText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:hint="@string/change_record_type_name_hint" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/fieldChangeRecordTypeColor"
-        style="@style/InputFieldCard"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/input_field_height"
-        android:layout_marginStart="@dimen/input_field_margin"
-        android:layout_marginTop="8dp"
-        app:layout_constraintEnd_toStartOf="@id/fieldChangeRecordTypeIcon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/inputChangeRecordTypeName">
+        app:layout_constraintBottom_toTopOf="@id/btnChangeRecordTypeSave"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?appInputFieldBorder">
+            android:layout_height="match_parent">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/InputFieldCardText"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:maxLines="1"
-                android:text="@string/change_record_type_color_hint"
-                app:layout_constraintEnd_toStartOf="@id/arrowChangeRecordTypeColor"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <ImageView
-                android:id="@+id/arrowChangeRecordTypeColor"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/btnChangeRecordTypeDelete"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:layout_marginTop="8dp"
                 android:layout_marginEnd="8dp"
                 android:background="?selectableItemBackgroundBorderless"
-                android:src="?appArrow"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:clickable="true"
+                android:focusable="true"
+                android:src="@drawable/archive"
+                android:tint="?appInactiveColor"
+                android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:ignore="ContentDescription" />
+                tools:visibility="visible" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/fieldChangeRecordTypeIcon"
-        style="@style/InputFieldCard"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/input_field_height"
-        android:layout_marginTop="8dp"
-        app:layout_constraintEnd_toStartOf="@id/fieldChangeRecordTypeCategory"
-        app:layout_constraintStart_toEndOf="@id/fieldChangeRecordTypeColor"
-        app:layout_constraintTop_toBottomOf="@id/inputChangeRecordTypeName">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?appInputFieldBorder">
-
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/InputFieldCardText"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:maxLines="1"
-                android:text="@string/change_record_type_icon_image_hint"
-                app:layout_constraintEnd_toStartOf="@id/arrowChangeRecordTypeIcon"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <ImageView
-                android:id="@+id/arrowChangeRecordTypeIcon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginEnd="8dp"
-                android:background="?selectableItemBackgroundBorderless"
-                android:src="?appArrow"
-                app:layout_constraintBottom_toBottomOf="parent"
+            <com.example.util.simpletimetracker.feature_views.RecordTypeView
+                android:id="@+id/previewChangeRecordType"
+                style="@style/RecordTypeItem"
+                android:layout_marginTop="8dp"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:ignore="ContentDescription" />
+                tools:itemName="Name" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/inputChangeRecordTypeName"
+                style="@style/ChangeItemInputField"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20dp"
+                app:layout_constraintTop_toBottomOf="@id/previewChangeRecordType">
 
-    </androidx.cardview.widget.CardView>
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/etChangeRecordTypeName"
+                    style="@style/ChangeItemNameEditText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/change_record_type_name_hint" />
 
-    <androidx.cardview.widget.CardView
-        android:id="@+id/fieldChangeRecordTypeCategory"
-        style="@style/InputFieldCard"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/input_field_height"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="@dimen/input_field_margin"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/fieldChangeRecordTypeIcon"
-        app:layout_constraintTop_toBottomOf="@id/inputChangeRecordTypeName">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?appInputFieldBorder">
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/InputFieldCardText"
+            <androidx.cardview.widget.CardView
+                android:id="@+id/fieldChangeRecordTypeColor"
+                style="@style/InputFieldCard"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:maxLines="1"
-                android:text="@string/category_hint"
-                app:layout_constraintEnd_toStartOf="@id/arrowChangeRecordTypeCategory"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <ImageView
-                android:id="@+id/arrowChangeRecordTypeCategory"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginEnd="8dp"
-                android:background="?selectableItemBackgroundBorderless"
-                android:src="?appArrow"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_height="@dimen/input_field_height"
+                android:layout_marginHorizontal="@dimen/input_field_margin"
+                android:layout_marginTop="3dp"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:ignore="ContentDescription" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="20dp"
-        android:layout_marginTop="8dp"
-        app:layout_constraintTop_toBottomOf="@id/fieldChangeRecordTypeColor">
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tvChangeRecordTypeGoalTime"
-            style="@style/SettingsText"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:padding="0dp"
-            android:text="@string/change_record_type_goal_time"
-            app:layout_constraintEnd_toStartOf="@id/groupChangeRecordTypeGoalTime"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/SettingsSecondaryText"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:padding="0dp"
-            android:text="@string/change_record_type_goal_time_hint"
-            app:layout_constraintEnd_toStartOf="@id/groupChangeRecordTypeGoalTime"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvChangeRecordTypeGoalTime" />
-
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:id="@+id/groupChangeRecordTypeGoalTime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tvChangeRecordTypeGoalTimeTime"
-                android:layout_width="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/inputChangeRecordTypeName">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="?appInputFieldBorder">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/InputFieldCardText"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:ellipsize="end"
+                        android:gravity="center_vertical"
+                        android:maxLines="1"
+                        android:text="@string/change_record_type_color_hint"
+                        app:layout_constraintEnd_toStartOf="@id/arrowChangeRecordTypeColor"
+                        app:layout_constraintStart_toStartOf="parent" />
+
+                    <ImageView
+                        android:id="@+id/arrowChangeRecordTypeColor"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_marginEnd="8dp"
+                        android:background="?selectableItemBackgroundBorderless"
+                        android:src="?appArrow"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:ignore="ContentDescription" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/fieldChangeRecordTypeIcon"
+                style="@style/InputFieldCard"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/input_field_height"
+                android:layout_marginStart="@dimen/input_field_margin"
+                app:layout_constraintEnd_toStartOf="@id/fieldChangeRecordTypeCategory"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/fieldChangeRecordTypeColor"
+                app:layout_goneMarginEnd="@dimen/input_field_margin">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="?appInputFieldBorder">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/InputFieldCardText"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:ellipsize="end"
+                        android:gravity="center_vertical"
+                        android:maxLines="1"
+                        android:text="@string/change_record_type_icon_image_hint"
+                        app:layout_constraintEnd_toStartOf="@id/arrowChangeRecordTypeIcon"
+                        app:layout_constraintStart_toStartOf="parent" />
+
+                    <ImageView
+                        android:id="@+id/arrowChangeRecordTypeIcon"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_marginEnd="8dp"
+                        android:background="?selectableItemBackgroundBorderless"
+                        android:src="?appArrow"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:ignore="ContentDescription" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/fieldChangeRecordTypeCategory"
+                style="@style/InputFieldCard"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/input_field_height"
+                android:layout_marginEnd="@dimen/input_field_margin"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/fieldChangeRecordTypeIcon"
+                app:layout_constraintTop_toBottomOf="@id/fieldChangeRecordTypeColor"
+                app:layout_goneMarginStart="@dimen/input_field_margin">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="?appInputFieldBorder">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/InputFieldCardText"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:ellipsize="end"
+                        android:gravity="center_vertical"
+                        android:maxLines="1"
+                        android:text="@string/category_hint"
+                        app:layout_constraintEnd_toStartOf="@id/arrowChangeRecordTypeCategory"
+                        app:layout_constraintStart_toStartOf="parent" />
+
+                    <ImageView
+                        android:id="@+id/arrowChangeRecordTypeCategory"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_marginEnd="8dp"
+                        android:background="?selectableItemBackgroundBorderless"
+                        android:src="?appArrow"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        tools:ignore="ContentDescription" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/barrierChangeRecordTypeGoalTime"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="end|center_vertical"
-                android:paddingHorizontal="8dp"
-                android:textColor="?appTextPrimaryColor"
-                tools:text="99h 99m 99s" />
+                app:barrierDirection="bottom"
+                app:constraint_referenced_ids="fieldChangeRecordTypeIcon, fieldChangeRecordTypeCategory" />
 
-            <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="24dp"
-                android:layout_height="match_parent"
-                android:background="?selectableItemBackgroundBorderless"
-                android:src="?appArrow"
-                tools:ignore="ContentDescription" />
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/containerChangeRecordTypeGoalTime"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20dp"
+                android:layout_marginTop="8dp"
+                app:layout_constraintTop_toBottomOf="@id/barrierChangeRecordTypeGoalTime">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvChangeRecordTypeGoalTime"
+                    style="@style/SettingsText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="0dp"
+                    android:text="@string/change_record_type_goal_time"
+                    app:layout_constraintEnd_toStartOf="@id/groupChangeRecordTypeGoalTime"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/SettingsSecondaryText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:padding="0dp"
+                    android:text="@string/change_record_type_goal_time_hint"
+                    app:layout_constraintEnd_toStartOf="@id/groupChangeRecordTypeGoalTime"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tvChangeRecordTypeGoalTime" />
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/groupChangeRecordTypeGoalTime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/tvChangeRecordTypeGoalTimeTime"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="end|center_vertical"
+                        android:paddingHorizontal="8dp"
+                        android:textColor="?appTextPrimaryColor"
+                        tools:text="99h 99m 99s" />
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="24dp"
+                        android:layout_height="match_parent"
+                        android:background="?selectableItemBackgroundBorderless"
+                        android:src="?appArrow"
+                        tools:ignore="ContentDescription" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvChangeRecordTypeColor"
@@ -243,7 +268,7 @@
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@id/btnChangeRecordTypeSave"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/fieldChangeRecordTypeColor"
+        app:layout_constraintTop_toBottomOf="@id/containerChangeRecordTypeMain"
         tools:itemCount="3"
         tools:listitem="@layout/item_color_layout"
         tools:visibility="gone" />
@@ -258,10 +283,11 @@
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@id/btnChangeRecordTypeSave"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/fieldChangeRecordTypeIcon"
-        tools:visibility="visible">
+        app:layout_constraintTop_toBottomOf="@id/containerChangeRecordTypeMain"
+        tools:visibility="gone">
 
         <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarChangeRecordTypeIcon"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?android:colorBackground"
@@ -271,7 +297,7 @@
                 android:id="@+id/btnChangeRecordTypeIconSwitch"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_scrollFlags="scroll" />
+                app:layout_scrollFlags="scroll|snap" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rvChangeRecordTypeIconCategory"
@@ -280,7 +306,7 @@
                 android:layout_marginStart="8dp"
                 android:layout_marginEnd="8dp"
                 android:overScrollMode="never"
-                app:layout_scrollFlags="scroll|enterAlways"
+                app:layout_scrollFlags="scroll|enterAlways|snap"
                 tools:itemCount="1"
                 tools:listitem="@layout/change_record_type_item_icon_category_layout" />
 
@@ -329,7 +355,7 @@
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@id/btnChangeRecordTypeSave"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/fieldChangeRecordTypeIcon"
+        app:layout_constraintTop_toBottomOf="@id/containerChangeRecordTypeMain"
         tools:itemCount="3"
         tools:listitem="@layout/item_category_layout"
         tools:visibility="gone" />