diff --git a/component/common/src/main/res/layout/lacerta_dialog_create_tag.xml b/component/common/src/main/res/layout/lacerta_dialog_create_tag.xml
index 9a8fd21f..8cd6efb9 100644
--- a/component/common/src/main/res/layout/lacerta_dialog_create_tag.xml
+++ b/component/common/src/main/res/layout/lacerta_dialog_create_tag.xml
@@ -4,17 +4,33 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/tag_name_edit_text"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/tag_name_text_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="16dp"/>
+        android:paddingTop="8dp"
+        android:paddingHorizontal="16dp"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
-    <!-- todo: add color picker -->
-    <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/tag_color_edit_text"
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/tag_name_edit_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/tag_color_text_input_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="16dp"/>
+        android:paddingTop="8dp"
+        android:paddingHorizontal="16dp"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox">
 
+        <!-- todo: add color picker -->
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/tag_color_edit_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </com.google.android.material.textfield.TextInputLayout>
 </LinearLayout>
\ No newline at end of file