diff --git a/.gitignore b/.gitignore
index 1fb1d115b..6f0a06cbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,4 @@ lint/generated/
 lint/outputs/
 lint/tmp/
 lint/reports/
+/app/release/
diff --git a/capture/src/main/kotlin/com/alfresco/capture/SaveFragment.kt b/capture/src/main/kotlin/com/alfresco/capture/SaveFragment.kt
index ed0ee746b..e199a5340 100644
--- a/capture/src/main/kotlin/com/alfresco/capture/SaveFragment.kt
+++ b/capture/src/main/kotlin/com/alfresco/capture/SaveFragment.kt
@@ -49,38 +49,40 @@ class SaveFragment : Fragment(), MavericksView {
     private fun onSuccessMediaLoad() {
         withState(viewModel) {
             if (it.capture != null) {
-                val mediaMetadataRetriever = MediaMetadataRetriever()
-                mediaMetadataRetriever.setDataSource(it.capture.uri.path)
-                val time: String? =
-                    mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)
-                val duration = time?.toLong()
-
-                duration?.let { millis ->
-                    val hour = TimeUnit.MILLISECONDS.toHours(millis)
-                    val minutes =
-                        TimeUnit.MILLISECONDS.toMinutes(millis) - TimeUnit.HOURS.toMinutes(
-                            TimeUnit.MILLISECONDS.toHours(millis)
-                        )
-                    val seconds =
-                        TimeUnit.MILLISECONDS.toSeconds(millis) - TimeUnit.MINUTES.toSeconds(
-                            TimeUnit.MILLISECONDS.toMinutes(millis)
-                        )
-                    val hms = if (hour > 0L) {
-                        java.lang.String.format(
-                            ENGLISH,
-                            getString(R.string.format_video_duration_hour), hour,
-                            minutes, seconds
-                        )
-                    } else {
-                        java.lang.String.format(
-                            ENGLISH,
-                            getString(R.string.format_video_duration_minute),
-                            minutes, seconds
-                        )
+                if (it.capture.isVideo()) {
+                    val mediaMetadataRetriever = MediaMetadataRetriever()
+                    mediaMetadataRetriever.setDataSource(it.capture.uri.path)
+                    val time: String? =
+                        mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)
+                    val duration = time?.toLong()
+
+                    duration?.let { millis ->
+                        val hour = TimeUnit.MILLISECONDS.toHours(millis)
+                        val minutes =
+                            TimeUnit.MILLISECONDS.toMinutes(millis) - TimeUnit.HOURS.toMinutes(
+                                TimeUnit.MILLISECONDS.toHours(millis)
+                            )
+                        val seconds =
+                            TimeUnit.MILLISECONDS.toSeconds(millis) - TimeUnit.MINUTES.toSeconds(
+                                TimeUnit.MILLISECONDS.toMinutes(millis)
+                            )
+                        val hms = if (hour > 0L) {
+                            java.lang.String.format(
+                                ENGLISH,
+                                getString(R.string.format_video_duration_hour), hour,
+                                minutes, seconds
+                            )
+                        } else {
+                            java.lang.String.format(
+                                ENGLISH,
+                                getString(R.string.format_video_duration_minute),
+                                minutes, seconds
+                            )
+                        }
+
+                        binding.videoDuration.isVisible = it.capture.isVideo() == true
+                        binding.videoDuration.text = hms
                     }
-
-                    binding.videoDuration.isVisible = it.capture.isVideo() == true
-                    binding.videoDuration.text = hms
                 }
             }
             binding.deletePhotoButton.isVisible = true
diff --git a/capture/src/main/res/layout/fragment_save.xml b/capture/src/main/res/layout/fragment_save.xml
index 32f75d204..6e2303704 100644
--- a/capture/src/main/res/layout/fragment_save.xml
+++ b/capture/src/main/res/layout/fragment_save.xml
@@ -39,11 +39,11 @@
 
                     <ImageView
                         android:id="@+id/preview"
-                        android:layout_width="240dp"
+                        android:layout_width="200dp"
                         android:layout_height="wrap_content"
                         android:adjustViewBounds="true"
                         android:contentDescription="@string/capture_photo_preview_alt"
-                        android:maxHeight="234dp"
+                        android:maxHeight="280dp"
                         android:scaleType="fitXY" />
 
                     <TextView
@@ -74,6 +74,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/capture_layout_margin"
                 android:orientation="vertical">
 
                 <com.google.android.material.textfield.TextInputLayout
@@ -109,7 +110,7 @@
                     style="@style/Widget.Alfresco.Button.Primary"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/capture_layout_margin"
+                    android:layout_marginTop="@dimen/capture_layout_margin_button"
                     android:layout_marginBottom="@dimen/capture_layout_margin"
                     android:text="@string/capture_save_button" />
             </LinearLayout>
diff --git a/capture/src/main/res/values/attrs.xml b/capture/src/main/res/values/attrs.xml
index 3f0cf8ac5..d27a7e5c5 100644
--- a/capture/src/main/res/values/attrs.xml
+++ b/capture/src/main/res/values/attrs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="capture_layout_margin">24dp</dimen>
+    <dimen name="capture_layout_margin_button">28dp</dimen>
     <dimen name="capture_layout_small_margin">16dp</dimen>
     <dimen name="capture_button_size">40dp</dimen>
     <dimen name="capture_view_size">60dp</dimen>