diff --git a/src/flimix/library/live_streams/create/create_genre_modal.html b/src/flimix/library/live_streams/create/create_genre_modal.html
index f5151806b..2d9647327 100644
--- a/src/flimix/library/live_streams/create/create_genre_modal.html
+++ b/src/flimix/library/live_streams/create/create_genre_modal.html
@@ -5,7 +5,7 @@
       <!-- Header -->
       <div class="py-2.5 px-4 flex justify-between items-center border-b">
         <h3 id="create-genre-label" class="font-medium text-gray-800">
-          Add Genre
+          Create Genre
         </h3>
         <button type="button" class="size-8 inline-flex justify-center items-center gap-x-2 rounded-full border border-transparent bg-gray-100 text-gray-800 hover:bg-gray-200 disabled:opacity-50 disabled:pointer-events-none focus:outline-none focus:bg-gray-200" aria-label="Close" data-hs-overlay="#create-genre">
           <span class="sr-only">Close</span>
diff --git a/src/flimix/library/live_streams/create/form.html b/src/flimix/library/live_streams/create/form.html
index 33a9b4d48..cc029d917 100644
--- a/src/flimix/library/live_streams/create/form.html
+++ b/src/flimix/library/live_streams/create/form.html
@@ -57,13 +57,7 @@
           </div>
           <!-- End Select -->
 
-          <button type="button" class="whitespace-nowrap py-2 px-3 inline-flex items-center gap-x-2 text-sm font-medium rounded-lg border border-gray-200 bg-white text-gray-800 shadow-sm hover:bg-gray-50 disabled:opacity-50 disabled:pointer-events-none focus:outline-none focus:bg-gray-50 dark:bg-neutral-800 dark:border-neutral-700 dark:text-neutral-300 dark:hover:bg-neutral-700 dark:focus:bg-neutral-700"
-          aria-haspopup="dialog" aria-expanded="false" aria-controls="create-genre" data-hs-overlay="#create-genre">
-            <svg class="shrink-0 size-3" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
-              <path fill-rule="evenodd" clip-rule="evenodd" d="M8 1C8.55228 1 9 1.44772 9 2V7L14 7C14.5523 7 15 7.44771 15 8C15 8.55228 14.5523 9 14 9L9 9V14C9 14.5523 8.55228 15 8 15C7.44772 15 7 14.5523 7 14V9.00001L2 9.00001C1.44772 9.00001 1 8.5523 1 8.00001C0.999999 7.44773 1.44771 7.00001 2 7.00001L7 7.00001V2C7 1.44772 7.44772 1 8 1Z"/>
-            </svg>
-            Add<span class="hidden sm:inline-block"> New Genre<span>
-          </button>
+          <button  aria-haspopup="dialog" aria-expanded="false" aria-controls="create-genre" data-hs-overlay="#create-genre" class="whitespace-nowrap text-sm cursor-pointer bg-white font-semibold text-blue-600 hover:text-blue-700 underline" href="#" target="_parent">Create New Genre</button>
         </div>
         <!-- End Input Form -->
       </div>
diff --git a/src/flimix/library/live_streams/schedule/form.html b/src/flimix/library/live_streams/schedule/form.html
index 5711b210a..8e462f7b0 100644
--- a/src/flimix/library/live_streams/schedule/form.html
+++ b/src/flimix/library/live_streams/schedule/form.html
@@ -57,13 +57,8 @@
           </div>
           <!-- End Select -->
 
-          <button type="button" class="whitespace-nowrap py-2 px-3 inline-flex items-center gap-x-2 text-sm font-medium rounded-lg border border-gray-200 bg-white text-gray-800 shadow-sm hover:bg-gray-50 disabled:opacity-50 disabled:pointer-events-none focus:outline-none focus:bg-gray-50 dark:bg-neutral-800 dark:border-neutral-700 dark:text-neutral-300 dark:hover:bg-neutral-700 dark:focus:bg-neutral-700"
-          aria-haspopup="dialog" aria-expanded="false" aria-controls="create-genre" data-hs-overlay="#create-genre">
-            <svg class="shrink-0 size-3" xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
-              <path fill-rule="evenodd" clip-rule="evenodd" d="M8 1C8.55228 1 9 1.44772 9 2V7L14 7C14.5523 7 15 7.44771 15 8C15 8.55228 14.5523 9 14 9L9 9V14C9 14.5523 8.55228 15 8 15C7.44772 15 7 14.5523 7 14V9.00001L2 9.00001C1.44772 9.00001 1 8.5523 1 8.00001C0.999999 7.44773 1.44771 7.00001 2 7.00001L7 7.00001V2C7 1.44772 7.44772 1 8 1Z"/>
-            </svg>
-            Add<span class="hidden sm:inline-block"> New Genre<span>
-          </button>
+
+          <button  aria-haspopup="dialog" aria-expanded="false" aria-controls="create-genre" data-hs-overlay="#create-genre" class="whitespace-nowrap text-sm cursor-pointer bg-white font-semibold text-blue-600 hover:text-blue-700 underline" href="#" target="_parent">Create New Genre</button>
         </div>
         <!-- End Input Form -->
       </div>