diff --git a/src/components/SmartActionBar.tsx b/src/components/SmartActionBar.tsx
index 1a933836..aca6c596 100644
--- a/src/components/SmartActionBar.tsx
+++ b/src/components/SmartActionBar.tsx
@@ -1,9 +1,10 @@
 import {useClientStore} from "@/hooks/matrix/useConnection"
+import useTheme from "@/hooks/util/useTheme"
 import useTranslation from "@/hooks/util/useTranslation"
 import {LangKey} from "@/lang/allKeys"
 import {cn} from "@/utils/utils"
 import {SyncState} from "matrix-js-sdk"
-import React, {useState} from "react"
+import React from "react"
 import {type FC} from "react"
 import {type IconType} from "react-icons"
 import {IoContrast, IoGlobe} from "react-icons/io5"
@@ -21,13 +22,7 @@ const SmartActionBar: FC<{className?: string}> = ({className}) => {
   const {syncState} = useClientStore()
   const {t} = useTranslation()
 
-  const [isDarkTheme, setIsDarkTheme] = useState(false)
-
-  document.querySelectorAll("html")[0].className = isDarkTheme ? "dark" : ""
-
-  const handleSwitchTheme = (): void => {
-    setIsDarkTheme(prevIsDarkTheme => !prevIsDarkTheme)
-  }
+  const {toggleTheme} = useTheme()
 
   return (
     <div
@@ -38,7 +33,7 @@ const SmartActionBar: FC<{className?: string}> = ({className}) => {
       <SmartAction
         aria-label={t(LangKey.SwitchTheme)}
         icon={IoContrast}
-        onClick={handleSwitchTheme}>
+        onClick={toggleTheme}>
         {t(LangKey.SwitchTheme)}
       </SmartAction>
 
diff --git a/src/components/TypingIndicator.tsx b/src/components/TypingIndicator.tsx
index 09ed958b..ab44cbf2 100644
--- a/src/components/TypingIndicator.tsx
+++ b/src/components/TypingIndicator.tsx
@@ -4,6 +4,7 @@ import {stringToColor} from "@/utils/util"
 import Avatar from "boring-avatars"
 import useTranslation from "@/hooks/util/useTranslation"
 import {LangKey} from "@/lang/allKeys"
+import {Text} from "./ui/typography"
 
 export type TypingIndicatorUser = {
   displayName: string
@@ -29,19 +30,20 @@ const TypingIndicator: FC<TypingIndicatorProps> = ({users}) => {
     }
 
     return users.map((user, index) => (
-      <span key={index}>
-        <span
-          className="font-semibold"
+      <Text className="truncate" key={index} size="2">
+        <Text
+          size="2"
+          weight="semibold"
           style={{color: stringToColor(user.userId)}}>
           {user.displayName}
-        </span>
+        </Text>
 
         {index < usersLength - 2
           ? ", "
           : index === usersLength - 2
             ? t(LangKey.And)
             : ""}
-      </span>
+      </Text>
     ))
   }, [t, users, usersLength])
 
@@ -55,7 +57,7 @@ const TypingIndicator: FC<TypingIndicatorProps> = ({users}) => {
         <div className={index === 1 || index === 2 ? "-ml-2.5" : ""}>
           <Avatar
             key={index}
-            size={24}
+            size={20}
             name={user.displayName}
             variant="beam"
           />
@@ -63,7 +65,7 @@ const TypingIndicator: FC<TypingIndicatorProps> = ({users}) => {
       ) : (
         <img
           className={twMerge(
-            "size-6 rounded-full",
+            "size-5 rounded-full",
             index === 1 || index === 2 ? "-ml-2.5" : ""
           )}
           key={index}
@@ -74,7 +76,7 @@ const TypingIndicator: FC<TypingIndicatorProps> = ({users}) => {
     )
   }, [users, usersLength])
 
-  const dotClass = "h-2 w-2 animate-dot-jump rounded-full bg-neutral-300"
+  const dotClass = "size-2 animate-dot-jump rounded-full bg-neutral-300"
 
   return (
     <div className="inline-flex items-center gap-3">
@@ -88,9 +90,9 @@ const TypingIndicator: FC<TypingIndicatorProps> = ({users}) => {
 
       <div className="flex">{typingUserElements}</div>
 
-      <div>
+      <Text size="2" className="xs:max-w-80 w-max max-w-none truncate">
         {who} {verbForm} {t(LangKey.Typing)}
-      </div>
+      </Text>
     </div>
   )
 }
diff --git a/src/components/ui/select.tsx b/src/components/ui/select.tsx
index ebe34879..87755f1f 100644
--- a/src/components/ui/select.tsx
+++ b/src/components/ui/select.tsx
@@ -28,7 +28,7 @@ const SelectTrigger = React.forwardRef<
     {...props}>
     {children}
     <SelectPrimitive.Icon asChild>
-      <CaretSortIcon className="h-4 w-4 opacity-50" />
+      <CaretSortIcon className="size-4 opacity-50" />
     </SelectPrimitive.Icon>
   </SelectPrimitive.Trigger>
 ))
@@ -120,9 +120,9 @@ const SelectItem = React.forwardRef<
       className
     )}
     {...props}>
-    <span className="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
+    <span className="absolute right-2 flex size-3.5 items-center justify-center">
       <SelectPrimitive.ItemIndicator>
-        <CheckIcon className="h-4 w-4" />
+        <CheckIcon className="size-4" />
       </SelectPrimitive.ItemIndicator>
     </span>
     <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
diff --git a/src/components/ui/toast.tsx b/src/components/ui/toast.tsx
index a3546b6d..eaf8317e 100644
--- a/src/components/ui/toast.tsx
+++ b/src/components/ui/toast.tsx
@@ -27,7 +27,7 @@ const toastVariants = cva(
   {
     variants: {
       variant: {
-        default: "border bg-background dark:bg-neutral-900 text-foreground",
+        default: "border bg-background text-foreground dark:bg-neutral-900",
         destructive:
           "group border-destructive bg-destructive text-destructive-foreground",
       },
diff --git a/src/containers/RoomContainer/ChatHeader.tsx b/src/containers/RoomContainer/ChatHeader.tsx
index 1ac628d0..87fbcf0f 100644
--- a/src/containers/RoomContainer/ChatHeader.tsx
+++ b/src/containers/RoomContainer/ChatHeader.tsx
@@ -37,11 +37,11 @@ const ChatHeader: FC<ChatHeaderProps> = ({
     <header className="flex size-full h-12 w-full flex-col justify-center gap-1 border-b border-b-neutral-200 px-2 py-1 dark:border-b-neutral-700">
       <div className="flex w-full items-center justify-center">
         <div className="m-2 flex w-full items-center gap-1">
-          <LiaSlackHash className="size-5 text-blue-800" />
+          <LiaSlackHash className="size-5 text-blue-800 dark:text-blue-400" />
 
           <Heading
             level="h5"
-            className="w-max max-w-56 truncate text-blue-800 sm:max-w-md">
+            className="w-max max-w-56 truncate text-blue-800 dark:text-blue-400 sm:max-w-md">
             {roomName}
           </Heading>
 
diff --git a/src/hooks/util/useTheme.ts b/src/hooks/util/useTheme.ts
new file mode 100644
index 00000000..7f88056c
--- /dev/null
+++ b/src/hooks/util/useTheme.ts
@@ -0,0 +1,33 @@
+import {useCallback, useEffect, useState} from "react"
+
+type UseThemeReturnType = {
+  toggleTheme: () => void
+  isDarkMode: boolean
+}
+
+const useTheme = (): UseThemeReturnType => {
+  const savedTheme = localStorage.getItem("darkMode")
+  const isDarkMode = savedTheme ? JSON.parse(savedTheme) : false
+
+  const [isDarkTheme, setIsDarkTheme] = useState(isDarkMode)
+
+  useEffect(() => {
+    const html = document.documentElement
+
+    if (isDarkTheme) {
+      html.classList.add("dark")
+    } else {
+      html.classList.remove("dark")
+    }
+
+    localStorage.setItem("darkMode", JSON.stringify(isDarkTheme))
+  }, [isDarkTheme])
+
+  const toggleTheme = useCallback(() => {
+    setIsDarkTheme(!isDarkTheme)
+  }, [isDarkTheme])
+
+  return {toggleTheme, isDarkMode}
+}
+
+export default useTheme