diff --git a/lib/live_beats_web/components/core_components.ex b/lib/live_beats_web/components/core_components.ex
index 2d29c38..858aba2 100644
--- a/lib/live_beats_web/components/core_components.ex
+++ b/lib/live_beats_web/components/core_components.ex
@@ -90,7 +90,7 @@ defmodule LiveBeatsWeb.CoreComponents do
           type="button"
           class="inline-flex bg-red-50 rounded-md p-1.5 text-red-500 hover:bg-red-100 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-red-50 focus:ring-red-600"
         >
-          <.icon name={:x} class="w-4 h-4" />
+          <.icon name={:x_mark} class="w-4 h-4" />
         </button>
       </div>
     </div>
@@ -116,7 +116,7 @@ defmodule LiveBeatsWeb.CoreComponents do
           type="button"
           class="inline-flex bg-green-50 rounded-md p-1.5 text-green-500 hover:bg-green-100 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-green-50 focus:ring-green-600"
         >
-          <.icon name={:x} class="w-4 h-4" />
+          <.icon name={:x_mark} class="w-4 h-4" />
         </button>
       </div>
     </div>
diff --git a/lib/live_beats_web/components/layouts.ex b/lib/live_beats_web/components/layouts.ex
index 5c318db..3519661 100644
--- a/lib/live_beats_web/components/layouts.ex
+++ b/lib/live_beats_web/components/layouts.ex
@@ -45,7 +45,7 @@ defmodule LiveBeatsWeb.Layouts do
           aria-current={if @active_tab == :profile, do: "true", else: "false"}
         >
           <.icon
-            name={:music_note}
+            name={:musical_note}
             outlined
             class="text-gray-400 group-hover:text-gray-500 mr-3 flex-shrink-0 h-6 w-6"
           /> My Songs
@@ -59,7 +59,7 @@ defmodule LiveBeatsWeb.Layouts do
           aria-current={if @active_tab == :settings, do: "true", else: "false"}
         >
           <.icon
-            name={:adjustments}
+            name={:adjustments_vertical}
             outlined
             class="text-gray-400 group-hover:text-gray-500 mr-3 flex-shrink-0 h-6 w-6"
           /> Settings
diff --git a/lib/live_beats_web/components/layouts/live.html.heex b/lib/live_beats_web/components/layouts/live.html.heex
index b6b9f53..c6c12b0 100644
--- a/lib/live_beats_web/components/layouts/live.html.heex
+++ b/lib/live_beats_web/components/layouts/live.html.heex
@@ -42,7 +42,7 @@
 
     <div class="flex-shrink-0 flex items-center px-4">
       <.link navigate={home_path(@current_user)}>
-        <.icon name={:status_online} class="w-8 h-8 text-purple-600 -mt-2 inline-block" outlined />
+        <.icon name={:signal} class="w-8 h-8 text-purple-600 -mt-2 inline-block" outlined />
         <span class="h-8 w-auto text-2xl ml-1 font-bold">
           LiveBeats
         </span>
@@ -71,7 +71,7 @@
   <div class="flex flex-col w-64 border-r border-gray-200 pt-5 pb-4 bg-gray-100">
     <div class="flex items-center flex-shrink-0 px-6">
       <.link navigate={home_path(@current_user)}>
-        <.icon name={:status_online} class="w-8 h-8 text-purple-600 -mt-2 inline-block" outlined />
+        <.icon name={:signal} class="w-8 h-8 text-purple-600 -mt-2 inline-block" outlined />
         <span class="h-8 w-auto text-2xl ml-1 font-bold">
           LiveBeats
         </span>
diff --git a/lib/live_beats_web/live/profile_live.ex b/lib/live_beats_web/live/profile_live.ex
index 76fa99e..f8b46a0 100644
--- a/lib/live_beats_web/live/profile_live.ex
+++ b/lib/live_beats_web/live/profile_live.ex
@@ -19,7 +19,7 @@ defmodule LiveBeatsWeb.ProfileLive do
           – <%= ngettext("%{count} song", "%{count} songs", @songs_count) %>
         </div>
         <.link href={@profile.external_homepage_url} target="_blank" class="text-sm text-gray-600">
-          <.icon name={:code} /> <span class=""><%= url_text(@profile.external_homepage_url) %></span>
+          <.icon name={:code_bracket} /> <span class=""><%= url_text(@profile.external_homepage_url) %></span>
         </.link>
       </div>
       <:actions>
@@ -48,7 +48,7 @@ defmodule LiveBeatsWeb.ProfileLive do
         <% end %>
         <%= if @owns_profile? do %>
           <.button id="upload-btn" primary patch={profile_upload_path(@current_user)}>
-            <.icon name={:upload} /><span class="ml-2">Upload Songs</span>
+            <.icon name={:arrow_up_tray} /><span class="ml-2">Upload Songs</span>
           </.button>
         <% end %>
       </:actions>
@@ -95,11 +95,11 @@ defmodule LiveBeatsWeb.ProfileLive do
       >
         <span :if={song.status == :playing} class="flex pt-1 relative mr-2 w-4">
           <span class="w-3 h-3 animate-ping bg-purple-400 rounded-full absolute"></span>
-          <.icon name={:volume_up} class="h-5 w-5 -mt-1 -ml-1" aria-label="Playing" role="button" />
+          <.icon name={:speaker_wave} class="h-5 w-5 -mt-1 -ml-1" aria-label="Playing" role="button" />
         </span>
         <span :if={song.status == :paused} class="flex pt-1 relative mr-2 w-4">
           <.icon
-            name={:volume_up}
+            name={:speaker_wave}
             class="h-5 w-5 -mt-1 -ml-1 text-gray-400"
             aria-label="Paused"
             role="button"
diff --git a/lib/live_beats_web/live/profile_live/song_row_component.ex b/lib/live_beats_web/live/profile_live/song_row_component.ex
index 61b64da..212bc23 100644
--- a/lib/live_beats_web/live/profile_live/song_row_component.ex
+++ b/lib/live_beats_web/live/profile_live/song_row_component.ex
@@ -21,7 +21,7 @@ defmodule LiveBeatsWeb.ProfileLive.SongRowComponent do
                 <span class="flex pt-1 relative mr-2 w-4">
                   <span class="w-3 h-3 animate-ping bg-purple-400 rounded-full absolute"></span>
                   <.icon
-                    name={:volume_up}
+                    name={:speaker_wave}
                     class="h-5 w-5 -mt-1 -ml-1"
                     aria-label="Playing"
                     role="button"
@@ -31,7 +31,7 @@ defmodule LiveBeatsWeb.ProfileLive.SongRowComponent do
               <%= if @status == :paused do %>
                 <span class="flex pt-1 relative mr-2 w-4">
                   <.icon
-                    name={:volume_up}
+                    name={:speaker_wave}
                     class="h-5 w-5 -mt-1 -ml-1 text-gray-400"
                     aria-label="Paused"
                     role="button"