diff --git a/app/src/main/res/layout/custom_repository_delete_dialog.xml b/app/src/main/res/layout/custom_repository_delete_dialog.xml
index a16fe896..7ee84e60 100644
--- a/app/src/main/res/layout/custom_repository_delete_dialog.xml
+++ b/app/src/main/res/layout/custom_repository_delete_dialog.xml
@@ -43,6 +43,7 @@
             app:hintTextColor="?attr/hintColor"
             app:boxStrokeErrorColor="@color/darkRed"
             android:layout_marginBottom="8dp"
+            android:layout_marginTop="8dp"
             android:hint="@string/newRepoTintCopy">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -77,14 +78,14 @@
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
         android:orientation="horizontal" >
 
         <Button
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="60dp"
             style="?android:attr/button"
             android:layout_alignParentStart="true"
             android:text="@string/cancelButton"
@@ -94,7 +95,7 @@
         <Button
             android:id="@+id/delete"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="60dp"
             style="?android:attr/button"
             android:layout_alignParentEnd="true"
             android:text="@string/menuDeleteText"
diff --git a/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml b/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml
index 47db4be1..61b53dec 100644
--- a/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml
+++ b/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml
@@ -62,6 +62,7 @@
                     app:hintTextColor="?attr/hintColor"
                     app:boxStrokeErrorColor="@color/darkRed"
                     android:layout_marginBottom="8dp"
+                    android:layout_marginTop="8dp"
                     android:hint="@string/websiteText">
 
                     <com.google.android.material.textfield.TextInputEditText
@@ -83,6 +84,8 @@
                     android:textColorHint="?attr/hintColor"
                     app:hintTextColor="?attr/hintColor"
                     app:boxStrokeErrorColor="@color/darkRed"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="8dp"
                     android:hint="@string/newRepoDescTintCopy">
 
                     <com.google.android.material.textfield.TextInputEditText
@@ -197,14 +200,14 @@
                 android:layout_height="wrap_content"
                 android:paddingStart="16dp"
                 android:paddingEnd="16dp"
-                android:paddingTop="4dp"
-                android:paddingBottom="4dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
                 android:orientation="horizontal" >
 
                 <Button
                     android:id="@+id/cancel"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="60dp"
                     style="?android:attr/button"
                     android:layout_alignParentStart="true"
                     android:text="@string/cancelButton"
@@ -214,7 +217,7 @@
                 <Button
                     android:id="@+id/save"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="60dp"
                     style="?android:attr/button"
                     android:layout_alignParentEnd="true"
                     android:text="@string/saveButton"
diff --git a/app/src/main/res/layout/custom_repository_transfer_dialog.xml b/app/src/main/res/layout/custom_repository_transfer_dialog.xml
index cc693139..19ff67d4 100644
--- a/app/src/main/res/layout/custom_repository_transfer_dialog.xml
+++ b/app/src/main/res/layout/custom_repository_transfer_dialog.xml
@@ -44,6 +44,7 @@
             app:hintTextColor="?attr/hintColor"
             app:boxStrokeErrorColor="@color/darkRed"
             android:layout_marginBottom="8dp"
+            android:layout_marginTop="8dp"
             android:hint="@string/newRepoTintCopy">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -66,6 +67,7 @@
             app:hintTextColor="?attr/hintColor"
             app:boxStrokeErrorColor="@color/darkRed"
             android:layout_marginBottom="8dp"
+            android:layout_marginTop="8dp"
             android:hint="@string/repoTransferOwnerText">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -100,14 +102,14 @@
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
         android:orientation="horizontal" >
 
         <Button
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="60dp"
             style="?android:attr/button"
             android:layout_alignParentStart="true"
             android:text="@string/cancelButton"
@@ -117,7 +119,7 @@
         <Button
             android:id="@+id/transfer"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="60dp"
             style="?android:attr/button"
             android:layout_alignParentEnd="true"
             android:text="@string/repoTransferText"
diff --git a/app/src/main/res/layout/custom_user_accounts_dialog.xml b/app/src/main/res/layout/custom_user_accounts_dialog.xml
index 2035babb..873444ff 100644
--- a/app/src/main/res/layout/custom_user_accounts_dialog.xml
+++ b/app/src/main/res/layout/custom_user_accounts_dialog.xml
@@ -28,7 +28,7 @@
     <Button
         android:id="@+id/manageAccounts"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="60dp"
         android:layout_margin="16dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"