diff --git a/common/src/main/res/drawable/ic_advanced_privacy.xml b/common/src/main/res/drawable/ic_advanced_privacy.xml
index 6a684c5837..cc978a4e49 100644
--- a/common/src/main/res/drawable/ic_advanced_privacy.xml
+++ b/common/src/main/res/drawable/ic_advanced_privacy.xml
@@ -1,9 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="23dp"
-    android:viewportWidth="18"
-    android:viewportHeight="23">
-  <path
-      android:pathData="M8.848,22.094C8.934,22.094 9.037,22.076 9.159,22.04C9.288,22.011 9.421,21.961 9.557,21.89C11.089,21.088 12.371,20.364 13.402,19.72C14.441,19.075 15.268,18.438 15.884,17.808C16.507,17.177 16.954,16.501 17.227,15.777C17.499,15.047 17.635,14.198 17.635,13.231V5.132C17.635,4.58 17.517,4.183 17.28,3.939C17.051,3.696 16.711,3.481 16.26,3.295C16.009,3.188 15.665,3.051 15.229,2.887C14.792,2.722 14.308,2.543 13.778,2.35C13.255,2.156 12.729,1.963 12.199,1.77C11.676,1.576 11.197,1.404 10.76,1.254C10.33,1.096 9.99,0.975 9.739,0.889C9.596,0.846 9.449,0.81 9.299,0.781C9.148,0.753 8.998,0.738 8.848,0.738C8.697,0.738 8.547,0.753 8.396,0.781C8.253,0.81 8.11,0.846 7.967,0.889C7.716,0.975 7.372,1.096 6.936,1.254C6.499,1.404 6.015,1.576 5.485,1.77C4.963,1.956 4.436,2.149 3.906,2.35C3.383,2.543 2.904,2.726 2.467,2.897C2.03,3.062 1.686,3.195 1.436,3.295C0.992,3.474 0.651,3.689 0.415,3.939C0.179,4.183 0.061,4.58 0.061,5.132V13.231C0.061,14.198 0.2,15.04 0.479,15.756C0.766,16.465 1.221,17.127 1.844,17.743C2.474,18.352 3.305,18.982 4.336,19.634C5.374,20.285 6.642,21.037 8.139,21.89C8.275,21.961 8.404,22.011 8.525,22.04C8.654,22.076 8.762,22.094 8.848,22.094Z"
-      android:fillColor="#CED2D5"/>
+<vector android:autoMirrored="true" android:height="22dp"
+    android:viewportHeight="22" android:viewportWidth="18"
+    android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:fillColor="#008DE4" android:pathData="M9,21.678C9.086,21.678 9.19,21.66 9.312,21.624C9.44,21.595 9.573,21.545 9.709,21.474C11.241,20.671 12.523,19.948 13.555,19.304C14.593,18.659 15.42,18.022 16.036,17.392C16.659,16.761 17.107,16.085 17.379,15.361C17.651,14.631 17.787,13.782 17.787,12.815V4.716C17.787,4.164 17.669,3.767 17.433,3.523C17.204,3.28 16.863,3.065 16.412,2.879C16.162,2.771 15.818,2.635 15.381,2.471C14.944,2.306 14.461,2.127 13.931,1.934C13.408,1.74 12.882,1.547 12.352,1.354C11.829,1.16 11.349,0.988 10.912,0.838C10.482,0.68 10.142,0.559 9.892,0.473C9.748,0.43 9.602,0.394 9.451,0.365C9.301,0.337 9.15,0.322 9,0.322C8.85,0.322 8.699,0.337 8.549,0.365C8.406,0.394 8.262,0.43 8.119,0.473C7.868,0.559 7.525,0.68 7.088,0.838C6.651,0.988 6.168,1.16 5.638,1.354C5.115,1.54 4.589,1.733 4.059,1.934C3.536,2.127 3.056,2.31 2.619,2.481C2.182,2.646 1.839,2.779 1.588,2.879C1.144,3.058 0.804,3.273 0.567,3.523C0.331,3.767 0.213,4.164 0.213,4.716V12.815C0.213,13.782 0.353,14.624 0.632,15.34C0.918,16.049 1.373,16.711 1.996,17.327C2.626,17.936 3.457,18.566 4.488,19.218C5.527,19.869 6.794,20.621 8.291,21.474C8.427,21.545 8.556,21.595 8.678,21.624C8.807,21.66 8.914,21.678 9,21.678ZM4.155,11.354C4.155,11.204 4.216,11.061 4.338,10.925L10.407,3.309C10.565,3.115 10.733,3.022 10.912,3.029C11.098,3.029 11.241,3.104 11.342,3.255C11.449,3.398 11.456,3.588 11.363,3.824L9.354,9.206H13.114C13.257,9.206 13.376,9.253 13.469,9.346C13.569,9.439 13.619,9.557 13.619,9.7C13.619,9.843 13.558,9.987 13.436,10.13L7.367,17.746C7.217,17.94 7.049,18.036 6.862,18.036C6.676,18.029 6.529,17.95 6.422,17.8C6.322,17.649 6.318,17.456 6.411,17.22L8.42,11.838H4.66C4.517,11.838 4.395,11.795 4.295,11.709C4.202,11.616 4.155,11.498 4.155,11.354Z"/>
 </vector>
diff --git a/common/src/main/res/drawable/ic_clock.xml b/common/src/main/res/drawable/ic_clock.xml
index f573db1d17..cae3a6f3e0 100644
--- a/common/src/main/res/drawable/ic_clock.xml
+++ b/common/src/main/res/drawable/ic_clock.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="13">
   <path
       android:pathData="M2.961,7.402H6.02C6.137,7.402 6.234,7.363 6.313,7.285C6.391,7.207 6.43,7.109 6.43,6.992V3.043C6.43,2.93 6.391,2.834 6.313,2.756C6.234,2.678 6.137,2.639 6.02,2.639C5.906,2.639 5.811,2.678 5.732,2.756C5.654,2.834 5.615,2.93 5.615,3.043V6.588H2.961C2.844,6.588 2.746,6.627 2.668,6.705C2.59,6.783 2.551,6.879 2.551,6.992C2.551,7.109 2.59,7.207 2.668,7.285C2.746,7.363 2.844,7.402 2.961,7.402ZM6.025,12.746C6.842,12.746 7.609,12.59 8.328,12.277C9.051,11.965 9.688,11.533 10.238,10.982C10.789,10.432 11.221,9.797 11.533,9.078C11.846,8.355 12.002,7.586 12.002,6.77C12.002,5.953 11.846,5.186 11.533,4.467C11.221,3.744 10.789,3.107 10.238,2.557C9.688,2.006 9.051,1.574 8.328,1.262C7.605,0.949 6.836,0.793 6.02,0.793C5.203,0.793 4.434,0.949 3.711,1.262C2.992,1.574 2.357,2.006 1.807,2.557C1.26,3.107 0.83,3.744 0.518,4.467C0.205,5.186 0.049,5.953 0.049,6.77C0.049,7.586 0.205,8.355 0.518,9.078C0.83,9.797 1.262,10.432 1.813,10.982C2.363,11.533 2.998,11.965 3.717,12.277C4.439,12.59 5.209,12.746 6.025,12.746ZM6.025,11.75C5.334,11.75 4.688,11.621 4.086,11.363C3.484,11.106 2.955,10.75 2.498,10.297C2.045,9.84 1.689,9.311 1.432,8.709C1.178,8.107 1.051,7.461 1.051,6.77C1.051,6.078 1.178,5.432 1.432,4.83C1.689,4.229 2.045,3.699 2.498,3.242C2.951,2.785 3.479,2.43 4.08,2.176C4.682,1.918 5.328,1.789 6.02,1.789C6.711,1.789 7.357,1.918 7.959,2.176C8.564,2.43 9.094,2.785 9.547,3.242C10.004,3.699 10.361,4.229 10.619,4.83C10.877,5.432 11.006,6.078 11.006,6.77C11.006,7.461 10.877,8.107 10.619,8.709C10.365,9.311 10.01,9.84 9.553,10.297C9.096,10.75 8.566,11.106 7.965,11.363C7.363,11.621 6.717,11.75 6.025,11.75Z"
-      android:fillColor="#191C1F"/>
+      android:fillColor="@color/content_primary"/>
 </vector>
diff --git a/common/src/main/res/drawable/ic_intermediate_privacy.xml b/common/src/main/res/drawable/ic_intermediate_privacy.xml
index 609c662ddb..ea5961a453 100644
--- a/common/src/main/res/drawable/ic_intermediate_privacy.xml
+++ b/common/src/main/res/drawable/ic_intermediate_privacy.xml
@@ -1,9 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="19dp"
-    android:height="23dp"
-    android:viewportWidth="19"
-    android:viewportHeight="23">
-  <path
-      android:pathData="M0.921,13.371C0.921,14.352 1.064,15.204 1.351,15.928C1.637,16.651 2.099,17.324 2.736,17.947C3.374,18.57 4.215,19.215 5.261,19.881C6.313,20.547 7.603,21.31 9.128,22.169C9.264,22.241 9.396,22.294 9.525,22.33C9.654,22.366 9.762,22.384 9.848,22.384C9.934,22.384 10.041,22.366 10.17,22.33C10.299,22.294 10.431,22.241 10.567,22.169C12.1,21.31 13.389,20.547 14.435,19.881C15.487,19.222 16.332,18.581 16.97,17.958C17.607,17.335 18.065,16.662 18.345,15.939C18.631,15.208 18.774,14.352 18.774,13.371V5.153C18.774,4.588 18.656,4.183 18.42,3.939C18.184,3.696 17.836,3.478 17.378,3.284C17.127,3.177 16.78,3.041 16.336,2.876C15.892,2.704 15.401,2.521 14.864,2.328C14.334,2.128 13.801,1.931 13.264,1.737C12.727,1.544 12.236,1.368 11.792,1.211C11.348,1.053 11.001,0.932 10.75,0.846C10.607,0.803 10.456,0.767 10.299,0.738C10.148,0.702 9.998,0.685 9.848,0.685C9.697,0.685 9.547,0.702 9.396,0.738C9.246,0.774 9.099,0.81 8.956,0.846C8.698,0.917 8.347,1.032 7.903,1.189C7.459,1.34 6.969,1.515 6.432,1.716C5.902,1.909 5.368,2.106 4.831,2.307C4.294,2.507 3.803,2.693 3.359,2.865C2.915,3.037 2.568,3.177 2.317,3.284C1.866,3.47 1.519,3.689 1.275,3.939C1.039,4.183 0.921,4.588 0.921,5.153V13.371ZM10.073,20.396V2.446C10.102,2.453 10.13,2.461 10.159,2.468C10.195,2.475 10.234,2.489 10.277,2.511C10.6,2.64 10.976,2.786 11.405,2.951C11.835,3.109 12.286,3.277 12.759,3.456C13.239,3.628 13.715,3.8 14.188,3.972C14.667,4.144 15.122,4.308 15.552,4.466C15.989,4.616 16.375,4.749 16.712,4.863C16.855,4.913 16.948,4.985 16.991,5.078C17.041,5.171 17.066,5.307 17.066,5.486V12.974C17.066,13.804 16.955,14.51 16.733,15.09C16.519,15.67 16.157,16.204 15.648,16.69C15.147,17.177 14.474,17.693 13.629,18.237C12.791,18.782 11.753,19.43 10.514,20.182C10.435,20.232 10.356,20.275 10.277,20.31C10.206,20.346 10.138,20.375 10.073,20.396Z"
-      android:fillColor="#CED2D5"/>
+<vector android:autoMirrored="true" android:height="22dp"
+    android:viewportHeight="22" android:viewportWidth="18"
+    android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:fillColor="#008DE4" android:pathData="M0.073,12.837C0.073,13.818 0.216,14.67 0.503,15.394C0.789,16.117 1.251,16.79 1.889,17.413C2.526,18.036 3.368,18.681 4.413,19.347C5.466,20.013 6.755,20.775 8.28,21.635C8.416,21.706 8.549,21.76 8.678,21.796C8.807,21.832 8.914,21.85 9,21.85C9.086,21.85 9.193,21.832 9.322,21.796C9.451,21.76 9.584,21.706 9.72,21.635C11.252,20.775 12.541,20.013 13.587,19.347C14.64,18.688 15.485,18.047 16.122,17.424C16.759,16.801 17.218,16.128 17.497,15.404C17.784,14.674 17.927,13.818 17.927,12.837V4.619C17.927,4.053 17.809,3.649 17.572,3.405C17.336,3.162 16.989,2.943 16.53,2.75C16.28,2.643 15.932,2.507 15.488,2.342C15.044,2.17 14.554,1.987 14.017,1.794C13.487,1.593 12.953,1.396 12.416,1.203C11.879,1.01 11.388,0.834 10.944,0.677C10.5,0.519 10.153,0.397 9.902,0.312C9.759,0.269 9.609,0.233 9.451,0.204C9.301,0.168 9.15,0.15 9,0.15C8.85,0.15 8.699,0.168 8.549,0.204C8.398,0.24 8.252,0.276 8.108,0.312C7.851,0.383 7.5,0.498 7.056,0.655C6.612,0.806 6.121,0.981 5.584,1.182C5.054,1.375 4.521,1.572 3.983,1.772C3.446,1.973 2.956,2.159 2.512,2.331C2.068,2.503 1.72,2.643 1.47,2.75C1.019,2.936 0.671,3.155 0.428,3.405C0.191,3.649 0.073,4.053 0.073,4.619V12.837ZM9.226,19.862V1.912C9.254,1.919 9.283,1.926 9.312,1.934C9.347,1.941 9.387,1.955 9.43,1.977C9.752,2.105 10.128,2.252 10.558,2.417C10.987,2.575 11.439,2.743 11.911,2.922C12.391,3.094 12.867,3.266 13.34,3.438C13.82,3.609 14.274,3.774 14.704,3.932C15.141,4.082 15.528,4.215 15.864,4.329C16.007,4.379 16.101,4.451 16.144,4.544C16.194,4.637 16.219,4.773 16.219,4.952V12.439C16.219,13.27 16.108,13.976 15.886,14.556C15.671,15.136 15.309,15.669 14.801,16.156C14.3,16.643 13.626,17.159 12.781,17.703C11.943,18.247 10.905,18.896 9.666,19.647C9.587,19.698 9.508,19.741 9.43,19.776C9.358,19.812 9.29,19.841 9.226,19.862Z"/>
 </vector>
diff --git a/common/src/main/res/drawable/light_grey_border_item.xml b/common/src/main/res/drawable/light_grey_border_item.xml
index 533956a98c..b3de81dae7 100644
--- a/common/src/main/res/drawable/light_grey_border_item.xml
+++ b/common/src/main/res/drawable/light_grey_border_item.xml
@@ -4,7 +4,7 @@
         <shape android:shape="rectangle"  >
             <corners android:radius="14dp" />
             <solid android:color="@color/background_secondary" />
-            <stroke android:color="@color/light_gray" android:width="1.5dp"/>
+            <stroke android:color="@color/divider_color" android:width="1.5dp"/>
         </shape>
     </item>
     <item android:state_pressed="true">
@@ -25,7 +25,7 @@
         <shape android:shape="rectangle"  >
             <corners android:radius="14dp" />
             <solid android:color="@color/background_secondary" />
-            <stroke android:color="@color/light_gray" android:width="1.5dp"/>
+            <stroke android:color="@color/divider_color" android:width="1.5dp"/>
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/common/src/main/res/layout/dialog_simple.xml b/common/src/main/res/layout/dialog_simple.xml
index 22f94b561b..11cfe9001c 100644
--- a/common/src/main/res/layout/dialog_simple.xml
+++ b/common/src/main/res/layout/dialog_simple.xml
@@ -39,39 +39,25 @@
         tools:text="Cancel transaction?" />
 
     <Button
-        android:id="@+id/dialog_negative_button"
-        style="@style/Button.Tertiary.Blue"
+        android:id="@+id/dialog_positive_button"
+        style="@style/Button.Primary.Blue"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
-        android:layout_marginEnd="6dp"
-        app:layout_constraintEnd_toStartOf="@id/dialog_positive_button"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/dialog_message"
-        tools:text="No, keep it" />
+        tools:text="Yes, cancel" />
 
     <Button
-        android:id="@+id/dialog_negative_button_secondary"
-        style="@style/Button.Secondary"
+        android:id="@+id/dialog_negative_button"
+        style="@style/Button.Tertiary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:layout_marginEnd="6dp"
-        android:visibility="gone"
+        android:layout_marginTop="5dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/dialog_message"
+        app:layout_constraintTop_toBottomOf="@id/dialog_positive_button"
         tools:text="No, keep it" />
-
-    <Button
-        android:id="@+id/dialog_positive_button"
-        style="@style/Button.Primary.Blue"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/dialog_negative_button"
-        app:layout_constraintTop_toBottomOf="@id/dialog_message"
-        tools:text="Yes, cancel" />
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/common/src/main/res/values/styles.xml b/common/src/main/res/values/styles.xml
index 1af65e7bdd..da01902211 100644
--- a/common/src/main/res/values/styles.xml
+++ b/common/src/main/res/values/styles.xml
@@ -809,13 +809,20 @@
         <item name="rippleColor">@color/button_ripple_color</item>
     </style>
 
-    <style name="PrimaryButtonTheme.Large.Red">
+    <style name="PrimaryButtonTheme.Large.LightRed">
         <item name="backgroundColor">@color/system_red_0.1</item>
         <item name="strokeColor">@android:color/transparent</item>
         <item name="titleTextColor">@color/system_red</item>
         <item name="rippleColor">@color/button_ripple_color</item>
     </style>
 
+    <style name="PrimaryButtonTheme.Large.Red">
+        <item name="backgroundColor">@color/system_red</item>
+        <item name="strokeColor">@android:color/transparent</item>
+        <item name="titleTextColor">@color/dash_white</item>
+        <item name="rippleColor">@color/button_ripple_color</item>
+    </style>
+
     <style name="PrimaryButtonTheme.Large.TransparentBlue">
         <item name="backgroundColor">@color/light_blue</item>
         <item name="strokeColor">@android:color/transparent</item>
@@ -934,6 +941,10 @@
         <item name="android:theme">@style/PrimaryButtonTheme.Large.Grey</item>
     </style>
 
+    <style name="Button.Primary.Large.LightRed">
+        <item name="android:theme">@style/PrimaryButtonTheme.Large.LightRed</item>
+    </style>
+
     <style name="Button.Primary.Large.Red">
         <item name="android:theme">@style/PrimaryButtonTheme.Large.Red</item>
     </style>
diff --git a/wallet/res/layout/activity_coinjoin.xml b/wallet/res/layout/activity_coinjoin.xml
index 2a498e7a81..181f1e5da8 100644
--- a/wallet/res/layout/activity_coinjoin.xml
+++ b/wallet/res/layout/activity_coinjoin.xml
@@ -27,6 +27,5 @@
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:defaultNavHost="true"
-        app:navGraph="@navigation/nav_coinjoin" />
+        app:defaultNavHost="true" />
 </FrameLayout>
diff --git a/wallet/res/layout/activity_settings.xml b/wallet/res/layout/activity_settings.xml
index 264835647a..74809356b3 100644
--- a/wallet/res/layout/activity_settings.xml
+++ b/wallet/res/layout/activity_settings.xml
@@ -140,6 +140,19 @@
             app:layout_constraintStart_toEndOf="@id/coinjoin_icon"
             app:layout_constraintTop_toBottomOf="@id/coinjoin_title"
             app:layout_constraintBottom_toBottomOf="parent" />
+
+        <ImageView
+            android:id="@+id/coinjoin_subtitle_icon"
+            android:layout_gravity="center_vertical"
+            android:layout_width="12dp"
+            android:layout_height="12dp"
+            android:layout_marginStart="3dp"
+            android:layout_marginTop="3dp"
+            android:visibility="gone"
+            app:srcCompat="@drawable/ic_dash"
+            app:tint="@color/content_tertiary"
+            app:layout_constraintTop_toTopOf="@id/coinjoin_subtitle"
+            app:layout_constraintStart_toEndOf="@id/coinjoin_subtitle" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/wallet/res/layout/fragment_coinjoin_info.xml b/wallet/res/layout/fragment_coinjoin_info.xml
index fd92d70ad7..404153b44e 100644
--- a/wallet/res/layout/fragment_coinjoin_info.xml
+++ b/wallet/res/layout/fragment_coinjoin_info.xml
@@ -22,8 +22,8 @@
         android:orientation="vertical"
         android:paddingBottom="20dp"
         android:clipToPadding="false"
-        app:layout_constraintBottom_toTopOf="@+id/continue_button"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintBottom_toTopOf="@+id/continue_button">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
diff --git a/wallet/res/layout/fragment_coinjoin_level.xml b/wallet/res/layout/fragment_coinjoin_level.xml
new file mode 100644
index 0000000000..8824561aed
--- /dev/null
+++ b/wallet/res/layout/fragment_coinjoin_level.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2022 Dash Core Group.
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/background_secondary"
+    tools:context="de.schildbach.wallet.ui.coinjoin.CoinJoinLevelFragment">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:navigationIcon="@drawable/ic_arrow_back"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipChildren="false"
+        android:orientation="vertical"
+        android:clipToPadding="false"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
+        app:layout_constraintBottom_toTopOf="@+id/continue_btn">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:paddingBottom="20dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/headline"
+                style="@style/Headline5"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:text="@string/coinjoin_mixing_level_title"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/headline_decs"
+                style="@style/Body2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="4dp"
+                android:text="@string/coinjoin_mixing_level_subtitle"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/headline" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/intermediate_cl"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/headline_decs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="15dp"
+                android:background="@drawable/light_grey_border_item"
+                android:paddingHorizontal="20dp"
+                android:paddingVertical="12dp">
+
+                <TextView
+                    android:id="@+id/intermediate_title"
+                    style="@style/Subtitle1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/intermediate"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/intermediate_decs"
+                    style="@style/Caption.Secondary"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="20dp"
+                    android:text="@string/intermediate_level_card_decs"
+                    app:layout_constraintEnd_toStartOf="@+id/intermediate_icon"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/intermediate_title" />
+
+                <ImageView
+                    android:id="@+id/intermediate_clock_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end|center"
+                    android:layout_marginTop="8dp"
+                    android:src="@drawable/ic_clock"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/intermediate_decs" />
+
+                <TextView
+                    android:id="@+id/hours_to_create_a_username_tv"
+                    style="@style/Overline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="6dp"
+                    android:text="@string/coinjoin_intermediate_time"
+                    app:layout_constraintBottom_toBottomOf="@+id/intermediate_clock_icon"
+                    app:layout_constraintStart_toEndOf="@+id/intermediate_clock_icon"
+                    app:layout_constraintTop_toTopOf="@+id/intermediate_clock_icon" />
+
+                <ImageView
+                    android:id="@+id/intermediate_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_intermediate_privacy"
+                    android:layout_marginEnd="3dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/advanced_cl"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/intermediate_cl"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginTop="15dp"
+                android:background="@drawable/light_grey_border_item"
+                android:paddingHorizontal="20dp"
+                android:paddingVertical="12dp">
+
+                <TextView
+                    android:id="@+id/advanced_title"
+                    style="@style/Subtitle1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/advanced"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/advanced_decs"
+                    style="@style/Caption.Secondary"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="20dp"
+                    android:text="@string/advanced_level_card_decs"
+                    app:layout_constraintEnd_toStartOf="@+id/advanced_icon"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/advanced_title" />
+
+                <ImageView
+                    android:id="@+id/advanced_clock_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end|center"
+                    android:layout_marginTop="8dp"
+                    android:src="@drawable/ic_clock"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/advanced_decs" />
+
+                <TextView
+                    android:id="@+id/several_hours_to_create_a_username_tv"
+                    style="@style/Overline"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="6dp"
+                    android:text="@string/coinjoin_advanced_time"
+                    app:layout_constraintBottom_toBottomOf="@+id/advanced_clock_icon"
+                    app:layout_constraintStart_toEndOf="@+id/advanced_clock_icon"
+                    app:layout_constraintTop_toTopOf="@+id/advanced_clock_icon" />
+
+                <ImageView
+                    android:id="@+id/advanced_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_advanced_privacy"
+                    android:layout_marginEnd="3dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+
+    <Button
+        android:id="@+id/continue_btn"
+        style="@style/Button.Primary.Large.Blue"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="15dp"
+        android:text="@string/coinjoin_start"
+        android:enabled="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/fragment_user_name_privacy.xml b/wallet/res/layout/fragment_user_name_privacy.xml
deleted file mode 100644
index 9072ef64bf..0000000000
--- a/wallet/res/layout/fragment_user_name_privacy.xml
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2022 Dash Core Group.
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ This program is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/background_secondary">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        app:navigationIcon="@drawable/ic_arrow_back"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:clipChildren="false"
-        android:orientation="vertical"
-        android:clipToPadding="false"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        app:layout_constraintBottom_toTopOf="@+id/continue_btn">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:paddingBottom="20dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="15dp">
-
-        <ImageView
-            android:id="@id/logo"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_gravity="center_horizontal"
-            android:src="@drawable/ic_user_privacy"
-            android:theme="@style/CrowdNodeLogoBackground" />
-
-        <TextView
-            android:id="@+id/headline"
-            style="@style/Headline5"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="20dp"
-            android:layout_marginTop="20dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/logo"
-            android:gravity="center_horizontal"
-            android:paddingHorizontal="20dp"
-            android:text="@string/select_privacy_preferences"
-            android:textAlignment="gravity" />
-
-        <TextView
-            android:id="@+id/headline_decs"
-            style="@style/Body2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="20dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/headline"
-            android:layout_marginTop="5dp"
-            android:gravity="center_horizontal"
-            android:text="@string/please_note_cant_change_this_later"
-            android:textAlignment="gravity" />
-
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/basic_cl"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="20dp"
-            android:layout_marginTop="15dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/headline_decs"
-            android:background="@drawable/light_grey_border_item"
-            android:paddingHorizontal="20dp"
-            android:paddingVertical="12dp">
-
-
-            <TextView
-                android:id="@+id/basic_title"
-                style="@style/Subtitle2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:text="@string/Basic"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/basic_decs"
-                style="@style/Caption.Secondary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:text="@string/basic_level_card_decs"
-                app:layout_constraintEnd_toStartOf="@+id/bacic_icon"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/basic_title" />
-
-            <ImageView
-                android:id="@+id/basic_clock_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|center"
-                android:layout_marginTop="8dp"
-                android:src="@drawable/ic_clock"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/basic_decs" />
-
-            <TextView
-                android:id="@+id/minutes_to_create_a_username_tv"
-                style="@style/Overline"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:gravity="center_vertical"
-                android:text="@string/minutes_to_create_a_username"
-                app:layout_constraintBottom_toBottomOf="@+id/basic_clock_icon"
-                app:layout_constraintStart_toEndOf="@+id/basic_clock_icon"
-                app:layout_constraintTop_toTopOf="@+id/basic_clock_icon" />
-
-            <ImageView
-                android:id="@+id/bacic_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|center"
-                app:tint="@color/light_gray"
-                android:src="@drawable/ic_basic_privacy"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/intermediate_cl"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/basic_cl"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="20dp"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/light_grey_border_item"
-            android:paddingHorizontal="20dp"
-            android:paddingVertical="12dp">
-
-
-            <TextView
-                android:id="@+id/intermediate_title"
-                style="@style/Subtitle2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:text="@string/Intermediate"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/intermediate_decs"
-                style="@style/Caption.Secondary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:text="@string/intermediate_level_card_decs"
-                app:layout_constraintEnd_toStartOf="@+id/intermediate_icon"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/intermediate_title" />
-
-            <ImageView
-                android:id="@+id/intermediate_clock_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|center"
-                android:layout_marginTop="8dp"
-                android:src="@drawable/ic_clock"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/intermediate_decs" />
-
-            <TextView
-                android:id="@+id/hours_to_create_a_username_tv"
-                style="@style/Overline"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:gravity="center_vertical"
-                android:text="@string/_1_2_hours"
-                app:layout_constraintBottom_toBottomOf="@+id/intermediate_clock_icon"
-                app:layout_constraintStart_toEndOf="@+id/intermediate_clock_icon"
-                app:layout_constraintTop_toTopOf="@+id/intermediate_clock_icon" />
-
-            <ImageView
-                android:id="@+id/intermediate_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|center"
-                android:src="@drawable/ic_intermediate_privacy"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/advanced_cl"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/intermediate_cl"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="20dp"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/light_grey_border_item"
-            android:paddingHorizontal="20dp"
-            android:paddingVertical="12dp">
-
-
-            <TextView
-                android:id="@+id/advanced_title"
-                style="@style/Subtitle2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:text="@string/advanced"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/advanced_decs"
-                style="@style/Caption.Secondary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:text="@string/advanced_level_card_decs"
-                app:layout_constraintEnd_toStartOf="@+id/advanced_icon"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/advanced_title" />
-
-            <ImageView
-                android:id="@+id/advanced_clock_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|center"
-                android:layout_marginTop="8dp"
-                android:src="@drawable/ic_clock"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/advanced_decs" />
-
-            <TextView
-                android:id="@+id/several_hours_to_create_a_username_tv"
-                style="@style/Overline"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginStart="5dp"
-                android:gravity="center_vertical"
-                android:text="@string/several_hours"
-                app:layout_constraintBottom_toBottomOf="@+id/advanced_clock_icon"
-                app:layout_constraintStart_toEndOf="@+id/advanced_clock_icon"
-                app:layout_constraintTop_toTopOf="@+id/advanced_clock_icon" />
-
-            <ImageView
-                android:id="@+id/advanced_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|center"
-                android:src="@drawable/ic_advanced_privacy"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-    </ScrollView>
-
-    <Button
-        android:id="@+id/continue_btn"
-        style="@style/Button.Primary.Large.Blue"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="20dp"
-        android:text="@string/button_continue"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/wallet/res/layout/fragment_voting_request_details.xml b/wallet/res/layout/fragment_voting_request_details.xml
index f37f5ee17b..c73f503243 100644
--- a/wallet/res/layout/fragment_voting_request_details.xml
+++ b/wallet/res/layout/fragment_voting_request_details.xml
@@ -272,7 +272,7 @@
 
     <Button
         android:id="@+id/cancel_request_button"
-        style="@style/Button.Primary.Large.Red"
+        style="@style/Button.Primary.Large.LightRed"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="15dp"
diff --git a/wallet/res/navigation/nav_coinjoin.xml b/wallet/res/navigation/nav_coinjoin.xml
index 93ab45a9cf..136f266169 100644
--- a/wallet/res/navigation/nav_coinjoin.xml
+++ b/wallet/res/navigation/nav_coinjoin.xml
@@ -18,8 +18,7 @@
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/nav_coinjoin"
-    app:startDestination="@id/coinJoinInfoFragment">
+    android:id="@+id/nav_coinjoin">
 
     <fragment
         android:id="@+id/coinJoinInfoFragment"
@@ -27,11 +26,17 @@
         android:label="CoinJoinInfoFragment"
         tools:layout="@layout/fragment_coinjoin_info">
 
-<!--        <action-->
-<!--            android:id="@+id/info_to_level"-->
-<!--            app:destination="@id/coinjoinLevelFragment"-->
-<!--            app:enterAnim="@anim/slide_in_right"-->
-<!--            app:exitAnim="@anim/activity_stay"-->
-<!--            app:popExitAnim="@anim/slide_out_left" />-->
+        <action
+            android:id="@+id/info_to_level"
+            app:destination="@id/coinJoinLevelFragment"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/activity_stay"
+            app:popExitAnim="@anim/slide_out_left" />
     </fragment>
+
+    <fragment
+        android:id="@+id/coinJoinLevelFragment"
+        android:name="de.schildbach.wallet.ui.coinjoin.CoinJoinLevelFragment"
+        android:label="CoinJoinLevelFragment"
+        tools:layout="@layout/fragment_coinjoin_level" />
 </navigation>
\ No newline at end of file
diff --git a/wallet/res/navigation/nav_invite_friends.xml b/wallet/res/navigation/nav_invite_friends.xml
index b606d97516..ef6cc585af 100644
--- a/wallet/res/navigation/nav_invite_friends.xml
+++ b/wallet/res/navigation/nav_invite_friends.xml
@@ -61,6 +61,6 @@
 
     <fragment
         android:id="@+id/createUsernamePrivacyFragment"
-        android:name="de.schildbach.wallet.ui.username.CreateUsernamePrivacyFragment"
-        tools:layout="@layout/fragment_user_name_privacy"/>
+        android:name="de.schildbach.wallet.ui.coinjoin.CoinJoinLevelFragment"
+        tools:layout="@layout/fragment_coinjoin_level"/>
 </navigation>
\ No newline at end of file
diff --git a/wallet/res/navigation/nav_username.xml b/wallet/res/navigation/nav_username.xml
index aa4961c2f2..589051b5ca 100644
--- a/wallet/res/navigation/nav_username.xml
+++ b/wallet/res/navigation/nav_username.xml
@@ -25,8 +25,8 @@
 
     <fragment
         android:id="@+id/createUsernamePrivacyFragment"
-        android:name="de.schildbach.wallet.ui.username.CreateUsernamePrivacyFragment"
-        tools:layout="@layout/fragment_user_name_privacy">
+        android:name="de.schildbach.wallet.ui.coinjoin.CoinJoinLevelFragment"
+        tools:layout="@layout/fragment_coinjoin_level">
         <action
             android:id="@+id/username_privacy_to_createUsernameFragment"
             app:popUpTo="@+id/createUsernameFragment"
diff --git a/wallet/res/values/strings.xml b/wallet/res/values/strings.xml
index 94bf331763..198d7ea1d1 100644
--- a/wallet/res/values/strings.xml
+++ b/wallet/res/values/strings.xml
@@ -393,15 +393,6 @@
     <string name="send_to_address">Send to Address</string>
     <string name="select_privacy_preferences">Select your username privacy preferences</string>
     <string name="please_note_cant_change_this_later">Please note that you will not be able to change this later</string>
-    <string name="Basic">Basic</string>
-    <string name="Intermediate">Intermediate</string>
-    <string name="basic_level_card_decs">Advanced users can determine your transaction history</string>
-    <string name="minutes_to_create_a_username">1–2 minutes to create a username</string>
-    <string name="intermediate_level_card_decs">Advanced users who have a very high level of technical expertise can determine your transaction history</string>
-    <string name="_1_2_hours">1–2 hours</string>
-    <string name="several_hours">Several hours</string>
-    <string name="advanced_level_card_decs">It would be very difficult for advanced users with any level of technical expertise to determine your transaction history</string>
-    <string name="advanced">Advanced</string>
     <string name="Intermediate_level_WIFI_Warning">Intermediate privacy level requires a reliable internet connection</string>
     <string name="Advanced_level_WIFI_Warning">Advanced privacy level requires a reliable internet connection</string>
     <string name="privcay_level_WIFI_warning_desc">It is recommended to be on a Wi-Fi network to avoid losing any funds</string>
@@ -505,4 +496,18 @@
     <string name="coinjoin_description_1">You will only be able to spend Dash that has been mixed when this is turned on. This can be turned off at any time.</string>
     <string name="coinjoin_description_2">Newly received Dash will be automatically mixed when the wallet is opened</string>
     <string name="coinjoin_description_3">Turning this feature on will result a higher battery usage</string>
+    <string name="coinjoin_mixing_level_title">Select mixing level</string>
+    <string name="coinjoin_mixing_level_subtitle">You can change or stop the mixing level at any time</string>
+    <string name="intermediate">Intermediate</string>
+    <string name="advanced">Advanced</string>
+    <string name="intermediate_level_card_decs">Advanced users who have a very high level of technical expertise can determine your transaction history</string>
+    <string name="advanced_level_card_decs">It would be very difficult for advanced users with any level of technical expertise to determine your transaction history</string>
+    <string name="coinjoin_intermediate_time">up to 30 minutes</string>
+    <string name="coinjoin_advanced_time">Multiple hours</string>
+    <string name="coinjoin_start">Start Mixing</string>
+    <string name="coinjoin_stop">Stop Mixing</string>
+    <string name="coinjoin_progress">Mixing · %1$s of %2$s</string>
+    <string name="coinjoin_change_level_confirmation">Are you sure you want to change the privacy level?</string>
+    <string name="coinjoin_stop_mixing_title">Are you sure you want to stop mixing?</string>
+    <string name="coinjoin_stop_mixing_message">Any funds that have been mixed will be combined with your un mixed funds</string>
 </resources>
diff --git a/wallet/src/de/schildbach/wallet/data/CoinJoinConfig.kt b/wallet/src/de/schildbach/wallet/data/CoinJoinConfig.kt
index 63f79ddd13..a890c97cf7 100644
--- a/wallet/src/de/schildbach/wallet/data/CoinJoinConfig.kt
+++ b/wallet/src/de/schildbach/wallet/data/CoinJoinConfig.kt
@@ -18,7 +18,6 @@
 package de.schildbach.wallet.data
 
 import android.content.Context
-
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.longPreferencesKey
@@ -39,5 +38,6 @@ open class CoinJoinConfig @Inject constructor(
         val COINJOIN_SESSIONS = intPreferencesKey("coinjoin_sessions")
         val COINJOIN_MULTISESSION = booleanPreferencesKey("coinjoin_multisession")
         val COINJOIN_AMOUNT = longPreferencesKey("coinjoin_amount")
+        val FIRST_TIME_INFO_SHOWN = booleanPreferencesKey("first_time_info_shown")
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/service/CoinJoinService.kt b/wallet/src/de/schildbach/wallet/service/CoinJoinService.kt
index 3ab90bc371..3bf758938a 100644
--- a/wallet/src/de/schildbach/wallet/service/CoinJoinService.kt
+++ b/wallet/src/de/schildbach/wallet/service/CoinJoinService.kt
@@ -66,9 +66,10 @@ enum class CoinJoinMode {
 }
 
 interface CoinJoinService {
+    var mode: CoinJoinMode
+    val mixingStatus: MixingStatus
+
     fun needsToMix(amount: Coin): Boolean
-    fun getMode(): CoinJoinMode
-    fun setMode(mode: CoinJoinMode)
     suspend fun configureMixing(
         amount: Coin,
         requestKeyParameter: RequestKeyParameter,
@@ -77,7 +78,6 @@ interface CoinJoinService {
     )
 
     suspend fun prepareAndStartMixing()
-    fun getMixingStatus(): MixingStatus
     suspend fun waitForMixing()
     suspend fun waitForMixingWithException()
 }
@@ -115,8 +115,9 @@ class CoinJoinMixingService @Inject constructor(
     private var mixingCompleteListeners: ArrayList<MixingCompleteListener> = arrayListOf()
     private var sessionCompleteListeners: ArrayList<SessionCompleteListener> = arrayListOf()
 
-    private var mixingStatus: MixingStatus = MixingStatus.NOT_STARTED
-    private var mode: CoinJoinMode = CoinJoinMode.BASIC
+    override var mode: CoinJoinMode = CoinJoinMode.BASIC
+    override var mixingStatus: MixingStatus = MixingStatus.NOT_STARTED
+        private set
 
     private val coroutineScope = CoroutineScope(
         Executors.newFixedThreadPool(2).asCoroutineDispatcher(),
@@ -250,23 +251,11 @@ class CoinJoinMixingService @Inject constructor(
         }
     }
 
-    override fun getMixingStatus(): MixingStatus {
-        return mixingStatus
-    }
-
     override fun needsToMix(amount: Coin): Boolean {
         return walletApplication.wallet?.getBalance(Wallet.BalanceType.COINJOIN_SPENDABLE)
             ?.isLessThan(amount) ?: false
     }
 
-    override fun getMode(): CoinJoinMode {
-        return mode
-    }
-
-    override fun setMode(mode: CoinJoinMode) {
-        this.mode = mode
-    }
-
     override suspend fun configureMixing(
         amount: Coin,
         requestKeyParameter: RequestKeyParameter,
diff --git a/wallet/src/de/schildbach/wallet/ui/SettingsActivity.kt b/wallet/src/de/schildbach/wallet/ui/SettingsActivity.kt
index 31dd5b8038..d865573491 100644
--- a/wallet/src/de/schildbach/wallet/ui/SettingsActivity.kt
+++ b/wallet/src/de/schildbach/wallet/ui/SettingsActivity.kt
@@ -19,9 +19,11 @@ package de.schildbach.wallet.ui
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import de.schildbach.wallet.WalletBalanceWidgetProvider
+import de.schildbach.wallet.service.MixingStatus
 import de.schildbach.wallet.ui.coinjoin.CoinJoinActivity
 import de.schildbach.wallet.ui.main.MainActivity
 import de.schildbach.wallet.ui.more.AboutActivity
@@ -37,6 +39,7 @@ import org.dash.wallet.common.services.analytics.AnalyticsConstants
 import org.dash.wallet.common.services.analytics.AnalyticsService
 import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
 import org.dash.wallet.common.ui.exchange_rates.ExchangeRatesDialog
+import org.dash.wallet.common.util.observe
 import org.slf4j.LoggerFactory
 import javax.inject.Inject
 
@@ -78,7 +81,17 @@ class SettingsActivity : LockScreenActivity() {
         binding.rescanBlockchain.setOnClickListener { resetBlockchain() }
         binding.notifications.setOnClickListener { systemActions.openNotificationSettings() }
         binding.coinjoin.setOnClickListener {
-            startActivity(Intent(this, CoinJoinActivity::class.java))
+            lifecycleScope.launch {
+                val shouldShowFirstTimeInfo = viewModel.shouldShowCoinJoinInfo()
+
+                if (shouldShowFirstTimeInfo) {
+                    viewModel.setCoinJoinInfoShown()
+                }
+
+                val intent = Intent(this@SettingsActivity, CoinJoinActivity::class.java)
+                intent.putExtra(CoinJoinActivity.FIRST_TIME_EXTRA, shouldShowFirstTimeInfo)
+                startActivity(intent)
+            }
         }
 
         walletUIConfig.observe(WalletUIConfig.SELECTED_CURRENCY)
@@ -95,6 +108,20 @@ class SettingsActivity : LockScreenActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        if (viewModel.coinJoinMixingStatus == MixingStatus.MIXING ||
+            viewModel.coinJoinMixingStatus == MixingStatus.PAUSED
+        ) {
+            // TODO: Observe progress
+            binding.coinjoinSubtitleIcon.isVisible = true
+            binding.coinjoinSubtitle.text = getString(R.string.coinjoin_progress, "0.012", "0.028")
+        } else {
+            binding.coinjoinSubtitle.text = getText(R.string.turned_off)
+        }
+    }
+
     private fun resetBlockchain() {
         AdaptiveDialog.create(
             null,
diff --git a/wallet/src/de/schildbach/wallet/ui/SettingsViewModel.kt b/wallet/src/de/schildbach/wallet/ui/SettingsViewModel.kt
index 0b6e49d637..f314076d4d 100644
--- a/wallet/src/de/schildbach/wallet/ui/SettingsViewModel.kt
+++ b/wallet/src/de/schildbach/wallet/ui/SettingsViewModel.kt
@@ -1,24 +1,36 @@
 package de.schildbach.wallet.ui
 
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import org.dash.wallet.common.data.WalletUIConfig
+import de.schildbach.wallet.data.CoinJoinConfig
+import de.schildbach.wallet.service.CoinJoinMixingService
+import de.schildbach.wallet.service.MixingStatus
 import kotlinx.coroutines.launch
+import org.dash.wallet.common.data.WalletUIConfig
 import javax.inject.Inject
 
-
-
 @HiltViewModel
 class SettingsViewModel @Inject constructor(
-    private val walletUIConfig: WalletUIConfig
+    private val walletUIConfig: WalletUIConfig,
+    private val coinJoinConfig: CoinJoinConfig,
+    private val coinJoinService: CoinJoinMixingService
 ): ViewModel() {
-    val voteDashPayIsEnabled = walletUIConfig.observe(WalletUIConfig.VOTE_DASH_PAY_ENABLED).asLiveData()
+    val voteDashPayIsEnabled = walletUIConfig.observe(WalletUIConfig.VOTE_DASH_PAY_ENABLED)
+    val coinJoinMixingStatus: MixingStatus
+        get() = coinJoinService.mixingStatus
 
     fun setVoteDashPay(isEnabled: Boolean) {
         viewModelScope.launch {
             walletUIConfig.set(WalletUIConfig.VOTE_DASH_PAY_ENABLED, isEnabled)
         }
     }
+
+    suspend fun shouldShowCoinJoinInfo(): Boolean {
+        return coinJoinConfig.get(CoinJoinConfig.FIRST_TIME_INFO_SHOWN) != true
+    }
+
+    suspend fun setCoinJoinInfoShown() {
+        coinJoinConfig.set(CoinJoinConfig.FIRST_TIME_INFO_SHOWN, true)
+    }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinActivity.kt b/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinActivity.kt
index d26062651f..fae1017149 100644
--- a/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinActivity.kt
+++ b/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinActivity.kt
@@ -18,18 +18,38 @@
 package de.schildbach.wallet.ui.coinjoin
 
 import android.os.Bundle
+import androidx.core.os.bundleOf
+import androidx.navigation.fragment.NavHostFragment
 import dagger.hilt.android.AndroidEntryPoint
+import de.schildbach.wallet.data.PaymentIntent
 import de.schildbach.wallet.ui.LockScreenActivity
+import de.schildbach.wallet.ui.send.SendCoinsActivity
+import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.ActivityCoinjoinBinding
 
 // TODO: temporary CoinJoin host. Remove when SettingsActivity is refactored.
 // Should not contain any crucial logic.
 @AndroidEntryPoint
 class CoinJoinActivity : LockScreenActivity() {
+    companion object {
+        const val FIRST_TIME_EXTRA = "show_first_time_info"
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         val binding = ActivityCoinjoinBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        initNavController(intent.getBooleanExtra(FIRST_TIME_EXTRA, true))
+    }
+
+    private fun initNavController(showFirstTimeInfo: Boolean) {
+        val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
+        val navController = navHostFragment.navController
+        val navGraph = navController.navInflater.inflate(R.navigation.nav_coinjoin)
+        navGraph.setStartDestination(
+            if (showFirstTimeInfo) R.id.coinJoinInfoFragment else R.id.coinJoinLevelFragment
+        )
+        navController.setGraph(navGraph, bundleOf())
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinInfoFragment.kt b/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinInfoFragment.kt
index 11b2251ec5..9c27a61f01 100644
--- a/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinInfoFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinInfoFragment.kt
@@ -18,13 +18,13 @@
 package de.schildbach.wallet.ui.coinjoin
 
 import android.os.Bundle
-import android.util.Log
 import android.view.View
 import androidx.fragment.app.Fragment
 import dagger.hilt.android.AndroidEntryPoint
 import de.schildbach.wallet_test.R
 import de.schildbach.wallet_test.databinding.FragmentCoinjoinInfoBinding
 import org.dash.wallet.common.ui.viewBinding
+import org.dash.wallet.common.util.safeNavigate
 
 @AndroidEntryPoint
 class CoinJoinInfoFragment : Fragment(R.layout.fragment_coinjoin_info) {
@@ -36,7 +36,7 @@ class CoinJoinInfoFragment : Fragment(R.layout.fragment_coinjoin_info) {
         binding.toolbar.setNavigationOnClickListener { requireActivity().finish() }
 
         binding.continueButton.setOnClickListener {
-            Log.i("COINJOIN", "Continue button clicked")
+            safeNavigate(CoinJoinInfoFragmentDirections.infoToLevel())
         }
     }
 }
diff --git a/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinLevelFragment.kt b/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinLevelFragment.kt
new file mode 100644
index 0000000000..a6ac1828dc
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinLevelFragment.kt
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2023 Dash Core Group.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.schildbach.wallet.ui.coinjoin
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.lifecycleScope
+import dagger.hilt.android.AndroidEntryPoint
+import de.schildbach.wallet.service.CoinJoinMode
+import de.schildbach.wallet_test.R
+import de.schildbach.wallet_test.databinding.FragmentCoinjoinLevelBinding
+import kotlinx.coroutines.launch
+import org.dash.wallet.common.services.analytics.AnalyticsConstants
+import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
+import org.dash.wallet.common.ui.setRoundedRippleBackground
+import org.dash.wallet.common.ui.viewBinding
+
+@AndroidEntryPoint
+class CoinJoinLevelFragment : Fragment(R.layout.fragment_coinjoin_level) {
+    private val binding by viewBinding(FragmentCoinjoinLevelBinding::bind)
+    private val viewModel by viewModels<CoinJoinLevelViewModel>()
+    private var selectedCoinJoinMode = CoinJoinMode.BASIC
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.intermediateCl.setOnClickListener {
+            askAndSwitch(CoinJoinMode.INTERMEDIATE)
+        }
+
+        binding.advancedCl.setOnClickListener {
+            askAndSwitch(CoinJoinMode.ADVANCED)
+        }
+
+        binding.continueBtn.setOnClickListener {
+            lifecycleScope.launch {
+                if (viewModel.isMixing) {
+                    if (confirmStopMixing()) {
+                        viewModel.stopMixing()
+                        requireActivity().finish()
+                    }
+                } else {
+                    viewModel.startMixing(selectedCoinJoinMode)
+                    requireActivity().finish()
+                }
+            }
+        }
+
+        binding.toolbar.setNavigationOnClickListener {
+            requireActivity().finish()
+        }
+
+        setMode(viewModel.mixingMode)
+
+        if (viewModel.isMixing) {
+            binding.continueBtn.setText(R.string.coinjoin_stop)
+            binding.continueBtn.setRoundedRippleBackground(R.style.PrimaryButtonTheme_Large_Red)
+        } else {
+            binding.continueBtn.setText(R.string.coinjoin_start)
+            binding.continueBtn.setRoundedRippleBackground(R.style.PrimaryButtonTheme_Large_Blue)
+        }
+    }
+
+    private fun showConnectionWaringDialog(mode: CoinJoinMode) {
+        AdaptiveDialog.create(
+            org.dash.wallet.integration.coinbase_integration.R.drawable.ic_warning,
+            getString(
+                if (mode == CoinJoinMode.INTERMEDIATE) {
+                    R.string.Intermediate_level_WIFI_Warning
+                } else {
+                    R.string.Advanced_level_WIFI_Warning
+                }
+            ),
+            getString(R.string.privcay_level_WIFI_warning_desc),
+            getString(org.dash.wallet.integration.coinbase_integration.R.string.cancel),
+            getString(R.string.continue_anyway)
+        ).show(requireActivity()) {
+            if (it == true) {
+                viewModel.logEvent(AnalyticsConstants.CoinJoinPrivacy.USERNAME_PRIVACY_WIFI_BTN_CONTINUE)
+                setMode(mode)
+            } else {
+                viewModel.logEvent(AnalyticsConstants.CoinJoinPrivacy.USERNAME_PRIVACY_WIFI_BTN_CANCEL)
+            }
+        }
+    }
+
+    private fun askAndSwitch(mode: CoinJoinMode) {
+        if (viewModel.isMixing) {
+            AdaptiveDialog.simple(
+                getString(R.string.coinjoin_change_level_confirmation),
+                getString(R.string.cancel),
+                getString(
+                    R.string.change_to,
+                    getString(if (mode == CoinJoinMode.ADVANCED) R.string.advanced else R.string.intermediate)
+                )
+            ).show(requireActivity()) { toChange ->
+                if (toChange == true) {
+                    setMode(mode)
+                    viewModel.mixingMode = mode
+                    requireActivity().finish()
+                }
+            }
+        } else if (viewModel.isWifiConnected()) {
+            setMode(mode)
+        } else {
+            showConnectionWaringDialog(mode)
+        }
+    }
+
+    private fun setMode(mode: CoinJoinMode) {
+        if (mode == CoinJoinMode.INTERMEDIATE) {
+            binding.intermediateCl.isSelected = true
+            binding.advancedCl.isSelected = false
+            selectedCoinJoinMode = mode
+            binding.continueBtn.isEnabled = true
+        } else if (mode == CoinJoinMode.ADVANCED) {
+            binding.intermediateCl.isSelected = false
+            binding.advancedCl.isSelected = true
+            selectedCoinJoinMode = mode
+            binding.continueBtn.isEnabled = true
+        }
+    }
+
+    private suspend fun confirmStopMixing(): Boolean {
+        return AdaptiveDialog.create(
+            null,
+            getString(R.string.coinjoin_stop_mixing_title),
+            getString(R.string.coinjoin_stop_mixing_message),
+            getString(R.string.cancel),
+            getString(R.string.coinjoin_stop)
+        ).showAsync(requireActivity()) == true
+    }
+}
diff --git a/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinLevelViewModel.kt b/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinLevelViewModel.kt
new file mode 100644
index 0000000000..c92acf797e
--- /dev/null
+++ b/wallet/src/de/schildbach/wallet/ui/coinjoin/CoinJoinLevelViewModel.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2023 Dash Core Group.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package de.schildbach.wallet.ui.coinjoin
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import de.schildbach.wallet.service.CoinJoinMode
+import de.schildbach.wallet.service.CoinJoinService
+import de.schildbach.wallet.service.MixingStatus
+import org.dash.wallet.common.services.NetworkStateInt
+import org.dash.wallet.common.services.analytics.AnalyticsConstants
+import org.dash.wallet.common.services.analytics.AnalyticsService
+import javax.inject.Inject
+
+@HiltViewModel
+open class CoinJoinLevelViewModel @Inject constructor(
+    private val analytics: AnalyticsService,
+    private val coinJoinService: CoinJoinService,
+    private var networkState: NetworkStateInt
+) : ViewModel() {
+
+    val isMixing: Boolean
+        get() = coinJoinService.mixingStatus == MixingStatus.MIXING ||
+            coinJoinService.mixingStatus == MixingStatus.PAUSED
+
+    var mixingMode: CoinJoinMode
+        get() = coinJoinService.mode
+        set(value) {
+            coinJoinService.mode = value
+//            coinJoinService.prepareAndStartMixing() TODO restart mixing?
+        }
+
+    fun isWifiConnected(): Boolean {
+        return networkState.isWifiConnected()
+    }
+
+    suspend fun startMixing(mode: CoinJoinMode) {
+        analytics.logEvent(
+            AnalyticsConstants.CoinJoinPrivacy.USERNAME_PRIVACY_BTN_CONTINUE,
+            mapOf(AnalyticsConstants.Parameter.VALUE to mode.name)
+        )
+
+        coinJoinService.mode = mode
+        coinJoinService.prepareAndStartMixing() // TODO: change the logic if needed
+    }
+
+    suspend fun stopMixing() {
+//        coinJoinService.stopMixing() // TODO expose stop method?
+    }
+
+    fun logEvent(event: String) {
+        analytics.logEvent(event, mapOf())
+    }
+}
diff --git a/wallet/src/de/schildbach/wallet/ui/username/CreateUsernameFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/CreateUsernameFragment.kt
index b25361d3ad..27b06a3f05 100644
--- a/wallet/src/de/schildbach/wallet/ui/username/CreateUsernameFragment.kt
+++ b/wallet/src/de/schildbach/wallet/ui/username/CreateUsernameFragment.kt
@@ -94,18 +94,10 @@ class CreateUsernameFragment : Fragment(R.layout.fragment_create_username), Text
         }
         binding.username.addTextChangedListener(this)
         binding.registerBtn.setOnClickListener {
-            safeNavigate(CreateUsernameFragmentDirections.createUsernameToUsernamePrivacy())
-        }
-
-        findNavController().currentBackStackEntry?.savedStateHandle?.getLiveData<CoinJoinMode?>("mode")?.observe(
-            viewLifecycleOwner) { result ->
-            // Do something with the result.
-            result?.let {
-                if (reuseTransaction) {
-                    triggerIdentityCreation(true)
-                } else {
-                    showConfirmationDialog()
-                }
+            if (reuseTransaction) {
+                triggerIdentityCreation(true)
+            } else {
+                showConfirmationDialog()
             }
         }
         binding.processingIdentityDismissBtn.setOnClickListener { requireActivity().finish() }
diff --git a/wallet/src/de/schildbach/wallet/ui/username/CreateUsernamePrivacyFragment.kt b/wallet/src/de/schildbach/wallet/ui/username/CreateUsernamePrivacyFragment.kt
deleted file mode 100644
index 35a758bee3..0000000000
--- a/wallet/src/de/schildbach/wallet/ui/username/CreateUsernamePrivacyFragment.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-package de.schildbach.wallet.ui.username
-
-import android.os.Bundle
-import android.view.View
-import android.widget.ImageView
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.content.res.ResourcesCompat
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
-import androidx.navigation.fragment.findNavController
-import dagger.hilt.android.AndroidEntryPoint
-import de.schildbach.wallet.service.CoinJoinMode
-import de.schildbach.wallet_test.R
-import de.schildbach.wallet_test.databinding.FragmentUserNamePrivacyBinding
-import org.dash.wallet.common.services.analytics.AnalyticsConstants
-import org.dash.wallet.common.ui.dialogs.AdaptiveDialog
-import org.dash.wallet.common.ui.viewBinding
-
-@AndroidEntryPoint
-class CreateUsernamePrivacyFragment : Fragment(R.layout.fragment_user_name_privacy) {
-    private val binding by viewBinding(FragmentUserNamePrivacyBinding::bind)
-    private val viewModel by viewModels<CreateUsernamePrivacyViewModel>()
-    private var selectedCoinJoinMode = CoinJoinMode.BASIC
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        setPrivacyItemSelected(binding.basicCl, binding.bacicIcon)
-        binding.basicCl.setOnClickListener {
-            setPrivacyItemSelected(binding.basicCl, binding.bacicIcon)
-            setPrivacyItemUnSelected(binding.intermediateCl, binding.intermediateIcon)
-            setPrivacyItemUnSelected(binding.advancedCl, binding.advancedIcon)
-            selectedCoinJoinMode = CoinJoinMode.BASIC
-        }
-
-        binding.intermediateCl.setOnClickListener {
-            if (!viewModel.isWifiConnected()) {
-                showConnectionWaringDialog(CoinJoinMode.INTERMEDIATE)
-            } else {
-                setIntermediateMode(CoinJoinMode.INTERMEDIATE)
-            }
-        }
-
-        binding.advancedCl.setOnClickListener {
-            if (!viewModel.isWifiConnected()) {
-                showConnectionWaringDialog(CoinJoinMode.ADVANCED)
-            } else {
-                setAdvancedMode(CoinJoinMode.ADVANCED)
-            }
-        }
-        binding.continueBtn.setOnClickListener {
-            viewModel.logEvent(
-                AnalyticsConstants.CoinJoinPrivacy.USERNAME_PRIVACY_BTN_CONTINUE,
-                mapOf(
-                    AnalyticsConstants.Parameter.VALUE to selectedCoinJoinMode.name,
-                ),
-            )
-
-            viewModel.setCoinJoinMode(selectedCoinJoinMode)
-            findNavController().previousBackStackEntry?.savedStateHandle?.set(
-                "mode",
-                selectedCoinJoinMode,
-            )
-            findNavController().popBackStack()
-        }
-
-        binding.toolbar.setNavigationOnClickListener {
-            findNavController().previousBackStackEntry?.savedStateHandle?.set("mode", null)
-            findNavController().popBackStack()
-        }
-    }
-
-    private fun showConnectionWaringDialog(mode: CoinJoinMode) {
-        AdaptiveDialog.create(
-            org.dash.wallet.integration.coinbase_integration.R.drawable.ic_warning,
-            getString(
-                if (mode == CoinJoinMode.INTERMEDIATE) {
-                    R.string.Intermediate_level_WIFI_Warning
-                } else {
-                    R.string.Advanced_level_WIFI_Warning
-                },
-            ),
-            getString(R.string.privcay_level_WIFI_warning_desc),
-            getString(org.dash.wallet.integration.coinbase_integration.R.string.cancel),
-            getString(R.string.continue_anyway),
-        ).show(requireActivity()) {
-            if (it == true) {
-                viewModel.logEvent(AnalyticsConstants.CoinJoinPrivacy.USERNAME_PRIVACY_WIFI_BTN_CONTINUE)
-                if (mode == CoinJoinMode.INTERMEDIATE) {
-                    setIntermediateMode(mode)
-                } else if (mode == CoinJoinMode.ADVANCED) {
-                    setAdvancedMode(mode)
-                }
-            } else {
-                viewModel.logEvent(AnalyticsConstants.CoinJoinPrivacy.USERNAME_PRIVACY_WIFI_BTN_CANCEL)
-            }
-        }
-    }
-
-    private fun setIntermediateMode(mode: CoinJoinMode) {
-        setPrivacyItemUnSelected(binding.basicCl, binding.bacicIcon)
-        setPrivacyItemSelected(binding.intermediateCl, binding.intermediateIcon)
-        setPrivacyItemUnSelected(binding.advancedCl, binding.advancedIcon)
-        selectedCoinJoinMode = mode
-    }
-
-    private fun setAdvancedMode(mode: CoinJoinMode) {
-        setPrivacyItemUnSelected(binding.basicCl, binding.bacicIcon)
-        setPrivacyItemUnSelected(binding.intermediateCl, binding.intermediateIcon)
-        setPrivacyItemSelected(binding.advancedCl, binding.advancedIcon)
-        selectedCoinJoinMode = mode
-    }
-
-    private fun setPrivacyItemSelected(cl: ConstraintLayout, icon: ImageView) {
-        cl.isSelected = true
-        val tintColor = ResourcesCompat.getColor(resources, R.color.dash_blue, null)
-        icon.setColorFilter(tintColor)
-    }
-
-    private fun setPrivacyItemUnSelected(cl: ConstraintLayout, icon: ImageView) {
-        cl.isSelected = false
-        val tintColor = ResourcesCompat.getColor(resources, R.color.light_gray, null)
-        icon.setColorFilter(tintColor)
-    }
-}
diff --git a/wallet/src/de/schildbach/wallet/ui/username/CreateUsernamePrivacyViewModel.kt b/wallet/src/de/schildbach/wallet/ui/username/CreateUsernamePrivacyViewModel.kt
deleted file mode 100644
index 96e1ccfff3..0000000000
--- a/wallet/src/de/schildbach/wallet/ui/username/CreateUsernamePrivacyViewModel.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package de.schildbach.wallet.ui.username
-
-import androidx.lifecycle.ViewModel
-import dagger.hilt.android.lifecycle.HiltViewModel
-import de.schildbach.wallet.service.CoinJoinMode
-import de.schildbach.wallet.service.CoinJoinService
-import org.dash.wallet.common.services.NetworkStateInt
-import org.dash.wallet.common.services.analytics.AnalyticsConstants
-import org.dash.wallet.common.services.analytics.AnalyticsService
-import javax.inject.Inject
-
-@HiltViewModel
-open class CreateUsernamePrivacyViewModel @Inject constructor(
-    private val analytics: AnalyticsService,
-    private val coinJoinService: CoinJoinService,
-    var networkState: NetworkStateInt,
-
-    ) : ViewModel() {
-    fun isWifiConnected(): Boolean {
-        return networkState.isWifiConnected()
-    }
-    fun setCoinJoinMode(mode: CoinJoinMode) {
-        coinJoinService.setMode(mode)
-    }
-    fun logEvent(event: String, params: Map<AnalyticsConstants.Parameter, Any> = mapOf()) {
-        analytics.logEvent(event, params)
-    }
-}