diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml
index 7cbe565ea5..152672e0d1 100644
--- a/app/src/main/res/layout/component_collection_creation.xml
+++ b/app/src/main/res/layout/component_collection_creation.xml
@@ -12,7 +12,7 @@
 
     <Button
         android:id="@+id/back_button"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:drawablePadding="8dp"
@@ -27,16 +27,16 @@
         android:textSize="20sp"
         app:drawableStartCompat="@drawable/mozac_ic_back"
         app:drawableTint="@color/fx_mobile_icon_color_oncolor"
+        app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toStartOf="@+id/guideline"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_default="wrap"
         tools:ignore="ButtonStyleXmlDetector" />
 
     <Button
         android:id="@+id/select_all_button"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:fontFamily="@font/metropolis_bold"
@@ -49,12 +49,12 @@
         android:textAllCaps="false"
         android:textColor="@color/fx_mobile_text_color_oncolor_primary"
         android:textSize="16sp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="@id/back_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1"
         app:layout_constraintStart_toEndOf="@+id/guideline"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_default="wrap"
         tools:ignore="ButtonStyleXmlDetector" />
 
     <androidx.constraintlayout.widget.Guideline
diff --git a/app/src/main/res/layout/fragment_add_on_details.xml b/app/src/main/res/layout/fragment_add_on_details.xml
index 710732f646..dce5a80500 100644
--- a/app/src/main/res/layout/fragment_add_on_details.xml
+++ b/app/src/main/res/layout/fragment_add_on_details.xml
@@ -182,13 +182,13 @@
             <TextView
                 android:id="@+id/users_count"
                 style="@style/AboutHeaderContentText"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                app:layout_constrainedWidth="true"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/rating_view"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintWidth_default="wrap"
                 tools:text="591,642" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>