diff --git a/collect_app/src/main/res/drawable/margin_standard_list_divider.xml b/collect_app/src/main/res/drawable/margin_standard_list_divider.xml
new file mode 100644
index 00000000000..2c9cd0581b2
--- /dev/null
+++ b/collect_app/src/main/res/drawable/margin_standard_list_divider.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <size android:width="@dimen/margin_standard" />
+            <size android:height="@dimen/margin_standard" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/collect_app/src/main/res/layout/form_entry_end.xml b/collect_app/src/main/res/layout/form_entry_end.xml
index f4917e150c9..1b2c54fda92 100644
--- a/collect_app/src/main/res/layout/form_entry_end.xml
+++ b/collect_app/src/main/res/layout/form_entry_end.xml
@@ -82,6 +82,8 @@ the specific language governing permissions and limitations under the License.
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="64dp"
+            android:divider="@drawable/margin_standard_list_divider"
+            android:showDividers="middle"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -93,32 +95,20 @@ the specific language governing permissions and limitations under the License.
                 style="?materialButtonOutlinedIconStyle"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_marginEnd="@dimen/margin_extra_small"
                 android:layout_weight="1"
                 android:text="@string/save_as_draft"
                 app:icon="@drawable/ic_save_menu_24"
-                app:iconGravity="textStart"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/finalize"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_goneMarginEnd="0dp" />
+                app:iconGravity="textStart" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/finalize"
                 style="?materialButtonIconStyle"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_marginStart="@dimen/margin_extra_small"
                 android:layout_weight="1"
                 android:text="@string/finalize"
                 app:icon="@drawable/ic_send_24"
-                app:iconGravity="textStart"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/save_as_draft"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_goneMarginStart="0dp" />
+                app:iconGravity="textStart" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>