diff --git a/core/src/main/res/layout/notes.xml b/core/src/main/res/layout/notes.xml
index d350f6fb21..9ee27909a4 100644
--- a/core/src/main/res/layout/notes.xml
+++ b/core/src/main/res/layout/notes.xml
@@ -1,25 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/notes_layout"
+xmlns:app="http://schemas.android.com/apk/res-auto"
+android:id="@+id/notes_layout"
+android:layout_width="match_parent"
+android:layout_height="wrap_content"
+android:orientation="horizontal">
+
+<com.google.android.material.textfield.TextInputLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+    android:hint="@string/notes_label"
+    app:boxStrokeColor="@color/mtrl_textinput_default_box_stroke_color"
+    android:textColorHint="?attr/colorOnPrimary"
+    app:hintTextColor="?attr/colorOnPrimary"
+    app:endIconMode="clear_text">
 
-    <TextView
-        android:labelFor="@+id/notes"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:width="120dp"
-        android:padding="10dp"
-        android:text="@string/notes_label"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textStyle="bold" />
-
-    <EditText
+    <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/notes"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1"
+        android:autofillHints="@string/notes_label"
+        android:gravity="start"
+        android:textStyle="bold"
         android:width="180dp"
-        android:inputType="text" />
+        android:inputType="text|textCapSentences" />
+
+</com.google.android.material.textfield.TextInputLayout>
+
 </LinearLayout>
diff --git a/core/src/main/res/values-night/colors.xml b/core/src/main/res/values-night/colors.xml
index b12d342936..746b87f239 100644
--- a/core/src/main/res/values-night/colors.xml
+++ b/core/src/main/res/values-night/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Default theme color -->
     <!-- This section describes the main theme colors -->
     <color name="colorPrimary">#212121</color>
@@ -245,6 +245,8 @@
     <!-- Button icons - general -->
     <color name="pod_icon_outline">#9E9E9E</color>
 
+    <color name="mtrl_textinput_default_box_stroke_color" tools:override="true" >#9E9E9E</color>
+
     <!-- Omnipod Wizard -->
     <color name="omnipod_wizard_progress_bar">#0099CC</color>
     <color name="omnipod_wizard_finish_button">#ff669900</color>
diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml
index 67d8b27049..dba4f1fbac 100644
--- a/core/src/main/res/values-night/styles.xml
+++ b/core/src/main/res/values-night/styles.xml
@@ -96,7 +96,7 @@
         <!---Toast  -->
         <item name="toastBaseTextColor">@color/toastBase</item>
         <!---Input  -->
-        <item name="boxStrokeColor">@color/white</item>
+        <item name="boxStrokeColor">@color/white_alpha_20</item>
         <!---Profile Helper  -->
         <item name="tabBgColorSelected">@color/tabBgColorSelected</item>
         <!---Dialog Helper  -->
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index d46e136e6f..3f633cc56a 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Default theme color -->
     <!-- This section describes the main theme colors -->
     <color name="colorPrimary">#FBF9FF</color>
@@ -249,6 +249,8 @@
     <!-- Button icons - general -->
     <color name="pod_icon_outline">#9E9E9E</color>
 
+    <color name="mtrl_textinput_default_box_stroke_color" tools:override="true" >#9E9E9E</color>
+
     <!-- Omnipod Wizard -->
     <color name="omnipod_wizard_progress_bar">#0099CC</color>
     <color name="omnipod_wizard_finish_button">#ff669900</color>