diff --git a/app/Observers/LibraryItemObserver.php b/app/Observers/LibraryItemObserver.php
index 3421afe4..cb453a5c 100644
--- a/app/Observers/LibraryItemObserver.php
+++ b/app/Observers/LibraryItemObserver.php
@@ -35,7 +35,7 @@ class LibraryItemObserver
             // http://localhost/de/library/library-item?l=de&table[filters][id]=2
 
             if ($libraryItem->type !== 'markdown_article') {
-                $text = sprintf("Es gibt was Neues zum Lesen oder Anhören:\n\n%s\n\n%s\n\n#Bitcoin #Event #Einundzwanzig #gesundesgeld",
+                $text = sprintf("Es gibt was Neues zum Lesen oder Anhören:\n\n%s\n\n%s\n\n#Bitcoin #Wissen #Einundzwanzig #gesundesgeld",
                     $libraryItemName,
                     url()->route('article.view',
                         ['libraryItem' => $libraryItem->slug]),
diff --git a/resources/views/livewire/library/search-by-tag-component.blade.php b/resources/views/livewire/library/search-by-tag-component.blade.php
index 84cd07d4..2ab8288d 100644
--- a/resources/views/livewire/library/search-by-tag-component.blade.php
+++ b/resources/views/livewire/library/search-by-tag-component.blade.php
@@ -1,54 +1,40 @@
 <div
-    class="flex overflow-auto relative flex-wrap gap-x-5 gap-y-6 justify-center p-0 mx-auto mt-8 mb-3 w-full font-normal leading-6 text-white align-baseline border-0 border-solid md:mx-auto md:mb-0 md:max-w-screen-md"
-    style="max-width: 1350px; font-size: 128%; background-position: 0px center; max-height: 500px; list-style: outside;"
+    class="flex overflow-auto relative flex-wrap gap-x-5 gap-y-1 justify-center p-0 mx-auto mt-2 mb-2 w-full font-normal text-white align-baseline border-0 border-solid md:mx-auto md:mb-0 md:max-w-screen-md"
 >
     @foreach($tags as $tag)
         <div
-            class="flex flex-1 justify-center p-0 m-0 leading-6 text-center align-baseline border-0 border-solid"
+            class="flex flex-wrap justify-center p-0 m-0 text-center align-baseline border-0 border-solid"
             style="font-size: 128%; background-position: 0px center; list-style: outside;"
         >
-            @php
-                $isActive = in_array($tag->id, $filters['tag'] ?? [], false);
-                $activeClass = $isActive ? 'text-amber-500 bg-amber-500' : 'bg-blue-50 text-white hover:text-amber-500';
-            @endphp
             <a
-                class="{{ $activeClass }} flex relative flex-col flex-shrink-0 justify-between py-1 px-3 w-full h-20 border-0 border-solid duration-300 ease-in-out cursor-pointer bg-opacity-[0.07]"
                 href="{{ route(request()->route()->getName(), ['country' => $country, 'filters' => ['tag' => [$tag->id]]]) }}"
             >
-                <div
-                    class="flex flex-1 items-center p-0 m-0 text-center align-baseline border-0 border-solid"
-                >
-                    <div
-                        class="flex flex-shrink-0 justify-center p-0 my-0 mr-4 ml-0 align-baseline border-0 border-solid"
-                    >
-                        <i class="fa fa-thin fa-{{ $tag->icon }} text-4xl"></i>
-                    </div>
-                    <div
-                        class="flex justify-between p-0 m-0 w-full align-baseline border-0 border-solid md:block lg:w-auto"
-                    >
-                        <h2
-                            class="p-0 m-0 font-sans text-base font-semibold tracking-wide leading-tight text-left align-baseline border-0 border-solid"
-                            style="background-position: 0px center; list-style: outside;"
-                        >
-                            {{ $tag->name }}
-                        </h2>
-                        <div
-                            class="hidden p-0 m-0 text-sm leading-3 text-left text-blue-100 align-baseline border-0 border-solid md:block md:text-blue-100 whitespace-nowrap"
-                        >
-                            {{ $tag->libraryItems->pluck('lecturer.name')->unique()->count() }}
-                            {{ __('Creator') }}
-                            <span
-                                class="inline-block relative top-px py-0 px-1 m-0 text-xs leading-4 align-baseline border-0 border-solid"
-                            >
-                              •
-                            </span>
-                            {{ $tag->library_items_count }}
-                            {{ __('Entries') }}
-                        </div>
-                    </div>
-                </div>
-            </a
-            >
+                @if(in_array($tag->id, $filters['tag'] ?? [], false))
+                    <x-badge squared amber>
+                        <i class="fa fa-thin fa-{{ $tag->icon }}"></i>
+                        {{ $tag->name }}
+                        {{ $tag->libraryItems->pluck('lecturer.name')->unique()->count() }}
+                        {{ __('Creator') }}
+                        <span
+                            class="inline-block relative top-px py-0 px-1 m-0 text-xs leading-4 align-baseline border-0 border-solid"
+                        >•</span>
+                        {{ $tag->library_items_count }}
+                        {{ __('Entries') }}
+                    </x-badge>
+                @else
+                    <x-badge squared gray>
+                        <i class="fa fa-thin fa-{{ $tag->icon }}"></i>
+                        {{ $tag->name }}
+                        {{ $tag->libraryItems->pluck('lecturer.name')->unique()->count() }}
+                        {{ __('Creator') }}
+                        <span
+                            class="inline-block relative top-px py-0 px-1 m-0 text-xs leading-4 align-baseline border-0 border-solid"
+                        >•</span>
+                        {{ $tag->library_items_count }}
+                        {{ __('Entries') }}
+                    </x-badge>
+                @endif
+            </a>
         </div>
     @endforeach
 </div>