diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index eaeea845..183bf467 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -6,33 +6,37 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="fill_parent"
-  android:layout_height="wrap_content"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
   android:orientation="vertical"
-  android:padding="16dp"
+  android:paddingTop="16dp"
   tools:context=".ui.crypto.DecryptActivity">
 
   <androidx.appcompat.widget.AppCompatTextView
     android:id="@+id/password_category"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
-    android:layout_marginStart="16dp"
+    android:layout_marginStart="32dp"
+    android:layout_marginEnd="16dp"
     android:textIsSelectable="false"
     android:textSize="18sp"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     tools:text="CATEGORY HERE" />
 
   <androidx.appcompat.widget.AppCompatTextView
     android:id="@+id/password_file"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/activity_horizontal_margin"
+    android:layout_marginStart="32dp"
+    android:layout_marginEnd="16dp"
     android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
     android:textColor="?attr/colorSecondary"
     android:textSize="24sp"
     android:textStyle="bold"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@id/password_category"
     tools:text="PASSWORD FILE NAME HERE" />
@@ -41,8 +45,7 @@
     android:id="@+id/divider"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="16dp"
-    android:layout_marginBottom="16dp"
+    android:layout_margin="16dp"
     android:src="@drawable/divider"
     app:layout_constraintTop_toBottomOf="@id/password_file"
     tools:ignore="ContentDescription" />
@@ -50,8 +53,10 @@
   <androidx.recyclerview.widget.RecyclerView
     android:id="@+id/recycler_view"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="0dp"
+    android:paddingHorizontal="16dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+    app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@id/divider"