diff --git a/app/src/main/java/com/jeluchu/wastickersonline/core/ui/composables/EmptyInfo.kt b/app/src/main/java/com/jeluchu/wastickersonline/core/ui/composables/EmptyInfo.kt
new file mode 100644
index 0000000..7f0c469
--- /dev/null
+++ b/app/src/main/java/com/jeluchu/wastickersonline/core/ui/composables/EmptyInfo.kt
@@ -0,0 +1,45 @@
+package com.jeluchu.wastickersonline.core.ui.composables
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.jeluchu.jchucomponents.ktx.compose.toStringRes
+import com.jeluchu.wastickersonline.R
+import com.jeluchu.wastickersonline.core.ui.theme.darkness
+
+@Composable
+fun EmptyInfo() = Box(modifier = Modifier.fillMaxSize()) {
+    Column(
+        modifier = Modifier
+            .align(Alignment.Center)
+            .padding(horizontal = 50.dp),
+        verticalArrangement = Arrangement.spacedBy(5.dp)
+    ) {
+        Text(
+            modifier = Modifier.fillMaxWidth(),
+            text = R.string.emptyInfoTitle.toStringRes(),
+            textAlign =  TextAlign.Center,
+            fontWeight = FontWeight.Bold,
+            fontSize = 24.sp,
+            color = darkness
+        )
+        Text(
+            text = R.string.emptyInfoDescription.toStringRes(),
+            color = darkness.copy(.6f),
+            textAlign =  TextAlign.Center,
+            lineHeight = 20.sp,
+            fontSize = 16.sp
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/jeluchu/wastickersonline/features/sticker/view/DashboardView.kt b/app/src/main/java/com/jeluchu/wastickersonline/features/sticker/view/DashboardView.kt
index a1765f1..4d1db8c 100644
--- a/app/src/main/java/com/jeluchu/wastickersonline/features/sticker/view/DashboardView.kt
+++ b/app/src/main/java/com/jeluchu/wastickersonline/features/sticker/view/DashboardView.kt
@@ -7,14 +7,11 @@ import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkVertically
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Search
@@ -23,7 +20,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.material3.TopAppBarDefaults
@@ -33,13 +29,11 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.NestedScrollSource
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.platform.UriHandler
@@ -54,25 +48,21 @@ import com.jeluchu.jchucomponents.ktx.compose.toImageVector
 import com.jeluchu.jchucomponents.ktx.compose.toStringRes
 import com.jeluchu.jchucomponents.ktx.strings.empty
 import com.jeluchu.jchucomponents.ui.accompanist.systemui.SystemStatusBarColors
-import com.jeluchu.jchucomponents.ui.animations.lists.Animations
-import com.jeluchu.jchucomponents.ui.animations.lists.animateItem
 import com.jeluchu.jchucomponents.ui.composables.button.FloatingButton
 import com.jeluchu.jchucomponents.ui.composables.button.FloatingButtonSettings
 import com.jeluchu.jchucomponents.ui.composables.column.ScrollableColumn
-import com.jeluchu.jchucomponents.ui.composables.images.NetworkImage
+import com.jeluchu.jchucomponents.ui.composables.loaders.CircularLoading
 import com.jeluchu.jchucomponents.ui.extensions.modifier.cornerRadius
-import com.jeluchu.jchucomponents.ui.extensions.modifier.noRippleClickable
 import com.jeluchu.jchucomponents.ui.foundation.icon.IconLink
-import com.jeluchu.jchucomponents.ui.foundation.lists.ListRow
 import com.jeluchu.jchucomponents.ui.runtime.remember.rememberMutableStateOf
 import com.jeluchu.wastickersonline.R
 import com.jeluchu.wastickersonline.core.extensions.search
+import com.jeluchu.wastickersonline.core.ui.composables.EmptyInfo
 import com.jeluchu.wastickersonline.core.ui.composables.SearchTextField
 import com.jeluchu.wastickersonline.core.ui.theme.darkGreen
 import com.jeluchu.wastickersonline.core.ui.theme.darkness
 import com.jeluchu.wastickersonline.core.ui.theme.milky
 import com.jeluchu.wastickersonline.core.ui.theme.primary
-import com.jeluchu.wastickersonline.core.ui.theme.secondary
 import com.jeluchu.wastickersonline.features.sticker.models.StickerPack
 import com.jeluchu.wastickersonline.features.sticker.viewmodel.StickersViewModel
 
@@ -109,6 +99,7 @@ private fun DashboardView(
     onRateClick: () -> Unit,
 ) {
     val search = rememberMutableStateOf(String.empty())
+    val stickers = state.data.search(query = search.value, param = { it.name })
     var isSearchActive by rememberMutableStateOf(false)
     val isVisible = rememberMutableStateOf(true)
     val nestedScrollConnection = remember {
@@ -158,7 +149,7 @@ private fun DashboardView(
             FloatingButton(
                 isVisible = isVisible.value,
                 floatButton = FloatingButtonSettings(
-                    icon = R.drawable.ic_deco_search,
+                    icon = if (isSearchActive) R.drawable.ic_deco_close else R.drawable.ic_deco_search,
                     tint = milky,
                     background = darkGreen
                 ),
@@ -211,7 +202,7 @@ private fun DashboardView(
                             focusedSupportingTextColor = milky,
                             unfocusedSupportingTextColor = milky,
                             disabledSupportingTextColor = milky,
-                            errorSupportingTextColor= milky,
+                            errorSupportingTextColor = milky,
                             focusedContainerColor = darkness.copy(.6f),
                             unfocusedContainerColor = darkness.copy(.6f),
                             focusedIndicatorColor = Color.Transparent,
@@ -249,45 +240,20 @@ private fun DashboardView(
                 }
             }
 
-            ScrollableColumn {
-                state.data.search(query = search.value, param = { it.name }).forEach {
-                    Column(
-                        modifier = Modifier.noRippleClickable { onStickerClick(it) }
-                    ) {
-                        Surface(
-                            modifier = Modifier.padding(horizontal = 15.dp),
-                            shape = 10.cornerRadius(),
-                            color = darkGreen.copy(.2f),
-                            contentColor = darkness.copy(.7f)
-                        ) {
-                            Text(
-                                modifier = Modifier.padding(5.dp),
-                                text = it.name,
-                                fontWeight = FontWeight.Bold
+            when {
+                state.isLoading -> CircularLoading(isShow = true, colorLoading = darkness)
+                stickers.isEmpty() && !state.isLoading -> EmptyInfo()
+                else -> {
+                    ScrollableColumn {
+                        stickers.forEach { pack ->
+                            StickerPackItem(
+                                stickerPack = pack,
+                                onClick = onStickerClick
                             )
                         }
-
-                        ListRow(
-                            contentPadding = PaddingValues(15.dp),
-                            horizontalArrangement = Arrangement.spacedBy(5.dp),
-                        ) {
-                            items(it.stickers, key = { it }) { sticker ->
-                                NetworkImage(
-                                    modifier = Modifier
-                                        .size(90.dp)
-                                        .animateItem(Animations.Scale)
-                                        .clip(10.cornerRadius())
-                                        .background(secondary),
-                                    url = sticker.imageFile,
-                                    contentScale = ContentScale.FillBounds
-                                )
-                            }
-                        }
                     }
                 }
             }
         }
-
-
     }
 }
diff --git a/app/src/main/java/com/jeluchu/wastickersonline/features/sticker/view/StickerPackItem.kt b/app/src/main/java/com/jeluchu/wastickersonline/features/sticker/view/StickerPackItem.kt
new file mode 100644
index 0000000..7f24ec8
--- /dev/null
+++ b/app/src/main/java/com/jeluchu/wastickersonline/features/sticker/view/StickerPackItem.kt
@@ -0,0 +1,65 @@
+package com.jeluchu.wastickersonline.features.sticker.view
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import com.jeluchu.jchucomponents.ui.animations.lists.Animations
+import com.jeluchu.jchucomponents.ui.animations.lists.animateItem
+import com.jeluchu.jchucomponents.ui.composables.images.NetworkImage
+import com.jeluchu.jchucomponents.ui.extensions.modifier.cornerRadius
+import com.jeluchu.jchucomponents.ui.extensions.modifier.noRippleClickable
+import com.jeluchu.jchucomponents.ui.foundation.lists.ListRow
+import com.jeluchu.wastickersonline.core.ui.theme.darkGreen
+import com.jeluchu.wastickersonline.core.ui.theme.darkness
+import com.jeluchu.wastickersonline.core.ui.theme.secondary
+import com.jeluchu.wastickersonline.features.sticker.models.StickerPack
+
+@Composable
+fun StickerPackItem(
+    stickerPack: StickerPack,
+    onClick: (StickerPack) -> Unit
+) = Column(
+    modifier = Modifier.noRippleClickable { onClick(stickerPack) }
+) {
+    Surface(
+        modifier = Modifier.padding(horizontal = 15.dp),
+        shape = 10.cornerRadius(),
+        color = darkGreen.copy(.2f),
+        contentColor = darkness.copy(.7f)
+    ) {
+        Text(
+            modifier = Modifier.padding(5.dp),
+            text = stickerPack.name,
+            fontWeight = FontWeight.Bold
+        )
+    }
+
+    ListRow(
+        contentPadding = PaddingValues(15.dp),
+        horizontalArrangement = Arrangement.spacedBy(5.dp),
+    ) {
+        items(stickerPack.stickers, key = { it }) { sticker ->
+            NetworkImage(
+                modifier = Modifier
+                    .size(90.dp)
+                    .animateItem(Animations.Scale)
+                    .clip(10.cornerRadius())
+                    .background(secondary),
+                url = sticker.imageFile,
+                contentScale = ContentScale.FillBounds
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_deco_close.xml b/app/src/main/res/drawable/ic_deco_close.xml
new file mode 100644
index 0000000..0d69cfe
--- /dev/null
+++ b/app/src/main/res/drawable/ic_deco_close.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="320.59"
+    android:viewportWidth="320.59" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="m30.39,318.58c-7.86,0.46 -15.59,-2.16 -21.56,-7.29 -11.77,-11.84 -11.77,-30.97 0,-42.82l257.81,-257.81c12.25,-11.46 31.46,-10.82 42.92,1.42 10.36,11.07 10.97,28.09 1.41,39.88l-259.33,259.33c-5.89,5.06 -13.5,7.67 -21.26,7.29z"/>
+    <path android:fillColor="#FF000000" android:pathData="m287.9,318.58c-7.97,-0.03 -15.6,-3.2 -21.26,-8.81l-257.81,-257.81c-10.91,-12.74 -9.43,-31.91 3.31,-42.82 11.37,-9.74 28.14,-9.74 39.5,0l259.33,257.81c12.24,11.46 12.88,30.68 1.41,42.92 -0.46,0.49 -0.93,0.96 -1.41,1.41 -6.35,5.52 -14.71,8.16 -23.08,7.29z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_sticker_details.xml b/app/src/main/res/layout/activity_sticker_details.xml
deleted file mode 100644
index 3b976c5..0000000
--- a/app/src/main/res/layout/activity_sticker_details.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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/white"
-    android:orientation="vertical">
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/white"
-        app:contentInsetStart="0dp">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="@dimen/space_16"
-            android:paddingTop="@dimen/space_8"
-            android:paddingEnd="@dimen/space_16"
-            android:paddingBottom="@dimen/space_8">
-
-            <ImageView
-                android:id="@+id/ivBack"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:padding="8dp"
-                android:src="@drawable/ic_arrow_left"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </com.google.android.material.appbar.MaterialToolbar>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/preview_side_margin"
-        android:layout_marginLeft="@dimen/preview_side_margin"
-        android:layout_marginTop="@dimen/space_24"
-        android:layout_marginEnd="@dimen/preview_side_margin"
-        android:layout_marginRight="@dimen/preview_side_margin"
-        android:layout_marginBottom="@dimen/space_24">
-
-        <ImageView
-            android:id="@+id/ivTrayImage"
-            android:layout_width="@dimen/space_60"
-            android:layout_height="@dimen/space_60"
-            android:layout_marginStart="16dp"
-            android:contentDescription="@string/tray_image_content_description"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/avatars" />
-
-        <TextView
-            android:id="@+id/tvPackName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_from_tray_to_name"
-            android:layout_marginTop="@dimen/space_8"
-            android:textSize="@dimen/space_16_text"
-            app:layout_constraintStart_toEndOf="@+id/ivTrayImage"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="Pack Name" />
-
-        <TextView
-            android:id="@+id/tvAuthor"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_from_tray_to_name"
-            app:layout_constraintStart_toEndOf="@+id/ivTrayImage"
-            app:layout_constraintTop_toBottomOf="@+id/tvPackName"
-            tools:text="Author" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_from_tray_to_name"
-            app:layout_constraintStart_toEndOf="@+id/tvAuthor"
-            app:layout_constraintTop_toBottomOf="@+id/tvPackName"
-            tools:text="Size" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <!--<com.jeluchu.wastickersonline.core.utils.AnimatedRecyclerView
-            android:id="@+id/rvStickers"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:fadingEdgeLength="@dimen/fading_edge_length"
-            android:overScrollMode="never"
-            android:paddingStart="@dimen/preview_side_margin"
-            android:paddingLeft="@dimen/preview_side_margin"
-            android:paddingEnd="@dimen/preview_side_margin"
-            android:paddingRight="@dimen/preview_side_margin"
-            android:requiresFadingEdge="vertical"
-            app:gridLayoutManagerColumns="4"
-            app:layoutAnimation="@anim/layout_animation_from_bottom_scale"
-            app:layoutManagerOrientation="vertical"
-            app:layoutManagerReverse="false"
-            app:layoutManagerType="grid" />
--->
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:alpha="0.1"
-            android:background="#000000"
-            android:visibility="visible" />
-
-    </FrameLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/space_16"
-        android:paddingStart="@dimen/space_16"
-        android:paddingEnd="@dimen/space_16">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_marginEnd="@dimen/space_8"
-            android:layout_weight="1">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:text="@string/details_pack_already_added"
-                android:textColor="#9B9B9B"
-                android:textSize="14sp"
-                android:visibility="gone"
-                tools:visibility="visible" />
-
-            <androidx.cardview.widget.CardView
-                android:id="@+id/mcvAddToWhatsApp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:foreground="?attr/selectableItemBackgroundBorderless"
-                app:cardBackgroundColor="@color/redCardBackground"
-                app:cardCornerRadius="@dimen/space_16">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:background="@android:color/transparent"
-                    android:clickable="false"
-                    android:drawablePadding="8dp"
-                    android:focusable="false"
-                    android:text="@string/add_to_whatsapp" />
-
-            </androidx.cardview.widget.CardView>
-        </FrameLayout>
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="60dp"
-            android:layout_marginStart="@dimen/space_8"
-            android:layout_weight="1">
-
-            <androidx.cardview.widget.CardView
-                android:id="@+id/mcvAddToTelegram"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:foreground="?attr/selectableItemBackgroundBorderless"
-                app:cardBackgroundColor="@color/redCardBackground"
-                app:cardCornerRadius="@dimen/space_16">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:background="@android:color/transparent"
-                    android:clickable="false"
-                    android:drawablePadding="8dp"
-                    android:focusable="false"
-                    android:text="AÑADIR A TELEGRAM" />
-
-            </androidx.cardview.widget.CardView>
-        </FrameLayout>
-    </LinearLayout>
-</LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 89c8459..9326df4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="primary">#A9D2B5</color>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
     <color name="colorAccent">#D81B60</color>
-    <color name="grey">#A8A8A8</color>
-    <color name="white">#FFFFFF</color>
-    <color name="redCardBackground">#FF6C64</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index fef759b..1220518 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,17 +3,7 @@
 
     <!-- Fonts -->
 
-    <dimen name="space_16_text">16sp</dimen>
-
     <!-- Utils -->
-    <dimen name="space_8">8dp</dimen>
-    <dimen name="space_16">16dp</dimen>
-    <dimen name="space_24">24dp</dimen>
-    <dimen name="space_60">60dp</dimen>
-
 
-    <dimen name="preview_side_margin">16dp</dimen>
-    <dimen name="margin_from_tray_to_name">16dp</dimen>
-    <dimen name="fading_edge_length">8dp</dimen>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 49aa482..4018f0e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,8 @@
 <resources>
     <string name="app_name">WaStickersOnline</string>
-    <string name="tray_image_content_description">Imagen de la bandeja de paquetes de stickers</string>
     <string name="add_to_whatsapp">Añadir a WhatsApp</string>
-    <string name="details_pack_already_added">Se añadió el paquete de stickers a WhatsApp</string>
     <string name="not_added_to_whatsapp">No se añadió el paquete de stickers. Si deseas añadirlo, instala o actualiza WhatsApp</string>
     <string name="search">Buscar…</string>
+    <string name="emptyInfoTitle">Sin información</string>
+    <string name="emptyInfoDescription">En este momento no se encuentra la información solicitada</string>
 </resources>