diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodFragment.kt
index 6c597f613d..ebea1f9703 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodFragment.kt
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodFragment.kt
@@ -29,6 +29,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateMa
 import info.nightscout.androidaps.plugins.pump.omnipod.event.EventOmnipodPumpValuesChanged
 import info.nightscout.androidaps.plugins.pump.omnipod.manager.AapsOmnipodManager
 import info.nightscout.androidaps.plugins.pump.omnipod.queue.command.*
+import info.nightscout.androidaps.plugins.pump.omnipod.ui.wizard2.WizardActivity
 import info.nightscout.androidaps.plugins.pump.omnipod.util.AapsOmnipodUtil
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.queue.events.EventQueueChanged
@@ -92,6 +93,10 @@ class OmnipodFragment : DaggerFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        omnipod_button_replace_pod.setOnClickListener {
+            startActivity(Intent(context, WizardActivity::class.java))
+        }
+
         omnipod_button_pod_mgmt.setOnClickListener {
             if (omnipodPumpPlugin.rileyLinkService?.verifyConfiguration() == true) {
                 activity?.let { activity ->
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt
index ab4132e940..181a0af528 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/PodManagementActivity.kt
@@ -57,7 +57,7 @@ class PodManagementActivity : NoSplashAppCompatActivity() {
             initPodAction()
         }
 
-        initpod_init_pod_new.setOnClickListener {
+        initpod_replace_pod.setOnClickListener {
             val myIntent = Intent(this@PodManagementActivity, WizardActivity::class.java)
             this@PodManagementActivity.startActivity(myIntent)
         }
diff --git a/omnipod/src/main/res/layout/omnipod_fragment.xml b/omnipod/src/main/res/layout/omnipod_fragment.xml
index deb485b2da..9711de30a0 100644
--- a/omnipod/src/main/res/layout/omnipod_fragment.xml
+++ b/omnipod/src/main/res/layout/omnipod_fragment.xml
@@ -750,6 +750,17 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
+                <Button
+                    android:id="@+id/omnipod_button_replace_pod"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableTop="@drawable/ic_actions_refill"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/omnipod_button_replace_pod" />
+
                 <Button
                     android:id="@+id/omnipod_button_refresh_status"
                     style="@style/ButtonSmallFontStyle"
diff --git a/omnipod/src/main/res/layout/omnipod_pod_mgmt.xml b/omnipod/src/main/res/layout/omnipod_pod_mgmt.xml
index c943df76b9..0a1b140b18 100644
--- a/omnipod/src/main/res/layout/omnipod_pod_mgmt.xml
+++ b/omnipod/src/main/res/layout/omnipod_pod_mgmt.xml
@@ -78,7 +78,7 @@
                 android:text="" />
 
             <info.nightscout.androidaps.utils.ui.SingleClickButton
-                android:id="@+id/initpod_init_pod_new"
+                android:id="@+id/initpod_replace_pod"
                 style="?android:attr/buttonStyle"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"