diff --git a/assets/js/hooks/Mapper/components/characters/Characters.tsx b/assets/js/hooks/Mapper/components/characters/Characters.tsx
index 833e56b4..3fc6c26c 100644
--- a/assets/js/hooks/Mapper/components/characters/Characters.tsx
+++ b/assets/js/hooks/Mapper/components/characters/Characters.tsx
@@ -1,13 +1,18 @@
 import { emitMapEvent } from '@/hooks/Mapper/events';
-import { isDocked } from '@/hooks/Mapper/helpers/isDocked.ts';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { CharacterTypeRaw } from '@/hooks/Mapper/types';
 import { Commands, OutCommand } from '@/hooks/Mapper/types/mapHandlers.ts';
 import { useAutoAnimate } from '@formkit/auto-animate/react';
 import clsx from 'clsx';
-import { PrimeIcons } from 'primereact/api';
 import { useCallback } from 'react';
-import classes from './Characters.module.scss';
+import {
+  TooltipPosition,
+  WdEveEntityPortrait,
+  WdEveEntityPortraitSize,
+  WdTooltipWrapper,
+} from '@/hooks/Mapper/components/ui-kit';
+import { WdCharStateWrapper } from '@/hooks/Mapper/components/characters/components/WdCharStateWrapper.tsx';
+
 interface CharactersProps {
   data: CharacterTypeRaw[];
 }
@@ -17,7 +22,7 @@ export const Characters = ({ data }: CharactersProps) => {
 
   const {
     outCommand,
-    data: { mainCharacterEveId, followingCharacterEveId },
+    data: { mainCharacterEveId, followingCharacterEveId, expiredCharacters },
   } = useMapRootState();
 
   const handleSelect = useCallback(async (character: CharacterTypeRaw) => {
@@ -35,61 +40,48 @@ export const Characters = ({ data }: CharactersProps) => {
     });
   }, []);
 
-  const items = data.map(character => (
-    <li
-      key={character.eve_id}
-      className="flex flex-col items-center justify-center"
-      onClick={() => handleSelect(character)}
-    >
-      <div
-        className={clsx(
-          'overflow-hidden relative',
-          'flex w-[35px] h-[35px] rounded-[4px] border-[1px] border-solid bg-transparent cursor-pointer',
-          'transition-colors duration-250 hover:bg-stone-300/90',
-          {
-            ['border-stone-800/90']: !character.online,
-            ['border-lime-600/70']: character.online,
-          },
-        )}
-        title={character.name}
-      >
-        {mainCharacterEveId === character.eve_id && (
-          <span
-            className={clsx(
-              'absolute top-[2px] left-[22px] w-[9px] h-[9px]',
-              'text-yellow-500 text-[9px] rounded-[1px] z-10',
-              'pi',
-              PrimeIcons.STAR_FILL,
-            )}
-          />
-        )}
+  const items = data.map(character => {
+    const isExpired = expiredCharacters.includes(character.eve_id);
 
-        {followingCharacterEveId === character.eve_id && (
-          <span
-            className={clsx(
-              'absolute top-[23px] left-[22px] w-[10px] h-[10px]',
-              'text-sky-300 text-[10px] rounded-[1px] z-10',
-              'pi pi-angle-double-right',
-            )}
-          />
-        )}
-        {isDocked(character.location) && <div className={classes.Docked} />}
-        <div
-          className={clsx(
-            'flex w-full h-full bg-transparent cursor-pointer',
-            'bg-center bg-no-repeat bg-[length:100%]',
-            'transition-opacity',
-            'shadow-[inset_0_1px_6px_1px_#000000]',
-            {
-              ['opacity-60']: !character.online,
-              ['opacity-100']: character.online,
-            },
-          )}
-          style={{ backgroundImage: `url(https://images.evetech.net/characters/${character.eve_id}/portrait)` }}
-        ></div>
-      </div>
-    </li>
-  ));
+    return (
+      <li
+        key={character.eve_id}
+        className="flex flex-col items-center justify-center"
+        onClick={() => handleSelect(character)}
+      >
+        <WdTooltipWrapper
+          position={TooltipPosition.bottom}
+          content={isExpired ? `Token is expired for ${character.name}` : character.name}
+        >
+          <WdCharStateWrapper
+            eve_id={character.eve_id}
+            location={character.location}
+            isExpired={isExpired}
+            isMain={mainCharacterEveId === character.eve_id}
+            isFollowing={followingCharacterEveId === character.eve_id}
+            isOnline={character.online}
+          >
+            <WdEveEntityPortrait
+              eveId={character.eve_id}
+              size={WdEveEntityPortraitSize.w33}
+              className={clsx(
+                'flex w-full h-full bg-transparent cursor-pointer',
+                'bg-center bg-no-repeat bg-[length:100%]',
+                'transition-opacity',
+                'shadow-[inset_0_1px_6px_1px_#000000]',
+                {
+                  ['opacity-60']: !isExpired && !character.online,
+                  ['opacity-100']: !isExpired && character.online,
+                  ['opacity-50']: isExpired,
+                },
+                '!border-0',
+              )}
+            />
+          </WdCharStateWrapper>
+        </WdTooltipWrapper>
+      </li>
+    );
+  });
 
   return (
     <ul className="flex gap-1 characters" id="characters" ref={parent}>
diff --git a/assets/js/hooks/Mapper/components/characters/Characters.module.scss b/assets/js/hooks/Mapper/components/characters/components/WdCharStateWrapper.module.scss
similarity index 100%
rename from assets/js/hooks/Mapper/components/characters/Characters.module.scss
rename to assets/js/hooks/Mapper/components/characters/components/WdCharStateWrapper.module.scss
diff --git a/assets/js/hooks/Mapper/components/characters/components/WdCharStateWrapper.tsx b/assets/js/hooks/Mapper/components/characters/components/WdCharStateWrapper.tsx
new file mode 100644
index 00000000..0d63b0a3
--- /dev/null
+++ b/assets/js/hooks/Mapper/components/characters/components/WdCharStateWrapper.tsx
@@ -0,0 +1,71 @@
+import clsx from 'clsx';
+import { PrimeIcons } from 'primereact/api';
+import { isDocked } from '@/hooks/Mapper/helpers/isDocked.ts';
+import classes from './WdCharStateWrapper.module.scss';
+import { WithChildren } from '@/hooks/Mapper/types/common.ts';
+import { LocationRaw } from '@/hooks/Mapper/types';
+
+type WdCharStateWrapperProps = {
+  eve_id: string;
+  isExpired?: boolean;
+  isMain?: boolean;
+  isFollowing?: boolean;
+  location: LocationRaw | null;
+  isOnline: boolean;
+} & WithChildren;
+
+export const WdCharStateWrapper = ({
+  location,
+  isOnline,
+  isMain,
+  isFollowing,
+  isExpired,
+  children,
+}: WdCharStateWrapperProps) => {
+  return (
+    <div
+      className={clsx(
+        'overflow-hidden relative',
+        'flex w-[35px] h-[35px] rounded-[4px] border-[1px] border-solid bg-transparent cursor-pointer',
+        'transition-colors duration-250 hover:bg-stone-300/90',
+        {
+          ['border-stone-800/90']: !isExpired && !isOnline,
+          ['border-lime-600/70']: !isExpired && isOnline,
+          ['border-red-600/70']: isExpired,
+        },
+      )}
+    >
+      {isMain && (
+        <span
+          className={clsx(
+            'absolute top-[2px] left-[22px] w-[9px] h-[9px]',
+            'text-yellow-500 text-[9px] rounded-[1px] z-10',
+            'pi',
+            PrimeIcons.STAR_FILL,
+          )}
+        />
+      )}
+      {isFollowing && (
+        <span
+          className={clsx(
+            'absolute top-[23px] left-[22px] w-[10px] h-[10px]',
+            'text-sky-300 text-[10px] rounded-[1px] z-10',
+            'pi pi-angle-double-right',
+          )}
+        />
+      )}
+      {isDocked(location) && <div className={classes.Docked} />}
+      {isExpired && (
+        <span
+          className={clsx(
+            'absolute top-[4px] left-[4px] w-[10px] h-[10px]',
+            'text-red-400 text-[10px] rounded-[1px] z-10',
+            'pi pi-exclamation-triangle',
+          )}
+        />
+      )}
+
+      {children}
+    </div>
+  );
+};
diff --git a/assets/js/hooks/Mapper/components/characters/components/index.ts b/assets/js/hooks/Mapper/components/characters/components/index.ts
new file mode 100644
index 00000000..ec332a43
--- /dev/null
+++ b/assets/js/hooks/Mapper/components/characters/components/index.ts
@@ -0,0 +1 @@
+export * from './WdCharStateWrapper.tsx';
diff --git a/assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingCharactersList.tsx b/assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingCharactersList.tsx
index 326876e0..257d4c3a 100644
--- a/assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingCharactersList.tsx
+++ b/assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingCharactersList.tsx
@@ -4,12 +4,16 @@ import { DataTable } from 'primereact/datatable';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { TrackingCharacter } from '@/hooks/Mapper/types';
 import { useTracking } from '@/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingProvider.tsx';
+import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 
 export const TrackingCharactersList = () => {
   const [selected, setSelected] = useState<TrackingCharacter[]>([]);
   const { trackingCharacters, main, following, updateTracking } = useTracking();
   const refVars = useRef({ trackingCharacters });
   refVars.current = { trackingCharacters };
+  const {
+    data: { expiredCharacters },
+  } = useMapRootState();
 
   useEffect(() => {
     setSelected(trackingCharacters.filter(x => x.tracked));
@@ -66,7 +70,9 @@ export const TrackingCharactersList = () => {
         bodyClassName="text-ellipsis overflow-hidden whitespace-nowrap"
         headerClassName="[&_div]:ml-2"
         body={row => {
-          return <CharacterCard showCorporationLogo showTicker isOwn {...row.character} />;
+          const isExpired = expiredCharacters.includes(row.character.eve_id);
+
+          return <CharacterCard showCorporationLogo showTicker isOwn isExpired={isExpired} {...row.character} />;
         }}
       />
     </DataTable>
diff --git a/assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingDialog.tsx b/assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingDialog.tsx
index 59d3f0d7..35413107 100644
--- a/assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingDialog.tsx
+++ b/assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingDialog.tsx
@@ -38,7 +38,7 @@ const TrackingDialogComp = ({ visible, onHide }: TrackingDialogProps) => {
       resizable={false}
       visible={visible}
       onHide={onHide}
-      className="w-[640px] h-[400px] text-text-color min-h-0"
+      className="w-[640px] h-[600px] text-text-color min-h-0"
     >
       <TabView
         className="vertical-tabs-container h-full [&_.p-tabview-panels]:!pr-0"
diff --git a/assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingProvider.tsx b/assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingProvider.tsx
index 1c4d8ab1..d6180276 100644
--- a/assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingProvider.tsx
+++ b/assets/js/hooks/Mapper/components/mapRootContent/components/TrackingDialog/TrackingProvider.tsx
@@ -1,4 +1,4 @@
-import { createContext, useCallback, useContext, useRef, useState, useEffect } from 'react';
+import { createContext, useCallback, useContext, useRef, useState } from 'react';
 import { Commands, OutCommand, TrackingCharacter } from '@/hooks/Mapper/types';
 import { useMapRootState } from '@/hooks/Mapper/mapRootProvider';
 import { IncomingEvent, WithChildren } from '@/hooks/Mapper/types/common.ts';
diff --git a/assets/js/hooks/Mapper/components/ui-kit/CharacterCard/CharacterCard.tsx b/assets/js/hooks/Mapper/components/ui-kit/CharacterCard/CharacterCard.tsx
index 8c2a2d08..42b26422 100644
--- a/assets/js/hooks/Mapper/components/ui-kit/CharacterCard/CharacterCard.tsx
+++ b/assets/js/hooks/Mapper/components/ui-kit/CharacterCard/CharacterCard.tsx
@@ -17,6 +17,7 @@ import { useCallback } from 'react';
 import classes from './CharacterCard.module.scss';
 import { ZKB_ICON } from '@/hooks/Mapper/icons';
 import { charEveWhoLink, charZKBLink } from '@/hooks/Mapper/helpers/linkHelpers.ts';
+import { WdCharStateWrapper } from '../../characters/components';
 
 export type CharacterCardProps = {
   compact?: boolean;
@@ -29,6 +30,9 @@ export type CharacterCardProps = {
   showAllyLogo?: boolean;
   showAllyLogoPlaceholder?: boolean;
   simpleMode?: boolean;
+  isExpired?: boolean;
+  isMain?: boolean;
+  isFollowing?: boolean;
 } & WithIsOwnCharacter &
   WithClassName;
 
@@ -55,6 +59,10 @@ export const CharacterCard = ({
   showTicker,
   useSystemsCache,
   className,
+  isExpired,
+  isMain,
+  isFollowing,
+
   ...char
 }: CharacterCardInnerProps) => {
   const handleSelect = useCallback(() => {
@@ -204,7 +212,22 @@ export const CharacterCard = ({
     <div className={clsx('w-full text-xs box-border')} onClick={handleSelect}>
       <div className="w-full flex items-center gap-2">
         <div className="flex items-center gap-1">
-          <WdEveEntityPortrait eveId={char.eve_id} size={WdEveEntityPortraitSize.w33} />
+          <WdCharStateWrapper
+            eve_id={char.eve_id}
+            location={char.location}
+            isExpired={isExpired}
+            isOnline={char.online}
+            isMain={isMain}
+            isFollowing={isFollowing}
+          >
+            <WdEveEntityPortrait
+              eveId={char.eve_id}
+              size={WdEveEntityPortraitSize.w33}
+              className={clsx({
+                ['border-red-600/50']: isExpired,
+              })}
+            />
+          </WdCharStateWrapper>
 
           {showCorporationLogo && (
             <WdTooltipWrapper position={TooltipPosition.top} content={char.corporation_name}>
diff --git a/assets/js/hooks/Mapper/mapRootProvider/MapRootProvider.tsx b/assets/js/hooks/Mapper/mapRootProvider/MapRootProvider.tsx
index 317002e1..eb3106c7 100644
--- a/assets/js/hooks/Mapper/mapRootProvider/MapRootProvider.tsx
+++ b/assets/js/hooks/Mapper/mapRootProvider/MapRootProvider.tsx
@@ -56,6 +56,7 @@ export type MapRootData = MapUnionTypes & {
   trackingCharactersData: TrackingCharacter[];
   loadingPublicRoutes: boolean;
   map_slug: string | null;
+  expiredCharacters: string[];
 };
 
 const INITIAL_DATA: MapRootData = {
@@ -102,6 +103,7 @@ const INITIAL_DATA: MapRootData = {
   pings: [],
   loadingPublicRoutes: false,
   map_slug: null,
+  expiredCharacters: [],
 };
 
 export enum InterfaceStoredSettingsProps {
diff --git a/assets/js/hooks/Mapper/mapRootProvider/hooks/api/useMapInit.ts b/assets/js/hooks/Mapper/mapRootProvider/hooks/api/useMapInit.ts
index 6e925054..3697827c 100644
--- a/assets/js/hooks/Mapper/mapRootProvider/hooks/api/useMapInit.ts
+++ b/assets/js/hooks/Mapper/mapRootProvider/hooks/api/useMapInit.ts
@@ -29,6 +29,7 @@ export const useMapInit = () => {
         following_character_eve_id,
         user_hubs,
         map_slug,
+        expired_characters,
       } = props;
 
       const updateData: Partial<MapRootData> = {};
@@ -108,6 +109,10 @@ export const useMapInit = () => {
         updateData.map_slug = map_slug;
       }
 
+      if ('expired_characters' in props) {
+        updateData.expiredCharacters = expired_characters;
+      }
+
       update(updateData);
     },
     [update, addSystemStatic],
diff --git a/assets/js/hooks/Mapper/types/mapHandlers.ts b/assets/js/hooks/Mapper/types/mapHandlers.ts
index 6d2093cc..96071d8f 100644
--- a/assets/js/hooks/Mapper/types/mapHandlers.ts
+++ b/assets/js/hooks/Mapper/types/mapHandlers.ts
@@ -108,6 +108,7 @@ export type CommandInit = {
   main_character_eve_id?: string | null;
   following_character_eve_id?: string | null;
   map_slug?: string;
+  expired_characters: string[];
 };
 
 export type CommandAddSystems = SolarSystemRawType[];
diff --git a/lib/wanderer_app/esi/api_client.ex b/lib/wanderer_app/esi/api_client.ex
index a7fe571c..e1e5a5dd 100644
--- a/lib/wanderer_app/esi/api_client.ex
+++ b/lib/wanderer_app/esi/api_client.ex
@@ -854,16 +854,11 @@ defmodule WandererApp.Esi.ApiClient do
 
     with {:ok, _} <- WandererApp.Api.Character.update(character, attrs) do
       WandererApp.Character.update_character(character_id, attrs)
-      :ok
     else
       error ->
         Logger.error("Failed to clear tokens for #{character_id}: #{inspect(error)}")
     end
 
-    Phoenix.PubSub.broadcast(
-      WandererApp.PubSub,
-      "character:#{character_id}",
-      :character_token_invalid
-    )
+    :ok
   end
 end
diff --git a/lib/wanderer_app_web/live/map/event_handlers/map_characters_event_handler.ex b/lib/wanderer_app_web/live/map/event_handlers/map_characters_event_handler.ex
index 68d42cad..7ab1205b 100644
--- a/lib/wanderer_app_web/live/map/event_handlers/map_characters_event_handler.ex
+++ b/lib/wanderer_app_web/live/map/event_handlers/map_characters_event_handler.ex
@@ -385,14 +385,6 @@ defmodule WandererAppWeb.MapCharactersEventHandler do
     end
   end
 
-  defp handle_tracking_event(:invalid_token_message, socket, _map_id) do
-    socket
-    |> put_flash(
-      :error,
-      "One of your characters has expired token. Please refresh it on characters page."
-    )
-  end
-
   defp handle_tracking_event(:map_character_limit, socket, _map_id) do
     socket
     |> put_flash(
diff --git a/lib/wanderer_app_web/live/map/event_handlers/map_core_event_handler.ex b/lib/wanderer_app_web/live/map/event_handlers/map_core_event_handler.ex
index 292a7c8c..0efdf281 100644
--- a/lib/wanderer_app_web/live/map/event_handlers/map_core_event_handler.ex
+++ b/lib/wanderer_app_web/live/map/event_handlers/map_core_event_handler.ex
@@ -553,23 +553,14 @@ defmodule WandererAppWeb.MapCoreEventHandler do
          {:ok, map_character_ids} <-
            WandererApp.Cache.lookup("map_#{map_id}:presence_character_ids", []) do
       events =
-        case tracked_characters |> Enum.any?(&(&1.access_token == nil)) do
+        case track_character && not has_tracked_characters? do
           true ->
-            [:invalid_token_message]
+            [:empty_tracked_characters]
 
           _ ->
             []
         end
 
-      events =
-        case track_character && not has_tracked_characters? do
-          true ->
-            events ++ [:empty_tracked_characters]
-
-          _ ->
-            events
-        end
-
       character_limit_reached? = map_character_ids |> Enum.count() >= characters_limit
 
       events =
@@ -623,6 +614,8 @@ defmodule WandererAppWeb.MapCoreEventHandler do
             nil
         end
 
+      expired_characters = tracked_characters |> Enum.filter(&(&1.access_token == nil)) |> Enum.map(& &1.eve_id)
+
       initial_data =
         %{
           kills: kills_data,
@@ -630,6 +623,7 @@ defmodule WandererAppWeb.MapCoreEventHandler do
             map_character_ids
             |> WandererApp.Character.get_character_eve_ids!(),
           user_characters: tracked_characters |> Enum.map(& &1.eve_id),
+          expired_characters: expired_characters,
           system_static_infos: nil,
           wormholes: nil,
           effects: nil,
diff --git a/lib/wanderer_app_web/live/map/map_live.ex b/lib/wanderer_app_web/live/map/map_live.ex
index 2be67e50..3c07adf0 100644
--- a/lib/wanderer_app_web/live/map/map_live.ex
+++ b/lib/wanderer_app_web/live/map/map_live.ex
@@ -55,16 +55,6 @@ defmodule WandererAppWeb.MapLive do
     {:noreply, socket |> push_navigate(to: ~p"/#{map_slug}")}
   end
 
-  @impl true
-  def handle_info(:character_token_invalid, socket),
-    do:
-      {:noreply,
-       socket
-       |> put_flash(
-         :error,
-         "One of your characters has expired token. Please refresh it on characters page."
-       )}
-
   def handle_info(:no_main_character_set, socket),
     do:
       {:noreply,