diff --git a/auth/src/main/res/layout/fragment_configure_workspace.xml b/auth/src/main/res/layout/fragment_configure_workspace.xml
index d5ebe2df6c565a094154996f27833320f4247861..254874400a10c4ed78740e9c7514b3e5e6a7ff6d 100644
--- a/auth/src/main/res/layout/fragment_configure_workspace.xml
+++ b/auth/src/main/res/layout/fragment_configure_workspace.xml
@@ -47,9 +47,9 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvWorkspaceTasks"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_constraintBottom_toTopOf="@id/btbCreate"
+        app:layout_constraintBottom_toTopOf="@id/buttonDivider"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/messageDivider" />
@@ -66,12 +66,14 @@
 
     <org.futo.circles.core.view.LoadingButton
         android:id="@+id/btbCreate"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
+        android:layout_marginHorizontal="36dp"
         android:layout_marginBottom="16dp"
         android:text="@string/create"
         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/auth/src/main/res/layout/list_item_mandatory_workspace_task.xml b/auth/src/main/res/layout/list_item_mandatory_workspace_task.xml
index 5b6735ecb3112056eb926b9b1fb09de8f5ab1fb9..84a748e6971714c3bd19bf2782c22756d5dbba62 100644
--- a/auth/src/main/res/layout/list_item_mandatory_workspace_task.xml
+++ b/auth/src/main/res/layout/list_item_mandatory_workspace_task.xml
@@ -14,7 +14,6 @@
         style="@style/body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
         android:layout_marginEnd="36dp"
         android:ellipsize="end"
         android:lines="1"
@@ -27,7 +26,6 @@
         android:id="@+id/tvMessage"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
         android:layout_marginEnd="36dp"
         android:ellipsize="end"
         android:maxLines="4"
diff --git a/auth/src/main/res/layout/list_item_optional_workspace_task.xml b/auth/src/main/res/layout/list_item_optional_workspace_task.xml
index ca9ddc308d422d8205c6e6b4bb6ba28cb60522a2..249fa5323d43f9c2689683cef35811244a8a239b 100644
--- a/auth/src/main/res/layout/list_item_optional_workspace_task.xml
+++ b/auth/src/main/res/layout/list_item_optional_workspace_task.xml
@@ -14,6 +14,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:clickable="false"
+        android:padding="-3dp"
         android:focusable="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"