diff --git a/presentation/src/main/res/layout/content_create_vault.xml b/presentation/src/main/res/layout/content_create_vault.xml
index f6ee74b9..a403b834 100644
--- a/presentation/src/main/res/layout/content_create_vault.xml
+++ b/presentation/src/main/res/layout/content_create_vault.xml
@@ -5,8 +5,8 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:paddingBottom="@dimen/activity_vertical_margin"
-	android:paddingLeft="@dimen/activity_horizontal_margin"
-	android:paddingRight="@dimen/activity_horizontal_margin"
+	android:paddingStart="@dimen/activity_horizontal_margin"
+	android:paddingEnd="@dimen/activity_horizontal_margin"
 	android:paddingTop="@dimen/activity_vertical_margin"
 	app:layout_behavior="@string/appbar_scrolling_view_behavior"
 	tools:context=".ui.activity.CreateVaultActivity"
diff --git a/presentation/src/main/res/layout/dialog_ask_for_http.xml b/presentation/src/main/res/layout/dialog_ask_for_http.xml
index c6317724..45a05eb1 100644
--- a/presentation/src/main/res/layout/dialog_ask_for_http.xml
+++ b/presentation/src/main/res/layout/dialog_ask_for_http.xml
@@ -22,8 +22,6 @@
 			android:layout_below="@id/tv_security_hint"
 			android:checked="true"
 			android:paddingEnd="16dp"
-			android:paddingLeft="16dp"
-			android:paddingRight="16dp"
 			android:paddingStart="16dp"
 			android:text="@string/dialog_http_security_checkbox" />
 
diff --git a/presentation/src/main/res/layout/dialog_biometric_auth_key_invalidated.xml b/presentation/src/main/res/layout/dialog_biometric_auth_key_invalidated.xml
index 8b55cc52..6b765109 100644
--- a/presentation/src/main/res/layout/dialog_biometric_auth_key_invalidated.xml
+++ b/presentation/src/main/res/layout/dialog_biometric_auth_key_invalidated.xml
@@ -4,8 +4,8 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical"
 	android:paddingBottom="@dimen/activity_vertical_margin"
-	android:paddingLeft="@dimen/activity_horizontal_margin"
-	android:paddingRight="@dimen/activity_horizontal_margin"
+	android:paddingStart="@dimen/activity_horizontal_margin"
+	android:paddingEnd="@dimen/activity_horizontal_margin"
 	android:paddingTop="@dimen/activity_vertical_margin">
 
 	<TextView
diff --git a/presentation/src/main/res/layout/dialog_bottom_sheet_add_vault.xml b/presentation/src/main/res/layout/dialog_bottom_sheet_add_vault.xml
index 3b13d38a..1ea9bd3a 100644
--- a/presentation/src/main/res/layout/dialog_bottom_sheet_add_vault.xml
+++ b/presentation/src/main/res/layout/dialog_bottom_sheet_add_vault.xml
@@ -18,9 +18,7 @@
 			android:layout_height="56dp"
 			android:gravity="center_vertical"
 			android:paddingStart="16dp"
-			android:paddingLeft="16dp"
 			android:paddingEnd="16dp"
-			android:paddingRight="16dp"
 			android:textSize="16sp" />
 
 		<TextView
diff --git a/presentation/src/main/res/layout/dialog_bottom_sheet_cloud_settings.xml b/presentation/src/main/res/layout/dialog_bottom_sheet_cloud_settings.xml
index 4480405d..63d86db2 100644
--- a/presentation/src/main/res/layout/dialog_bottom_sheet_cloud_settings.xml
+++ b/presentation/src/main/res/layout/dialog_bottom_sheet_cloud_settings.xml
@@ -23,8 +23,6 @@
 				android:layout_height="@dimen/thumbnail_size"
 				android:layout_centerVertical="true"
 				android:layout_marginEnd="16dp"
-				android:layout_marginLeft="16dp"
-				android:layout_marginRight="16dp"
 				android:layout_marginStart="16dp" />
 
 			<LinearLayout
diff --git a/presentation/src/main/res/layout/dialog_bottom_sheet_file_settings.xml b/presentation/src/main/res/layout/dialog_bottom_sheet_file_settings.xml
index 0ebdfade..1bbf061f 100644
--- a/presentation/src/main/res/layout/dialog_bottom_sheet_file_settings.xml
+++ b/presentation/src/main/res/layout/dialog_bottom_sheet_file_settings.xml
@@ -22,8 +22,6 @@
 				android:layout_height="@dimen/thumbnail_size"
 				android:layout_centerVertical="true"
 				android:layout_marginEnd="16dp"
-				android:layout_marginLeft="16dp"
-				android:layout_marginRight="16dp"
 				android:layout_marginStart="16dp" />
 
 			<LinearLayout
diff --git a/presentation/src/main/res/layout/dialog_bottom_sheet_folder_settings.xml b/presentation/src/main/res/layout/dialog_bottom_sheet_folder_settings.xml
index 9a814d9f..79b755a3 100644
--- a/presentation/src/main/res/layout/dialog_bottom_sheet_folder_settings.xml
+++ b/presentation/src/main/res/layout/dialog_bottom_sheet_folder_settings.xml
@@ -23,8 +23,6 @@
 				android:layout_height="@dimen/thumbnail_size"
 				android:layout_centerVertical="true"
 				android:layout_marginEnd="16dp"
-				android:layout_marginLeft="16dp"
-				android:layout_marginRight="16dp"
 				android:layout_marginStart="16dp"
 				android:src="@drawable/node_folder" />
 
diff --git a/presentation/src/main/res/layout/dialog_bottom_sheet_vault_action.xml b/presentation/src/main/res/layout/dialog_bottom_sheet_vault_action.xml
index 488d687c..89e44ff0 100644
--- a/presentation/src/main/res/layout/dialog_bottom_sheet_vault_action.xml
+++ b/presentation/src/main/res/layout/dialog_bottom_sheet_vault_action.xml
@@ -18,8 +18,6 @@
 			android:ellipsize="middle"
 			android:gravity="center_vertical"
 			android:paddingEnd="16dp"
-			android:paddingLeft="16dp"
-			android:paddingRight="16dp"
 			android:paddingStart="16dp"
 			android:singleLine="true"
 			android:textSize="16sp"
diff --git a/presentation/src/main/res/layout/dialog_bottom_sheet_vault_settings.xml b/presentation/src/main/res/layout/dialog_bottom_sheet_vault_settings.xml
index 51e5360b..442d76b2 100644
--- a/presentation/src/main/res/layout/dialog_bottom_sheet_vault_settings.xml
+++ b/presentation/src/main/res/layout/dialog_bottom_sheet_vault_settings.xml
@@ -22,8 +22,6 @@
 				android:layout_width="@dimen/thumbnail_size"
 				android:layout_height="@dimen/thumbnail_size"
 				android:layout_marginEnd="16dp"
-				android:layout_marginLeft="16dp"
-				android:layout_marginRight="16dp"
 				android:layout_marginStart="16dp" />
 
 			<LinearLayout
diff --git a/presentation/src/main/res/layout/dialog_confirm_delete_cloud_node.xml b/presentation/src/main/res/layout/dialog_confirm_delete_cloud_node.xml
index 84ea259a..19768497 100644
--- a/presentation/src/main/res/layout/dialog_confirm_delete_cloud_node.xml
+++ b/presentation/src/main/res/layout/dialog_confirm_delete_cloud_node.xml
@@ -8,8 +8,8 @@
 		android:layout_height="match_parent"
 		android:orientation="vertical"
 		android:paddingBottom="@dimen/activity_vertical_margin"
-		android:paddingLeft="@dimen/activity_horizontal_margin"
-		android:paddingRight="@dimen/activity_horizontal_margin"
+		android:paddingStart="@dimen/activity_horizontal_margin"
+		android:paddingEnd="@dimen/activity_horizontal_margin"
 		android:paddingTop="@dimen/activity_vertical_margin">
 
 		<TextView
diff --git a/presentation/src/main/res/layout/dialog_delete_cloud_connection_with_vaults.xml b/presentation/src/main/res/layout/dialog_delete_cloud_connection_with_vaults.xml
index 45b52d3d..1213d148 100644
--- a/presentation/src/main/res/layout/dialog_delete_cloud_connection_with_vaults.xml
+++ b/presentation/src/main/res/layout/dialog_delete_cloud_connection_with_vaults.xml
@@ -8,8 +8,8 @@
 		android:layout_height="match_parent"
 		android:orientation="vertical"
 		android:paddingBottom="@dimen/activity_vertical_margin"
-		android:paddingLeft="@dimen/activity_horizontal_margin"
-		android:paddingRight="@dimen/activity_horizontal_margin"
+		android:paddingStart="@dimen/activity_horizontal_margin"
+		android:paddingEnd="@dimen/activity_horizontal_margin"
 		android:paddingTop="@dimen/activity_vertical_margin">
 
 		<TextView
diff --git a/presentation/src/main/res/layout/dialog_existing_file.xml b/presentation/src/main/res/layout/dialog_existing_file.xml
index 84ea259a..19768497 100644
--- a/presentation/src/main/res/layout/dialog_existing_file.xml
+++ b/presentation/src/main/res/layout/dialog_existing_file.xml
@@ -8,8 +8,8 @@
 		android:layout_height="match_parent"
 		android:orientation="vertical"
 		android:paddingBottom="@dimen/activity_vertical_margin"
-		android:paddingLeft="@dimen/activity_horizontal_margin"
-		android:paddingRight="@dimen/activity_horizontal_margin"
+		android:paddingStart="@dimen/activity_horizontal_margin"
+		android:paddingEnd="@dimen/activity_horizontal_margin"
 		android:paddingTop="@dimen/activity_vertical_margin">
 
 		<TextView
diff --git a/presentation/src/main/res/layout/dialog_handle_ssl_certificate.xml b/presentation/src/main/res/layout/dialog_handle_ssl_certificate.xml
index 456eacd4..1da4bbdd 100644
--- a/presentation/src/main/res/layout/dialog_handle_ssl_certificate.xml
+++ b/presentation/src/main/res/layout/dialog_handle_ssl_certificate.xml
@@ -47,8 +47,6 @@
 			android:layout_height="wrap_content"
 			android:layout_below="@id/certificate_details"
 			android:paddingEnd="16dp"
-			android:paddingLeft="16dp"
-			android:paddingRight="16dp"
 			android:paddingStart="16dp"
 			android:text="@string/dialog_accept_ssl_certificate_security_checkbox" />
 
diff --git a/presentation/src/main/res/layout/dialog_no_screen_lock_set.xml b/presentation/src/main/res/layout/dialog_no_screen_lock_set.xml
index 45aaa0c7..7ab9fee8 100644
--- a/presentation/src/main/res/layout/dialog_no_screen_lock_set.xml
+++ b/presentation/src/main/res/layout/dialog_no_screen_lock_set.xml
@@ -22,8 +22,6 @@
 			android:layout_marginTop="27dp"
 			android:checked="true"
 			android:paddingEnd="16dp"
-			android:paddingLeft="16dp"
-			android:paddingRight="16dp"
 			android:paddingStart="16dp"
 			android:text="@string/dialog_no_screen_lock_checkbox" />
 
diff --git a/presentation/src/main/res/layout/dialog_upload_loading.xml b/presentation/src/main/res/layout/dialog_upload_loading.xml
index 94be5025..79cd0eda 100644
--- a/presentation/src/main/res/layout/dialog_upload_loading.xml
+++ b/presentation/src/main/res/layout/dialog_upload_loading.xml
@@ -12,8 +12,8 @@
 			android:id="@+id/file_upload"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:paddingLeft="16dp"
-			android:paddingRight="16dp"
+			android:paddingStart="16dp"
+			android:paddingEnd="16dp"
 			android:paddingBottom="8dp"
 			android:textSize="20sp" />
 
diff --git a/presentation/src/main/res/layout/dialog_vault_delete_confirmation.xml b/presentation/src/main/res/layout/dialog_vault_delete_confirmation.xml
index e8c44be2..66c2889a 100644
--- a/presentation/src/main/res/layout/dialog_vault_delete_confirmation.xml
+++ b/presentation/src/main/res/layout/dialog_vault_delete_confirmation.xml
@@ -8,8 +8,8 @@
 		android:layout_height="match_parent"
 		android:orientation="vertical"
 		android:paddingBottom="@dimen/activity_vertical_margin"
-		android:paddingLeft="@dimen/activity_horizontal_margin"
-		android:paddingRight="@dimen/activity_horizontal_margin"
+		android:paddingStart="@dimen/activity_horizontal_margin"
+		android:paddingEnd="@dimen/activity_horizontal_margin"
 		android:paddingTop="@dimen/activity_vertical_margin">
 
 		<TextView
diff --git a/presentation/src/main/res/layout/item_biometric_auth_vault.xml b/presentation/src/main/res/layout/item_biometric_auth_vault.xml
index 62dd8678..7449d68e 100644
--- a/presentation/src/main/res/layout/item_biometric_auth_vault.xml
+++ b/presentation/src/main/res/layout/item_biometric_auth_vault.xml
@@ -17,8 +17,6 @@
 		android:layout_height="wrap_content"
 		android:layout_centerVertical="true"
 		android:layout_marginEnd="5dp"
-		android:layout_marginLeft="5dp"
-		android:layout_marginRight="5dp"
 		android:layout_marginStart="5dp"
 		android:layout_toEndOf="@+id/cloud"
 		android:layout_toStartOf="@id/toggleBiometricAuth"
diff --git a/presentation/src/main/res/layout/item_browse_cloud_model_connections.xml b/presentation/src/main/res/layout/item_browse_cloud_model_connections.xml
index 5aca9946..2bd09528 100644
--- a/presentation/src/main/res/layout/item_browse_cloud_model_connections.xml
+++ b/presentation/src/main/res/layout/item_browse_cloud_model_connections.xml
@@ -18,8 +18,6 @@
 		android:layout_height="wrap_content"
 		android:layout_centerVertical="true"
 		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
 		android:layout_marginTop="16dp"
 		android:layout_toEndOf="@id/cloudImage"
diff --git a/presentation/src/main/res/layout/item_browse_files_node.xml b/presentation/src/main/res/layout/item_browse_files_node.xml
index 1e33c5fc..8d3e198f 100644
--- a/presentation/src/main/res/layout/item_browse_files_node.xml
+++ b/presentation/src/main/res/layout/item_browse_files_node.xml
@@ -18,8 +18,6 @@
 		android:layout_height="wrap_content"
 		android:layout_centerVertical="true"
 		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
 		android:layout_toEndOf="@id/cloudNodeImage"
 		android:layout_toStartOf="@+id/controls" />
@@ -30,8 +28,6 @@
 		android:layout_height="wrap_content"
 		android:layout_centerVertical="true"
 		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
 		android:layout_marginTop="16dp"
 		android:layout_toEndOf="@id/cloudNodeImage"
diff --git a/presentation/src/main/res/layout/item_cloud_setting.xml b/presentation/src/main/res/layout/item_cloud_setting.xml
index 8011b74c..6a26fddb 100644
--- a/presentation/src/main/res/layout/item_cloud_setting.xml
+++ b/presentation/src/main/res/layout/item_cloud_setting.xml
@@ -16,8 +16,6 @@
 		android:layout_height="wrap_content"
 		android:layout_centerVertical="true"
 		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
 		android:layout_toEndOf="@+id/cloudImage"
 		android:orientation="vertical">
diff --git a/presentation/src/main/res/layout/item_shared_files.xml b/presentation/src/main/res/layout/item_shared_files.xml
index 2c8c6763..8632a73c 100644
--- a/presentation/src/main/res/layout/item_shared_files.xml
+++ b/presentation/src/main/res/layout/item_shared_files.xml
@@ -17,8 +17,6 @@
 		android:layout_height="wrap_content"
 		android:layout_centerVertical="true"
 		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
 		android:layout_toEndOf="@+id/fileImage"
 		android:ellipsize="middle"
diff --git a/presentation/src/main/res/layout/item_vault.xml b/presentation/src/main/res/layout/item_vault.xml
index 5ce193a6..5d5a861f 100644
--- a/presentation/src/main/res/layout/item_vault.xml
+++ b/presentation/src/main/res/layout/item_vault.xml
@@ -17,8 +17,6 @@
 		android:layout_height="wrap_content"
 		android:layout_centerVertical="true"
 		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
 		android:layout_toEndOf="@+id/cloudImage"
 		android:layout_toStartOf="@+id/unlockedImage"
@@ -52,8 +50,8 @@
 		android:layout_toStartOf="@+id/settings"
 		android:background="?android:attr/selectableItemBackground"
 		android:paddingBottom="10dp"
-		android:paddingLeft="14dp"
-		android:paddingRight="14dp"
+		android:paddingStart="14dp"
+		android:paddingEnd="14dp"
 		android:paddingTop="10dp"
 		android:src="@drawable/vault_unlocked"
 		app:tint="@color/colorPrimary"
diff --git a/presentation/src/main/res/layout/view_default_local_cloud.xml b/presentation/src/main/res/layout/view_default_local_cloud.xml
index b6e693e6..21250ce5 100644
--- a/presentation/src/main/res/layout/view_default_local_cloud.xml
+++ b/presentation/src/main/res/layout/view_default_local_cloud.xml
@@ -19,8 +19,6 @@
 		android:layout_height="wrap_content"
 		android:layout_centerVertical="true"
 		android:layout_marginEnd="16dp"
-		android:layout_marginLeft="16dp"
-		android:layout_marginRight="16dp"
 		android:layout_marginStart="16dp"
 		android:layout_marginTop="16dp"
 		android:layout_toEndOf="@id/iv_cloud_model_image" />
diff --git a/presentation/src/main/res/layout/view_dialog_error.xml b/presentation/src/main/res/layout/view_dialog_error.xml
index 9f828d34..16a38167 100644
--- a/presentation/src/main/res/layout/view_dialog_error.xml
+++ b/presentation/src/main/res/layout/view_dialog_error.xml
@@ -5,8 +5,8 @@
 	android:layout_height="wrap_content"
 	android:gravity="center"
 	android:orientation="horizontal"
-	android:paddingLeft="16dp"
-	android:paddingRight="16dp"
+	android:paddingStart="16dp"
+	android:paddingEnd="16dp"
 	android:visibility="gone">
 
 	<TextView
diff --git a/presentation/src/main/res/layout/view_dialog_intermediate_progress.xml b/presentation/src/main/res/layout/view_dialog_intermediate_progress.xml
index c7c63a6e..ffe04872 100644
--- a/presentation/src/main/res/layout/view_dialog_intermediate_progress.xml
+++ b/presentation/src/main/res/layout/view_dialog_intermediate_progress.xml
@@ -4,8 +4,8 @@
 	android:id="@+id/ll_progress"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:paddingLeft="16dp"
-	android:paddingRight="16dp"
+	android:paddingStart="16dp"
+	android:paddingEnd="16dp"
 	android:visibility="visible">
 
 	<RelativeLayout
diff --git a/presentation/src/main/res/layout/view_dialog_progress.xml b/presentation/src/main/res/layout/view_dialog_progress.xml
index b3b73331..512c2903 100644
--- a/presentation/src/main/res/layout/view_dialog_progress.xml
+++ b/presentation/src/main/res/layout/view_dialog_progress.xml
@@ -5,8 +5,8 @@
 	android:layout_height="wrap_content"
 	android:gravity="center"
 	android:orientation="horizontal"
-	android:paddingLeft="16dp"
-	android:paddingRight="16dp"
+	android:paddingStart="16dp"
+	android:paddingEnd="16dp"
 	android:visibility="gone">
 
 	<ProgressBar style="@style/AppTheme.ProgressBar" />
diff --git a/presentation/src/main/res/values-night/styles.xml b/presentation/src/main/res/values-night/styles.xml
index 48f2ba33..8581a6e2 100644
--- a/presentation/src/main/res/values-night/styles.xml
+++ b/presentation/src/main/res/values-night/styles.xml
@@ -66,8 +66,8 @@
 		<item name="android:layout_height">48dp</item>
 		<item name="android:textSize">16sp</item>
 		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_marginLeft">16dp</item>
-		<item name="android:layout_marginRight">16dp</item>
+		<item name="android:layout_marginStart">16dp</item>
+		<item name="android:layout_marginEnd">16dp</item>
 		<item name="android:paddingBottom">16dp</item>
 		<item name="android:drawablePadding">32dp</item>
 		<item name="android:clickable">true</item>
diff --git a/presentation/src/main/res/values/styles.xml b/presentation/src/main/res/values/styles.xml
index 3def9466..a09be1b3 100644
--- a/presentation/src/main/res/values/styles.xml
+++ b/presentation/src/main/res/values/styles.xml
@@ -66,8 +66,8 @@
 		<item name="android:layout_height">48dp</item>
 		<item name="android:textSize">16sp</item>
 		<item name="android:layout_width">match_parent</item>
-		<item name="android:layout_marginLeft">16dp</item>
-		<item name="android:layout_marginRight">16dp</item>
+		<item name="android:layout_marginStart">16dp</item>
+		<item name="android:layout_marginEnd">16dp</item>
 		<item name="android:paddingBottom">16dp</item>
 		<item name="android:drawablePadding">32dp</item>
 		<item name="android:clickable">true</item>
diff --git a/subsampling-scale-image-view b/subsampling-scale-image-view
index c3c247b6..e9d0f187 160000
--- a/subsampling-scale-image-view
+++ b/subsampling-scale-image-view
@@ -1 +1 @@
-Subproject commit c3c247b63cb72a4f7f9ddc3272820e1ce636e56d
+Subproject commit e9d0f18740f00f55195811373791ea826f3c6ba3