diff --git a/app/build.gradle b/app/build.gradle
index 12820f5d..e4f8ddfe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,7 +64,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:f54d4f7606'
+    implementation 'com.github.esensar:Simple-Commons:enter-password-dialog-improvements-SNAPSHOT'
     implementation 'com.github.tibbi:AndroidPdfViewer:e6a533125b'
     implementation 'com.github.Stericson:RootTools:df729dcb13'
     implementation 'com.github.Stericson:RootShell:1.6'
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CompressAsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CompressAsDialog.kt
index a49febc4..e56aaca6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CompressAsDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CompressAsDialog.kt
@@ -46,7 +46,7 @@ class CompressAsDialog(val activity: BaseSimpleActivity, val path: String, val c
                         if (view.password_protect.isChecked) {
                             password = view.password.value
                             if (password.isEmpty()) {
-                                activity.toast(R.string.empty_password)
+                                activity.toast(R.string.empty_password_new)
                                 return@OnClickListener
                             }
                         }
diff --git a/app/src/main/res/layout/dialog_compress_as.xml b/app/src/main/res/layout/dialog_compress_as.xml
index 48b763d6..bdd6a8d2 100644
--- a/app/src/main/res/layout/dialog_compress_as.xml
+++ b/app/src/main/res/layout/dialog_compress_as.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/dialog_holder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -27,7 +28,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/folder_hint"
-        android:layout_marginBottom="@dimen/activity_margin"
         android:hint="@string/filename_without_zip">
 
         <com.google.android.material.textfield.TextInputEditText
@@ -49,7 +49,7 @@
         android:layout_marginTop="@dimen/small_margin"
         android:paddingTop="@dimen/normal_margin"
         android:paddingBottom="@dimen/normal_margin"
-        android:text="@string/password" />
+        android:text="@string/add_password" />
 
     <com.simplemobiletools.commons.views.MyTextInputLayout
         android:id="@+id/enter_password_hint"