diff --git a/catalog/src/main/res/layout/screen_fragment_sheet_catalog.xml b/catalog/src/main/res/layout/screen_fragment_sheet_catalog.xml
index c43b3c5e6..1719057be 100644
--- a/catalog/src/main/res/layout/screen_fragment_sheet_catalog.xml
+++ b/catalog/src/main/res/layout/screen_fragment_sheet_catalog.xml
@@ -65,6 +65,7 @@
 				android:visibility="gone"
 				app:inputHint="Number of elements"
 				app:inputText="4"
+				app:inputType="number"
 				tools:visibility="visible" />
 
 	<LinearLayout
diff --git a/library/src/main/java/com/telefonica/mistica/sheet/Sheet.kt b/library/src/main/java/com/telefonica/mistica/sheet/Sheet.kt
index 13fa7e748..d0bada26c 100644
--- a/library/src/main/java/com/telefonica/mistica/sheet/Sheet.kt
+++ b/library/src/main/java/com/telefonica/mistica/sheet/Sheet.kt
@@ -7,7 +7,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
-import android.widget.Space
 import android.widget.TextView
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.ViewCompat
@@ -89,20 +88,18 @@ open class SheetView(
         root: View,
         sheetModel: SheetModel,
     ) {
-        val handler = root.findViewById<View>(R.id.handler)
+        val closeButton = root.findViewById<View>(R.id.close_button)
         val title = root.findViewById<TextView>(R.id.title)
         val subtitle = root.findViewById<TextView>(R.id.subtitle)
         val description = root.findViewById<TextView>(R.id.description)
-        val titleSpace =  root.findViewById<Space>(R.id.title_space)
 
         val titleText = sheetModel.header.title
         val subtitleText = sheetModel.header.subtitle
         val descriptionText = sheetModel.header.description
 
-        handler.setOnClickListener { cancel() }
+        closeButton.setOnClickListener { cancel() }
         title.setTextOrHide(titleText)
         ViewCompat.setAccessibilityHeading(title, true)
-        titleSpace.setSpaceOrGone(titleText)
         subtitle.setTextOrHide(subtitleText)
         description.setTextOrHide(descriptionText)
     }
@@ -295,11 +292,3 @@ private fun TextView.setTextOrHide(text: String?) {
         this.text = text
     }
 }
-
-private fun Space.setSpaceOrGone(text: String?) {
-    if (text.isNullOrEmpty()) {
-        this.visibility = View.VISIBLE
-    } else {
-        this.visibility = View.GONE
-    }
-}
\ No newline at end of file
diff --git a/library/src/main/res/layout/sheet_layout.xml b/library/src/main/res/layout/sheet_layout.xml
index eb07ee2fc..b083ce44f 100644
--- a/library/src/main/res/layout/sheet_layout.xml
+++ b/library/src/main/res/layout/sheet_layout.xml
@@ -13,36 +13,51 @@
 			android:id="@+id/handler"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:importantForAccessibility="no"
 			android:padding="8dp"
-			android:contentDescription="@string/close_button_content_description"
-			android:clickable="true"
-			android:focusable="true"
 			android:layout_gravity="center"
 			app:srcCompat="@drawable/sheet_handler"
 			/>
 
-	<TextView
-			android:id="@+id/title"
+	<androidx.constraintlayout.widget.ConstraintLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:paddingStart="16dp"
-			android:paddingTop="12dp"
-			android:paddingBottom="8dp"
-			tools:ignore="RtlSymmetry"
-			tools:text="Title"
-			android:textAppearance="@style/AppTheme.TextAppearance.Preset5"
-			/>
+			>
 
-	<Space
-			android:id="@+id/title_space"
-			android:layout_width="match_parent"
-			android:layout_height="24dp"
-			android:visibility="gone"
-			/>
+		<TextView
+				android:id="@+id/title"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:paddingStart="16dp"
+				android:paddingTop="12dp"
+				android:paddingBottom="8dp"
+				tools:ignore="RtlSymmetry"
+				tools:text="Title"
+				android:textAppearance="@style/AppTheme.TextAppearance.Preset5"
+				app:layout_constraintEnd_toStartOf="@+id/close_button"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="parent"
+				/>
+
+		<ImageButton
+				android:id="@+id/close_button"
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:layout_marginEnd="8dp"
+				android:background="?attr/selectableItemBackgroundBorderless"
+				android:contentDescription="@string/close_button_content_description"
+				android:src="@drawable/icn_cross"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintTop_toTopOf="parent"
+				/>
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
 
 	<androidx.core.widget.NestedScrollView
 			android:layout_width="match_parent"
-			android:layout_height="match_parent">
+			android:layout_height="match_parent"
+			>
+
 		<LinearLayout
 				android:id="@+id/container_outer"
 				android:layout_width="match_parent"
@@ -55,7 +70,8 @@
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintLeft_toLeftOf="parent"
 				app:layout_constraintRight_toRightOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/title">
+				app:layout_constraintTop_toBottomOf="@+id/title"
+				>
 
 
 			<TextView
@@ -79,20 +95,15 @@
 					android:textAppearance="@style/AppTheme.TextAppearance.Preset2"
 					android:textColor="?colorTextSecondary"
 					/>
-			<androidx.core.widget.NestedScrollView
-					android:paddingTop="8dp"
+
+			<LinearLayout
+					android:id="@+id/container"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
-					android:fillViewport="true"
+					android:orientation="vertical"
+					android:paddingTop="8dp"
 					android:paddingBottom="16dp"
-					>
-				<LinearLayout
-						android:id="@+id/container"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:orientation="vertical"/>
-
-			</androidx.core.widget.NestedScrollView>
+					/>
 
 		</LinearLayout>
 	</androidx.core.widget.NestedScrollView>