diff --git a/Habitica/res/layout/activity_task_form.xml b/Habitica/res/layout/activity_task_form.xml
index f92d2ed2d..1c61a79e2 100644
--- a/Habitica/res/layout/activity_task_form.xml
+++ b/Habitica/res/layout/activity_task_form.xml
@@ -371,7 +371,8 @@
 
                 <EditText
                     android:id="@+id/new_reminder_edittext"
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:hint="@string/start_date"
diff --git a/Habitica/res/layout/reminder_item.xml b/Habitica/res/layout/reminder_item.xml
index 37082b58b..c7bf48246 100644
--- a/Habitica/res/layout/reminder_item.xml
+++ b/Habitica/res/layout/reminder_item.xml
@@ -8,7 +8,8 @@
 
     <EditText
         android:id="@+id/item_edittext"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
+        android:layout_weight="1"
         android:layout_height="wrap_content"
         android:textColor="@android:color/black"
         android:focusable="false" />
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
index c6ca915dd..022b87906 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
@@ -570,11 +570,8 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
             int hour = mcurrentTime.get(Calendar.HOUR_OF_DAY);
             int minute = mcurrentTime.get(Calendar.MINUTE);
             TimePickerDialog mTimePicker;
-            mTimePicker = new TimePickerDialog(TaskFormActivity.this, new TimePickerDialog.OnTimeSetListener() {
-                @Override
-                public void onTimeSet(TimePicker timePicker, int selectedHour, int selectedMinute) {
-                    newRemindersEditText.setText( selectedHour + ":" + selectedMinute);
-                }
+            mTimePicker = new TimePickerDialog(TaskFormActivity.this, (timePicker, selectedHour, selectedMinute) -> {
+                newRemindersEditText.setText(String.format("%d:%02d", selectedHour, selectedMinute));
             }, hour, minute, true);
             mTimePicker.setTitle("Select Time");
             mTimePicker.show();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
index a0cdf6660..935a4a8e3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
@@ -1,28 +1,22 @@
 package com.habitrpg.android.habitica.ui.adapter.tasks;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
+import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder;
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
+
 import android.app.TimePickerDialog;
 import android.graphics.Color;
 import android.support.v7.widget.RecyclerView;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.TimePicker;
 
-import com.github.data5tream.emojilib.EmojiEditText;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
-import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
-
-import java.util.Calendar;
-import java.util.Date;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import butterknife.BindView;
@@ -42,14 +36,13 @@ public class RemindersAdapter extends RecyclerView.Adapter<RemindersAdapter.Item
     @Override
     public ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.reminder_item, parent, false);
-        ItemViewHolder itemViewHolder = new ItemViewHolder(view);
-        return itemViewHolder;
+        return new ItemViewHolder(view);
     }
 
     @Override
     public void onBindViewHolder(final ItemViewHolder holder, int position) {
         Date time = reminders.get(position).getTime();
-        holder.reminderItemTextView.setText(time.getHours() + ":" + time.getMinutes());
+        holder.reminderItemTextView.setText(String.format("%d:%02d", time.getHours(), time.getMinutes()));
         holder.hour = time.getHours();
         holder.minute = time.getMinutes();
     }
@@ -103,7 +96,7 @@ public class RemindersAdapter extends RecyclerView.Adapter<RemindersAdapter.Item
             reminderItemTextView.setOnClickListener(v -> {
                 TimePickerDialog timePicker;
                 timePicker = new TimePickerDialog(v.getContext(), (timePicker1, selectedHour, selectedMinute) -> {
-                    reminderItemTextView.setText( selectedHour + ":" + selectedMinute);
+                    reminderItemTextView.setText(String.format("%d:%02d", selectedHour, selectedMinute));
 
                     RemindersItem reminder = reminders.get(getAdapterPosition());
                     Date time = reminder.getTime();