diff --git a/lib/towerops_web/components/layouts.ex b/lib/towerops_web/components/layouts.ex
index f7102a1d..aef04c1c 100644
--- a/lib/towerops_web/components/layouts.ex
+++ b/lib/towerops_web/components/layouts.ex
@@ -313,7 +313,7 @@ defmodule ToweropsWeb.Layouts do
                   class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-white/5"
                   phx-click={JS.hide(to: "#org-menu")}
                 >
-                  🆕 {t("What's New")}
+                  {t("What's New")}
                 </.link>
                 <div class="border-t border-gray-100 dark:border-white/10"></div>
                 <.link
@@ -575,20 +575,20 @@ defmodule ToweropsWeb.Layouts do
                 {t("Monitor")}
               </p>
               <.mobile_nav_link navigate={~p"/dashboard"} active={@active_page == "dashboard"}>
-                <.icon name="hero-home" class="size-5" /> {t("Dashboard")}
+                {t("Dashboard")}
               </.mobile_nav_link>
               <.mobile_nav_link navigate={~p"/devices"} active={@active_page == "devices"}>
-                <.icon name="hero-server" class="size-5" /> {t("Devices")}
+                {t("Devices")}
               </.mobile_nav_link>
               <.mobile_nav_link
                 :if={@current_organization && @current_organization.use_sites}
                 navigate={~p"/sites"}
                 active={@active_page == "sites"}
               >
-                <.icon name="hero-building-office" class="size-5" /> {t("Sites")}
+                {t("Sites")}
               </.mobile_nav_link>
               <.mobile_nav_link navigate={~p"/network-map"} active={@active_page == "network-map"}>
-                <.icon name="hero-map" class="size-5" /> {t("Network Map")}
+                {t("Network Map")}
               </.mobile_nav_link>
               <%!-- <.mobile_nav_link navigate={~p"/weathermap"} active={@active_page == "weathermap"}>
                 <.icon name="hero-signal" class="size-5" /> {t("Weathermap")}
@@ -601,13 +601,13 @@ defmodule ToweropsWeb.Layouts do
                 {t("Respond")}
               </p>
               <.mobile_nav_link navigate={~p"/alerts"} active={@active_page == "alerts"}>
-                <.icon name="hero-bell-alert" class="size-5" /> {t("Alerts")}
+                {t("Alerts")}
               </.mobile_nav_link>
               <.mobile_nav_link navigate={~p"/maintenance"} active={@active_page == "maintenance"}>
-                <.icon name="hero-wrench-screwdriver" class="size-5" /> {t("Maintenance")}
+                {t("Maintenance")}
               </.mobile_nav_link>
               <.mobile_nav_link navigate={~p"/schedules"} active={@active_page == "schedules"}>
-                <.icon name="hero-calendar-days" class="size-5" /> {t("On-Call")}
+                {t("On-Call")}
               </.mobile_nav_link>
             </div>
             
@@ -617,13 +617,13 @@ defmodule ToweropsWeb.Layouts do
                 {t("Analyze")}
               </p>
               <.mobile_nav_link navigate={~p"/insights"} active={@active_page == "insights"}>
-                <.icon name="hero-light-bulb" class="size-5" /> {t("Insights")}
+                {t("Insights")}
               </.mobile_nav_link>
               <.mobile_nav_link navigate={~p"/trace"} active={@active_page == "trace"}>
-                <.icon name="hero-magnifying-glass" class="size-5" /> {t("Trace")}
+                {t("Trace")}
               </.mobile_nav_link>
               <.mobile_nav_link navigate={~p"/activity"} active={@active_page == "activity"}>
-                <.icon name="hero-clock" class="size-5" /> {t("Activity")}
+                {t("Activity")}
               </.mobile_nav_link>
             </div>
             
@@ -637,16 +637,16 @@ defmodule ToweropsWeb.Layouts do
                 navigate={~p"/orgs/#{@current_organization.slug}/settings"}
                 active={@active_page == "settings"}
               >
-                <.icon name="hero-cog-6-tooth" class="size-5" /> {t("Organization Settings")}
+                {t("Organization Settings")}
               </.mobile_nav_link>
               <.mobile_nav_link
                 navigate={~p"/users/settings"}
                 active={@active_page == "user_settings"}
               >
-                <.icon name="hero-user-circle" class="size-5" /> {t("My Settings")}
+                {t("My Settings")}
               </.mobile_nav_link>
               <.mobile_nav_link navigate={~p"/help"} active={@active_page == "help"}>
-                <.icon name="hero-question-mark-circle" class="size-5" /> {t("Help")}
+                {t("Help")}
               </.mobile_nav_link>
             </div>
           </div>
@@ -770,7 +770,6 @@ defmodule ToweropsWeb.Layouts do
       ]}
       data-sidebar-tooltip={@label}
     >
-      <.icon name={@icon} class="h-5 w-5 shrink-0" />
       <span data-sidebar-text class="truncate">{@label}</span>
       <%= if @badge > 0 do %>
         <span
@@ -950,16 +949,16 @@ defmodule ToweropsWeb.Layouts do
         <div class="hidden sm:hidden" id="admin-mobile-menu">
           <div class="space-y-1 px-2 pb-3 pt-2 border-t border-gray-200 dark:border-white/10">
             <.mobile_nav_link navigate={~p"/admin/users"} active={false}>
-              <.icon name="hero-users" class="size-5" /> Users
+              Users
             </.mobile_nav_link>
             <.mobile_nav_link navigate={~p"/admin/organizations"} active={false}>
-              <.icon name="hero-building-office-2" class="size-5" /> Organizations
+              Organizations
             </.mobile_nav_link>
             <.mobile_nav_link navigate={~p"/admin/security"} active={false}>
-              <.icon name="hero-shield-check" class="size-5" /> IP Allowlist
+              IP Allowlist
             </.mobile_nav_link>
             <.mobile_nav_link navigate={~p"/admin/errors"} active={false}>
-              <.icon name="hero-bug-ant" class="size-5" /> Exceptions
+              Exceptions
             </.mobile_nav_link>
           </div>
         </div>