diff --git a/app/src/main/java/org/tasks/injection/FragmentComponent.java b/app/src/main/java/org/tasks/injection/FragmentComponent.java
index 6515937d1..4a9affde0 100644
--- a/app/src/main/java/org/tasks/injection/FragmentComponent.java
+++ b/app/src/main/java/org/tasks/injection/FragmentComponent.java
@@ -27,6 +27,7 @@ import org.tasks.preferences.fragments.TaskerListNotification;
 import org.tasks.ui.CalendarControlSet;
 import org.tasks.ui.DeadlineControlSet;
 import org.tasks.ui.DescriptionControlSet;
+import org.tasks.ui.EmptyTaskEditFragment;
 import org.tasks.ui.LocationControlSet;
 import org.tasks.ui.NavigationDrawerFragment;
 import org.tasks.ui.PriorityControlSet;
@@ -98,4 +99,6 @@ public interface FragmentComponent {
   void inject(@NonNull DashClock dashClock);
 
   void inject(@NonNull TaskerListNotification taskerListNotification);
+
+  void inject(EmptyTaskEditFragment emptyTaskEditFragment);
 }
diff --git a/app/src/main/java/org/tasks/ui/EmptyTaskEditFragment.java b/app/src/main/java/org/tasks/ui/EmptyTaskEditFragment.java
deleted file mode 100644
index a778274d5..000000000
--- a/app/src/main/java/org/tasks/ui/EmptyTaskEditFragment.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.tasks.ui;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import org.tasks.R;
-
-public class EmptyTaskEditFragment extends Fragment {
-
-  @Nullable
-  @Override
-  public View onCreateView(
-      LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-    return inflater.inflate(R.layout.fragment_task_edit_empty, container, false);
-  }
-}
diff --git a/app/src/main/java/org/tasks/ui/EmptyTaskEditFragment.kt b/app/src/main/java/org/tasks/ui/EmptyTaskEditFragment.kt
new file mode 100644
index 000000000..b9d0056ec
--- /dev/null
+++ b/app/src/main/java/org/tasks/ui/EmptyTaskEditFragment.kt
@@ -0,0 +1,28 @@
+package org.tasks.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import org.tasks.databinding.FragmentTaskEditEmptyBinding
+import org.tasks.injection.FragmentComponent
+import org.tasks.injection.InjectingFragment
+import org.tasks.themes.ThemeColor
+import javax.inject.Inject
+
+class EmptyTaskEditFragment : InjectingFragment() {
+
+    @Inject lateinit var themeColor: ThemeColor
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+    ): View? {
+        val binding = FragmentTaskEditEmptyBinding.inflate(inflater)
+
+        themeColor.apply(binding.toolbar.toolbar)
+
+        return binding.root
+    }
+
+    override fun inject(component: FragmentComponent) = component.inject(this)
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_task_edit_empty.xml b/app/src/main/res/layout/fragment_task_edit_empty.xml
index 278a47fc6..63b4ac546 100644
--- a/app/src/main/res/layout/fragment_task_edit_empty.xml
+++ b/app/src/main/res/layout/fragment_task_edit_empty.xml
@@ -4,6 +4,8 @@
   android:layout_height="fill_parent"
   android:orientation="vertical">
 
-  <include layout="@layout/toolbar"/>
+  <include
+    android:id="@+id/toolbar"
+    layout="@layout/toolbar" />
 
 </LinearLayout>