diff --git a/app/src/main/java/io/timelimit/android/ui/manage/category/settings/CategorySettingsFragment.kt b/app/src/main/java/io/timelimit/android/ui/manage/category/settings/CategorySettingsFragment.kt
index 8669a03..4b0bcd1 100644
--- a/app/src/main/java/io/timelimit/android/ui/manage/category/settings/CategorySettingsFragment.kt
+++ b/app/src/main/java/io/timelimit/android/ui/manage/category/settings/CategorySettingsFragment.kt
@@ -23,13 +23,13 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import com.google.android.material.snackbar.Snackbar
 import io.timelimit.android.R
+import io.timelimit.android.databinding.FragmentCategorySettingsBinding
 import io.timelimit.android.logic.AppLogic
 import io.timelimit.android.logic.DefaultAppLogic
 import io.timelimit.android.sync.actions.SetCategoryExtraTimeAction
 import io.timelimit.android.ui.main.ActivityViewModel
 import io.timelimit.android.ui.main.getActivityViewModel
 import io.timelimit.android.ui.manage.category.ManageCategoryFragmentArgs
-import kotlinx.android.synthetic.main.fragment_category_settings.*
 
 class CategorySettingsFragment : Fragment() {
     companion object {
@@ -45,30 +45,25 @@ class CategorySettingsFragment : Fragment() {
     private val auth: ActivityViewModel by lazy { getActivityViewModel(activity!!) }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_category_settings, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+        val binding = FragmentCategorySettingsBinding.inflate(inflater, container, false)
 
         val categoryEntry = appLogic.database.category().getCategoryByChildIdAndId(params.childId, params.categoryId)
 
-        btn_delete_category.setOnClickListener { deleteCategory() }
-
-        edit_category_title_go.setOnClickListener { renameCategory() }
+        binding.btnDeleteCategory.setOnClickListener { deleteCategory() }
+        binding.editCategoryTitleGo.setOnClickListener { renameCategory() }
 
         categoryEntry.observe(this, Observer {
             if (it != null) {
                 val roundedCurrentTimeInMillis = (it.extraTimeInMillis / (1000 * 60)) * (1000 * 60)
 
-                if (extra_time_selection.timeInMillis != roundedCurrentTimeInMillis) {
-                    extra_time_selection.timeInMillis = roundedCurrentTimeInMillis
+                if (binding.extraTimeSelection.timeInMillis != roundedCurrentTimeInMillis) {
+                    binding.extraTimeSelection.timeInMillis = roundedCurrentTimeInMillis
                 }
             }
         })
 
-        extra_time_btn_ok.setOnClickListener {
-            val newExtraTime = extra_time_selection.timeInMillis
+        binding.extraTimeBtnOk.setOnClickListener {
+            val newExtraTime = binding.extraTimeSelection.timeInMillis
 
             if (
                     auth.tryDispatchParentAction(
@@ -78,9 +73,11 @@ class CategorySettingsFragment : Fragment() {
                             )
                     )
             ) {
-                Snackbar.make(view, R.string.category_settings_extra_time_change_toast, Snackbar.LENGTH_SHORT).show()
+                Snackbar.make(binding.root, R.string.category_settings_extra_time_change_toast, Snackbar.LENGTH_SHORT).show()
             }
         }
+
+        return binding.root
     }
 
     private fun renameCategory() {
diff --git a/app/src/main/res/layout/fragment_category_settings.xml b/app/src/main/res/layout/fragment_category_settings.xml
index 504dfb3..6f75651 100644
--- a/app/src/main/res/layout/fragment_category_settings.xml
+++ b/app/src/main/res/layout/fragment_category_settings.xml
@@ -13,84 +13,89 @@
     You should have received a copy of the GNU General Public License
     along with this program. If not, see <https://www.gnu.org/licenses/>.
 -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<layout 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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context="io.timelimit.android.ui.manage.category.settings.CategorySettingsFragment">
-    <LinearLayout
-        android:padding="8dp"
-        android:orientation="vertical"
+
+    <ScrollView
+        android:id="@+id/scroll"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent">
 
-        <androidx.cardview.widget.CardView
-            app:cardUseCompatPadding="true"
+        <LinearLayout
+            android:padding="8dp"
+            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-            <LinearLayout
-                android:padding="8dp"
-                android:orientation="vertical"
+
+            <androidx.cardview.widget.CardView
+                app:cardUseCompatPadding="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-
-                <TextView
-                    android:text="@string/category_settings_extra_time_title"
-                    android:textAppearance="?android:textAppearanceLarge"
+                <LinearLayout
+                    android:padding="8dp"
+                    android:orientation="vertical"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content">
 
-                <TextView
-                    android:textAppearance="?android:textAppearanceMedium"
-                    android:text="@string/category_settings_extra_time_info"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    <TextView
+                        android:text="@string/category_settings_extra_time_title"
+                        android:textAppearance="?android:textAppearanceLarge"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
 
-                <io.timelimit.android.ui.view.SelectTimeSpanView
-                    android:id="@+id/extra_time_selection"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    <TextView
+                        android:textAppearance="?android:textAppearanceMedium"
+                        android:text="@string/category_settings_extra_time_info"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
 
-                <Button
-                    android:id="@+id/extra_time_btn_ok"
-                    android:text="@string/category_settings_extra_time_change"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
+                    <io.timelimit.android.ui.view.SelectTimeSpanView
+                        android:id="@+id/extra_time_selection"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
 
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                    <Button
+                        android:id="@+id/extra_time_btn_ok"
+                        android:text="@string/category_settings_extra_time_change"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
 
-        <androidx.cardview.widget.CardView
-            app:cardUseCompatPadding="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <LinearLayout
-                android:padding="8dp"
-                android:orientation="vertical"
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+
+            <androidx.cardview.widget.CardView
+                app:cardUseCompatPadding="true"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
-
-                <TextView
-                    android:textAppearance="?android:textAppearanceLarge"
-                    android:text="@string/generic_manage_card"
+                <LinearLayout
+                    android:padding="8dp"
+                    android:orientation="vertical"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="wrap_content">
 
-                <Button
-                    android:id="@+id/edit_category_title_go"
-                    android:text="@string/category_settings_rename"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    <TextView
+                        android:textAppearance="?android:textAppearanceLarge"
+                        android:text="@string/generic_manage_card"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
 
-                <Button
-                    android:id="@+id/btn_delete_category"
-                    android:text="@string/category_settings_delete"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                    <Button
+                        android:id="@+id/edit_category_title_go"
+                        android:text="@string/category_settings_rename"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
 
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                    <Button
+                        android:id="@+id/btn_delete_category"
+                        android:text="@string/category_settings_delete"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
 
-    </LinearLayout>
-</ScrollView>
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+
+        </LinearLayout>
+    </ScrollView>
+</layout>