diff --git a/app/src/main/res/layout/dialog_login.xml b/app/src/main/res/layout/dialog_login.xml
index 8082e0a55..2ec86362b 100644
--- a/app/src/main/res/layout/dialog_login.xml
+++ b/app/src/main/res/layout/dialog_login.xml
@@ -18,7 +18,8 @@
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginHorizontal="12dp"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginBottom="16dp"
         android:overScrollMode="ifContentScrolls">
 
         <com.google.android.flexbox.FlexboxLayout
diff --git a/app/src/main/res/layout/dialog_verification_code_view.xml b/app/src/main/res/layout/dialog_verification_code_view.xml
index 9bd969434..da8d789e9 100644
--- a/app/src/main/res/layout/dialog_verification_code_view.xml
+++ b/app/src/main/res/layout/dialog_verification_code_view.xml
@@ -20,21 +20,20 @@
         android:layout_height="100dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:scaleType="fitCenter"
-        tools:ignore="UnusedAttribute" />
+        tools:ignore="UnusedAttribute"
+        android:layout_marginHorizontal="16dp"/>
 
-    <io.legato.kazusa.ui.widget.text.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:padding="3dp">
+        android:layout_margin="16dp">
 
-        <io.legato.kazusa.lib.theme.view.ThemeEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/verification_code"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/verification_code"
             tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
-
-    </io.legato.kazusa.ui.widget.text.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_source_edit.xml b/app/src/main/res/layout/item_source_edit.xml
index d58df5028..2e6ab8434 100644
--- a/app/src/main/res/layout/item_source_edit.xml
+++ b/app/src/main/res/layout/item_source_edit.xml
@@ -5,7 +5,7 @@
     android:id="@+id/textInputLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingVertical="8dp">
+    android:paddingVertical="4dp">
 
     <io.legato.kazusa.ui.widget.code.CodeView
         android:id="@+id/editText"