diff --git a/app/src/main/res/layout/item_file_info.xml b/app/src/main/res/layout/item_file_info.xml
index 342d55a67..1cf81fbea 100644
--- a/app/src/main/res/layout/item_file_info.xml
+++ b/app/src/main/res/layout/item_file_info.xml
@@ -36,12 +36,13 @@
     <ViewSwitcher
         android:id="@+id/file_main_switcher"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:minHeight="48dp">
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/file_container_basic_info"
             android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:background="?android:attr/selectableItemBackground"
             app:layout_constraintTop_toTopOf="parent"
             android:elevation="8dp">
@@ -49,16 +50,14 @@
                 android:id="@+id/file_alias"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:minHeight="48dp"
                 android:layout_centerVertical="true"
                 android:gravity="center_vertical"
                 android:layout_marginStart="@dimen/default_margin"
-                app:layout_goneMarginLeft="@dimen/default_margin"
+                android:layout_marginLeft="@dimen/default_margin"
                 android:layout_marginEnd="@dimen/default_margin"
                 android:layout_marginRight="@dimen/default_margin"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/default_file_button"
                 android:textColor="?attr/textColorInverse"
@@ -67,21 +66,21 @@
                 android:id="@+id/default_file_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/file_information_button"
                 android:button="@drawable/checkbox_star"
                 android:buttonTint="?android:attr/textColorHintInverse"
+                app:buttonTint="?android:attr/textColorHintInverse"
+                android:gravity="center"
                 android:contentDescription="@string/default_checkbox" />
             <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/file_information_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 android:src="@drawable/ic_arrow_down_white_24dp"
                 android:contentDescription="@string/content_description_file_information"
@@ -91,7 +90,7 @@
             android:id="@+id/file_container_alias_register"
             android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:background="?android:attr/selectableItemBackground"
             app:layout_constraintTop_toTopOf="parent"
             android:elevation="8dp">
@@ -103,30 +102,29 @@
                 android:layout_centerVertical="true"
                 android:maxLines="2"
                 android:gravity="center_vertical"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
                 android:layout_marginStart="24dp"
                 android:layout_marginEnd="24dp"
                 android:layout_marginLeft="24dp"
                 android:layout_marginRight="24dp"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/file_alias_save"
                 android:textColor="?attr/textColorInverse"
                 tools:text="DatabaseAlias" />
-            <androidx.appcompat.widget.AppCompatImageView
+            <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/file_alias_save"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:padding="12dp"
                 android:layout_centerVertical="true"
-                android:layout_marginTop="4dp"
-                android:layout_marginBottom="4dp"
                 app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/file_alias_edit"
                 app:layout_constraintEnd_toEndOf="parent"
                 android:src="@drawable/ic_save_white_24dp"
-                android:contentDescription="@string/content_description_file_information"/>
+                android:contentDescription="@string/content_description_file_information"
+                style="@style/KeepassDXStyle.ImageButton.Simple.Secondary"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ViewSwitcher>