diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
index b0e3c399c..c0d85d69c 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
@@ -608,6 +608,11 @@ public class SwapWorkflowActivity extends AppCompatActivity {
             }
             inflateSwapView(currentSwapViewLayoutRes);
         });
+        if (viewRes == R.layout.swap_start_swap) {
+            toolbar.setNavigationIcon(R.drawable.ic_close);
+        } else {
+            toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material);
+        }
         container.addView(view);
         supportInvalidateOptionsMenu();