diff --git a/resources/views/icon.blade.php b/resources/views/icon.blade.php
index 02406bf..f30d9e9 100644
--- a/resources/views/icon.blade.php
+++ b/resources/views/icon.blade.php
@@ -18,35 +18,45 @@
 @endphp
 
 
-@if($icon && View::exists("$checkPath.$icon"))
-    @include("moonshine::icons.$icon", array_merge([
-        'size' => $size,
-        'color' => $color,
-        'icon' => $icon,
-        'path' => $path,
-    ]))
-@elseif ($iconifyWorkingMode === WorkingMode::DOWNLOAD_USAGE_ICONS_MODE)
-    @php
-        $iconifyIconParts = explode(':', $icon);
-
-        $iconifyIconName = $iconifyIconParts[1] ?? null;
-        $iconifyIconSet = $iconifyIconParts[0] ?? null;
-    @endphp
-
-    @include("moonshine::ui.icons.iconify.$iconifyIconSet.$iconifyIconName", array_merge([
-        'size' => $size,
-        'class' => $class,
-        'color' => $color
-    ]))
-@elseif($iconifyWorkingMode === WorkingMode::ICONIFY_COMPONENT_MODE)
-    @php
-        /** @var int $iconSizeMultiplier */
-        $iconSizeMultiplier = config('moonshine-iconify.icon_size_multiplier', 3.2);
-    @endphp
-
-    <iconify-icon icon="{{$icon}}"
-                  style="color: {{$color}};font-size: {{$size * $iconSizeMultiplier}}px"
-                  class="{{$class}}"
-    >
-    </iconify-icon>
-@endif
+<div {{ $attributes->class([
+    'text-current',
+    'w-' . ($size ?? 5),
+    'h-' . ($size ?? 5),
+    "text-$color" => !empty($color),
+]) }}>
+
+    @if($slot?->isNotEmpty())
+        {!! $slot !!}
+    @elseif($icon && View::exists("$checkPath.$icon"))
+        @include("moonshine::icons.$icon", array_merge([
+            'size' => $size,
+            'color' => $color,
+            'icon' => $icon,
+            'path' => $path,
+        ]))
+    @elseif ($iconifyWorkingMode === WorkingMode::DOWNLOAD_USAGE_ICONS_MODE)
+        @php
+            $iconifyIconParts = explode(':', $icon);
+
+            $iconifyIconName = $iconifyIconParts[1] ?? null;
+            $iconifyIconSet = $iconifyIconParts[0] ?? null;
+        @endphp
+
+        @include("moonshine::ui.icons.iconify.$iconifyIconSet.$iconifyIconName", array_merge([
+            'size' => $size,
+            'class' => $class,
+            'color' => $color
+        ]))
+    @elseif($iconifyWorkingMode === WorkingMode::ICONIFY_COMPONENT_MODE)
+        @php
+            /** @var int $iconSizeMultiplier */
+            $iconSizeMultiplier = config('moonshine-iconify.icon_size_multiplier', 3.2);
+        @endphp
+
+        <iconify-icon icon="{{$icon}}"
+                      style="color: {{$color}};font-size: {{$size * $iconSizeMultiplier}}px"
+                      class="{{$class}}"
+        >
+        </iconify-icon>
+    @endif
+</div>