diff --git a/src/renderer/src/components/AccountButton/LoginButton.tsx b/src/renderer/src/components/AccountButton/LoginButton.tsx
index 00366f6..b319d77 100644
--- a/src/renderer/src/components/AccountButton/LoginButton.tsx
+++ b/src/renderer/src/components/AccountButton/LoginButton.tsx
@@ -5,12 +5,12 @@ import { LogIn } from 'lucide-react'
 export default function LoginButton({
   variant = 'titlebar'
 }: {
-  variant?: 'titlebar' | 'sidebar'
+  variant?: 'titlebar' | 'sidebar' | 'small-screen-titlebar'
 }) {
   const { checkLogin } = useNostr()
 
   let triggerComponent: React.ReactNode
-  if (variant === 'titlebar') {
+  if (variant === 'titlebar' || variant === 'small-screen-titlebar') {
     triggerComponent = <LogIn />
   } else {
     triggerComponent = (
diff --git a/src/renderer/src/components/AccountButton/ProfileButton.tsx b/src/renderer/src/components/AccountButton/ProfileButton.tsx
index c2b0bb8..2ee889a 100644
--- a/src/renderer/src/components/AccountButton/ProfileButton.tsx
+++ b/src/renderer/src/components/AccountButton/ProfileButton.tsx
@@ -18,7 +18,7 @@ export default function ProfileButton({
   variant = 'titlebar'
 }: {
   pubkey: string
-  variant?: 'titlebar' | 'sidebar'
+  variant?: 'titlebar' | 'sidebar' | 'small-screen-titlebar'
 }) {
   const { t } = useTranslation()
   const { logout } = useNostr()
@@ -33,7 +33,18 @@ export default function ProfileButton({
   if (variant === 'titlebar') {
     triggerComponent = (
       <button>
-        <Avatar className="w-6 h-6 hover:opacity-90">
+        <Avatar className="ml-2 w-7 h-7 hover:opacity-90">
+          <AvatarImage src={avatar} />
+          <AvatarFallback>
+            <img src={defaultAvatar} />
+          </AvatarFallback>
+        </Avatar>
+      </button>
+    )
+  } else if (variant === 'small-screen-titlebar') {
+    triggerComponent = (
+      <button>
+        <Avatar className="w-8 h-8 hover:opacity-90">
           <AvatarImage src={avatar} />
           <AvatarFallback>
             <img src={defaultAvatar} />
diff --git a/src/renderer/src/components/AccountButton/index.tsx b/src/renderer/src/components/AccountButton/index.tsx
index ab36996..3e3c6e7 100644
--- a/src/renderer/src/components/AccountButton/index.tsx
+++ b/src/renderer/src/components/AccountButton/index.tsx
@@ -5,7 +5,7 @@ import ProfileButton from './ProfileButton'
 export default function AccountButton({
   variant = 'titlebar'
 }: {
-  variant?: 'titlebar' | 'sidebar'
+  variant?: 'titlebar' | 'sidebar' | 'small-screen-titlebar'
 }) {
   const { pubkey } = useNostr()
 
diff --git a/src/renderer/src/components/BackButton/index.tsx b/src/renderer/src/components/BackButton/index.tsx
index aed1b39..cab5a74 100644
--- a/src/renderer/src/components/BackButton/index.tsx
+++ b/src/renderer/src/components/BackButton/index.tsx
@@ -3,14 +3,20 @@ import { useSecondaryPage } from '@renderer/PageManager'
 import { ChevronLeft } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 
-export default function BackButton({ hide = false }: { hide?: boolean }) {
+export default function BackButton({
+  hide = false,
+  variant = 'titlebar'
+}: {
+  hide?: boolean
+  variant?: 'titlebar' | 'small-screen-titlebar'
+}) {
   const { t } = useTranslation()
   const { pop } = useSecondaryPage()
 
   return (
     <>
       {!hide && (
-        <Button variant="titlebar" size="titlebar" title={t('back')} onClick={() => pop()}>
+        <Button variant={variant} size={variant} title={t('back')} onClick={() => pop()}>
           <ChevronLeft />
         </Button>
       )}
diff --git a/src/renderer/src/components/Content/index.tsx b/src/renderer/src/components/Content/index.tsx
index 13a0522..4265ab3 100644
--- a/src/renderer/src/components/Content/index.tsx
+++ b/src/renderer/src/components/Content/index.tsx
@@ -79,7 +79,13 @@ const Content = memo(
     if (embeddedNotes.length) {
       embeddedNotes.forEach((note, index) => {
         const id = note.split(':')[1]
-        nodes.push(<EmbeddedNote key={`embedded-event-${index}`} noteId={id} />)
+        nodes.push(
+          <EmbeddedNote
+            key={`embedded-event-${index}`}
+            noteId={id}
+            className={size === 'small' ? 'mt-1' : 'mt-2'}
+          />
+        )
       })
     }
 
diff --git a/src/renderer/src/components/Embedded/EmbeddedNote.tsx b/src/renderer/src/components/Embedded/EmbeddedNote.tsx
index b55786c..254d58e 100644
--- a/src/renderer/src/components/Embedded/EmbeddedNote.tsx
+++ b/src/renderer/src/components/Embedded/EmbeddedNote.tsx
@@ -1,13 +1,14 @@
 import { useFetchEvent } from '@renderer/hooks'
 import { toNoStrudelArticle, toNoStrudelNote, toNoStrudelStream } from '@renderer/lib/link'
+import { cn } from '@renderer/lib/utils'
 import { kinds } from 'nostr-tools'
 import ShortTextNoteCard from '../NoteCard/ShortTextNoteCard'
 
-export function EmbeddedNote({ noteId }: { noteId: string }) {
+export function EmbeddedNote({ noteId, className }: { noteId: string; className?: string }) {
   const { event } = useFetchEvent(noteId)
 
   return event && event.kind === kinds.ShortTextNote ? (
-    <ShortTextNoteCard className="mt-2 w-full" event={event} embedded />
+    <ShortTextNoteCard className={cn('w-full', className)} event={event} embedded />
   ) : (
     <a
       href={
diff --git a/src/renderer/src/components/Note/index.tsx b/src/renderer/src/components/Note/index.tsx
index e35fc0c..9fe760d 100644
--- a/src/renderer/src/components/Note/index.tsx
+++ b/src/renderer/src/components/Note/index.tsx
@@ -54,7 +54,7 @@ export default function Note({
       )}
       <Content className="mt-2" event={event} />
       {!hideStats && (
-        <NoteStats className="mt-4" event={event} fetchIfNotExisting={fetchNoteStats} />
+        <NoteStats className="mt-3 sm:mt-4" event={event} fetchIfNotExisting={fetchNoteStats} />
       )}
     </div>
   )
diff --git a/src/renderer/src/components/NoteCard/ShortTextNoteCard.tsx b/src/renderer/src/components/NoteCard/ShortTextNoteCard.tsx
index 277eaef..ffa8149 100644
--- a/src/renderer/src/components/NoteCard/ShortTextNoteCard.tsx
+++ b/src/renderer/src/components/NoteCard/ShortTextNoteCard.tsx
@@ -34,7 +34,7 @@ export default function ShortTextNoteCard({
     >
       <RepostDescription reposter={reposter} className="max-sm:hidden pl-4" />
       <div
-        className={`hover:bg-muted/50 text-left cursor-pointer ${embedded ? 'p-3 border rounded-lg' : 'p-4 sm:border sm:rounded-lg max-sm:border-b'}`}
+        className={`hover:bg-muted/50 text-left cursor-pointer ${embedded ? 'p-2 sm:p-3 border rounded-lg' : 'px-4 py-3 sm:py-4 sm:border sm:rounded-lg max-sm:border-b'}`}
       >
         <RepostDescription reposter={reposter} className="sm:hidden" />
         <Note
diff --git a/src/renderer/src/components/PostButton/index.tsx b/src/renderer/src/components/PostButton/index.tsx
index cd79d4d..225a269 100644
--- a/src/renderer/src/components/PostButton/index.tsx
+++ b/src/renderer/src/components/PostButton/index.tsx
@@ -4,7 +4,11 @@ import { PencilLine } from 'lucide-react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
-export default function PostButton({ variant = 'titlebar' }: { variant?: 'titlebar' | 'sidebar' }) {
+export default function PostButton({
+  variant = 'titlebar'
+}: {
+  variant?: 'titlebar' | 'sidebar' | 'small-screen-titlebar'
+}) {
   const { t } = useTranslation()
   const [open, setOpen] = useState(false)
 
diff --git a/src/renderer/src/components/RelaySettingsButton/index.tsx b/src/renderer/src/components/RelaySettingsButton/index.tsx
index 14bd77b..22b7b00 100644
--- a/src/renderer/src/components/RelaySettingsButton/index.tsx
+++ b/src/renderer/src/components/RelaySettingsButton/index.tsx
@@ -11,7 +11,7 @@ import { useTranslation } from 'react-i18next'
 export default function RelaySettingsButton({
   variant = 'titlebar'
 }: {
-  variant?: 'titlebar' | 'sidebar'
+  variant?: 'titlebar' | 'sidebar' | 'small-screen-titlebar'
 }) {
   const { t } = useTranslation()
   const { isSmallScreen } = useScreenSize()
diff --git a/src/renderer/src/components/ReplyNoteList/index.tsx b/src/renderer/src/components/ReplyNoteList/index.tsx
index 1a11d68..bce6e46 100644
--- a/src/renderer/src/components/ReplyNoteList/index.tsx
+++ b/src/renderer/src/components/ReplyNoteList/index.tsx
@@ -132,7 +132,7 @@ export default function ReplyNoteList({ event, className }: { event: Event; clas
       >
         {loading ? t('loading...') : until ? t('load more older replies') : null}
       </div>
-      {replies.length > 0 && (loading || until) && <Separator className="my-4" />}
+      {replies.length > 0 && (loading || until) && <Separator className="my-2" />}
       <div className={cn('mb-4', className)}>
         {replies.map((reply, index) => {
           const info = replyMap[reply.id]
diff --git a/src/renderer/src/components/ScrollToTopButton/index.tsx b/src/renderer/src/components/ScrollToTopButton/index.tsx
index fa333a3..12c45fb 100644
--- a/src/renderer/src/components/ScrollToTopButton/index.tsx
+++ b/src/renderer/src/components/ScrollToTopButton/index.tsx
@@ -1,40 +1,25 @@
 import { Button } from '@renderer/components/ui/button'
 import { cn } from '@renderer/lib/utils'
 import { ChevronUp } from 'lucide-react'
-import { useEffect, useState } from 'react'
 
 export default function ScrollToTopButton({
   scrollAreaRef,
-  className
+  className,
+  visible = true
 }: {
   scrollAreaRef: React.RefObject<HTMLDivElement>
   className?: string
+  visible?: boolean
 }) {
-  const [showScrollToTop, setShowScrollToTop] = useState(false)
-
   const handleScrollToTop = () => {
     scrollAreaRef.current?.scrollTo({ top: 0, behavior: 'smooth' })
   }
 
-  const handleScroll = () => {
-    if (scrollAreaRef.current) {
-      setShowScrollToTop(scrollAreaRef.current.scrollTop > 600)
-    }
-  }
-
-  useEffect(() => {
-    const scrollArea = scrollAreaRef.current
-    scrollArea?.addEventListener('scroll', handleScroll)
-    return () => {
-      scrollArea?.removeEventListener('scroll', handleScroll)
-    }
-  }, [])
-
   return (
     <Button
       variant="secondary-2"
       className={cn(
-        `absolute bottom-8 right-2 rounded-full w-10 h-10 p-0 hover:text-background transition-transform ${showScrollToTop ? '' : 'translate-y-20'}`,
+        `absolute bottom-2 right-2 rounded-full w-11 h-11 p-0 hover:text-background transition-transform ${visible ? '' : 'translate-y-14'}`,
         className
       )}
       onClick={handleScrollToTop}
diff --git a/src/renderer/src/components/SearchButton/index.tsx b/src/renderer/src/components/SearchButton/index.tsx
index 49ca1a5..a4b1166 100644
--- a/src/renderer/src/components/SearchButton/index.tsx
+++ b/src/renderer/src/components/SearchButton/index.tsx
@@ -7,7 +7,7 @@ import { SearchDialog } from '../SearchDialog'
 export default function RefreshButton({
   variant = 'titlebar'
 }: {
-  variant?: 'titlebar' | 'sidebar'
+  variant?: 'titlebar' | 'sidebar' | 'small-screen-titlebar'
 }) {
   const { t } = useTranslation()
   const [open, setOpen] = useState(false)
diff --git a/src/renderer/src/components/ThemeToggle/index.tsx b/src/renderer/src/components/ThemeToggle/index.tsx
index 36aa3e7..8bd4fc8 100644
--- a/src/renderer/src/components/ThemeToggle/index.tsx
+++ b/src/renderer/src/components/ThemeToggle/index.tsx
@@ -3,7 +3,11 @@ import { useTheme } from '@renderer/providers/ThemeProvider'
 import { Moon, Sun, SunMoon } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 
-export default function ThemeToggle() {
+export default function ThemeToggle({
+  variant = 'titlebar'
+}: {
+  variant?: 'titlebar' | 'small-screen-titlebar'
+}) {
   const { t } = useTranslation()
   const { themeSetting, setThemeSetting } = useTheme()
 
@@ -11,8 +15,8 @@ export default function ThemeToggle() {
     <>
       {themeSetting === 'system' ? (
         <Button
-          variant="titlebar"
-          size="titlebar"
+          variant={variant}
+          size={variant}
           onClick={() => setThemeSetting('light')}
           title={t('switch to light theme')}
         >
@@ -20,8 +24,8 @@ export default function ThemeToggle() {
         </Button>
       ) : themeSetting === 'light' ? (
         <Button
-          variant="titlebar"
-          size="titlebar"
+          variant={variant}
+          size={variant}
           onClick={() => setThemeSetting('dark')}
           title={t('switch to dark theme')}
         >
@@ -29,8 +33,8 @@ export default function ThemeToggle() {
         </Button>
       ) : (
         <Button
-          variant="titlebar"
-          size="titlebar"
+          variant={variant}
+          size={variant}
           onClick={() => setThemeSetting('system')}
           title={t('switch to system theme')}
         >
diff --git a/src/renderer/src/components/Titlebar/index.tsx b/src/renderer/src/components/Titlebar/index.tsx
index b3beef3..cad16e5 100644
--- a/src/renderer/src/components/Titlebar/index.tsx
+++ b/src/renderer/src/components/Titlebar/index.tsx
@@ -4,16 +4,23 @@ import { useScreenSize } from '@renderer/providers/ScreenSizeProvider'
 
 export function Titlebar({
   children,
-  className
+  className,
+  visible = true
 }: {
   children?: React.ReactNode
   className?: string
+  visible?: boolean
 }) {
   const { isSmallScreen } = useScreenSize()
 
   if (isMacOS() && isSmallScreen) {
     return (
-      <div className="absolute top-0 w-full z-50 bg-background/80 backdrop-blur-md font-semibold">
+      <div
+        className={cn(
+          'absolute top-0 w-full z-50 bg-background/80 backdrop-blur-md font-semibold transition-transform',
+          visible ? '' : '-translate-y-full'
+        )}
+      >
         <div className="draggable h-9 w-full" />
         <div className={cn('h-11 flex gap-1 items-center', className)}>{children}</div>
       </div>
@@ -23,7 +30,8 @@ export function Titlebar({
   return (
     <div
       className={cn(
-        'draggable absolute top-0 w-full h-9 z-50 bg-background/80 backdrop-blur-md flex items-center font-semibold gap-1 px-2',
+        'draggable absolute top-0 w-full h-9 max-sm:h-11 z-50 bg-background/80 backdrop-blur-md flex items-center font-semibold gap-1 px-2 duration-700 transition-transform',
+        visible ? '' : '-translate-y-full',
         className
       )}
     >
diff --git a/src/renderer/src/components/ui/button.tsx b/src/renderer/src/components/ui/button.tsx
index b64ea9c..6e48ec8 100644
--- a/src/renderer/src/components/ui/button.tsx
+++ b/src/renderer/src/components/ui/button.tsx
@@ -17,7 +17,8 @@ const buttonVariants = cva(
         ghost: 'text-muted-foreground hover:bg-accent hover:text-foreground',
         link: 'text-primary underline-offset-4 hover:underline',
         titlebar: 'non-draggable hover:bg-accent hover:text-accent-foreground',
-        sidebar: 'non-draggable hover:bg-accent hover:text-accent-foreground'
+        sidebar: 'non-draggable hover:bg-accent hover:text-accent-foreground',
+        'small-screen-titlebar': 'non-draggable hover:bg-accent hover:text-accent-foreground'
       },
       size: {
         default: 'h-8 rounded-lg px-3',
@@ -25,7 +26,8 @@ const buttonVariants = cva(
         lg: 'h-10 px-4 py-2',
         icon: 'h-8 w-8 rounded-full',
         titlebar: 'h-7 w-7 rounded-full',
-        sidebar: 'w-full flex py-2 px-4 rounded-full justify-start gap-4 text-lg font-semibold'
+        sidebar: 'w-full flex py-2 px-4 rounded-full justify-start gap-4 text-lg font-semibold',
+        'small-screen-titlebar': 'h-8 w-8 rounded-full'
       }
     },
     defaultVariants: {
diff --git a/src/renderer/src/components/ui/command.tsx b/src/renderer/src/components/ui/command.tsx
index a338194..077eb7c 100644
--- a/src/renderer/src/components/ui/command.tsx
+++ b/src/renderer/src/components/ui/command.tsx
@@ -41,7 +41,7 @@ const CommandDialog = ({
       </DialogHeader>
       <DialogContent
         className={cn(
-          'overflow-hidden p-0 shadow-lg top-4 translate-y-0 data-[state=closed]:slide-out-to-top-0 data-[state=open]:slide-in-from-top-0',
+          'overflow-hidden p-0 shadow-lg top-4 translate-y-0 data-[state=closed]:slide-out-to-top-4 data-[state=open]:slide-in-from-top-4',
           classNames?.content
         )}
       >
diff --git a/src/renderer/src/components/ui/dialog.tsx b/src/renderer/src/components/ui/dialog.tsx
index 4e1b4f4..22442f2 100644
--- a/src/renderer/src/components/ui/dialog.tsx
+++ b/src/renderer/src/components/ui/dialog.tsx
@@ -37,7 +37,7 @@ const DialogContent = React.forwardRef<
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
+        'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 sm:border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
         className
       )}
       onClick={(e) => e.stopPropagation()}
diff --git a/src/renderer/src/components/ui/dropdown-menu.tsx b/src/renderer/src/components/ui/dropdown-menu.tsx
index 08226ce..c23fb01 100644
--- a/src/renderer/src/components/ui/dropdown-menu.tsx
+++ b/src/renderer/src/components/ui/dropdown-menu.tsx
@@ -64,6 +64,7 @@ const DropdownMenuContent = React.forwardRef<
         'z-50 min-w-[8rem] overflow-hidden rounded-lg border bg-popover p-1 text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
         className
       )}
+      collisionPadding={10}
       {...props}
     />
   </DropdownMenuPrimitive.Portal>
diff --git a/src/renderer/src/layouts/PrimaryPageLayout/index.tsx b/src/renderer/src/layouts/PrimaryPageLayout/index.tsx
index 932d13d..a081b7e 100644
--- a/src/renderer/src/layouts/PrimaryPageLayout/index.tsx
+++ b/src/renderer/src/layouts/PrimaryPageLayout/index.tsx
@@ -4,15 +4,18 @@ import RefreshButton from '@renderer/components/RefreshButton'
 import RelaySettingsButton from '@renderer/components/RelaySettingsButton'
 import ScrollToTopButton from '@renderer/components/ScrollToTopButton'
 import SearchButton from '@renderer/components/SearchButton'
+import ThemeToggle from '@renderer/components/ThemeToggle'
 import { Titlebar } from '@renderer/components/Titlebar'
 import { ScrollArea } from '@renderer/components/ui/scroll-area'
 import { isMacOS } from '@renderer/lib/env'
 import { cn } from '@renderer/lib/utils'
 import { useScreenSize } from '@renderer/providers/ScreenSizeProvider'
-import { forwardRef, useImperativeHandle, useRef } from 'react'
+import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from 'react'
 
 const PrimaryPageLayout = forwardRef(({ children }: { children?: React.ReactNode }, ref) => {
   const scrollAreaRef = useRef<HTMLDivElement>(null)
+  const [visible, setVisible] = useState(true)
+  const [lastScrollTop, setLastScrollTop] = useState(0)
 
   useImperativeHandle(
     ref,
@@ -24,17 +27,36 @@ const PrimaryPageLayout = forwardRef(({ children }: { children?: React.ReactNode
     []
   )
 
+  useEffect(() => {
+    const handleScroll = () => {
+      const scrollTop = scrollAreaRef.current?.scrollTop || 0
+      if (scrollTop > lastScrollTop) {
+        setVisible(false)
+      } else {
+        setVisible(true)
+      }
+      setLastScrollTop(scrollTop)
+    }
+
+    const scrollArea = scrollAreaRef.current
+    scrollArea?.addEventListener('scroll', handleScroll)
+
+    return () => {
+      scrollArea?.removeEventListener('scroll', handleScroll)
+    }
+  }, [lastScrollTop])
+
   return (
     <ScrollArea
       ref={scrollAreaRef}
       className="h-full w-full"
       scrollBarClassName="pt-9 max-sm:pt-0 xl:pt-0"
     >
-      <PrimaryPageTitlebar />
-      <div className={cn('sm:px-4 pb-4 pt-11 xl:pt-4', isMacOS() ? 'max-sm:pt-20' : 'max-sm:pt-9')}>
+      <PrimaryPageTitlebar visible={visible} />
+      <div className={cn('sm:px-4 pb-4 pt-11 xl:pt-4', isMacOS() ? 'max-sm:pt-20' : '')}>
         {children}
       </div>
-      <ScrollToTopButton scrollAreaRef={scrollAreaRef} />
+      <ScrollToTopButton scrollAreaRef={scrollAreaRef} visible={visible} />
     </ScrollArea>
   )
 })
@@ -45,18 +67,24 @@ export type TPrimaryPageLayoutRef = {
   scrollToTop: () => void
 }
 
-function PrimaryPageTitlebar() {
+function PrimaryPageTitlebar({ visible = true }: { visible?: boolean }) {
   const { isSmallScreen } = useScreenSize()
 
   if (isSmallScreen) {
     return (
-      <Titlebar className="justify-between px-4">
-        <div className="text-2xl font-extrabold font-mono">Jumble</div>
-        <div className="flex gap-2 items-center">
-          <SearchButton />
-          <PostButton />
-          <RelaySettingsButton />
-          <AccountButton />
+      <Titlebar
+        className="justify-between px-4 transition-transform duration-500"
+        visible={visible}
+      >
+        <div className="flex gap-1 items-center">
+          <div className="text-2xl font-extrabold font-mono">Jumble</div>
+          <ThemeToggle variant="small-screen-titlebar" />
+        </div>
+        <div className="flex gap-1 items-center">
+          <SearchButton variant="small-screen-titlebar" />
+          <PostButton variant="small-screen-titlebar" />
+          <RelaySettingsButton variant="small-screen-titlebar" />
+          <AccountButton variant="small-screen-titlebar" />
         </div>
       </Titlebar>
     )
diff --git a/src/renderer/src/layouts/SecondaryPageLayout/index.tsx b/src/renderer/src/layouts/SecondaryPageLayout/index.tsx
index 3880583..889a00e 100644
--- a/src/renderer/src/layouts/SecondaryPageLayout/index.tsx
+++ b/src/renderer/src/layouts/SecondaryPageLayout/index.tsx
@@ -6,7 +6,7 @@ import { ScrollArea } from '@renderer/components/ui/scroll-area'
 import { isMacOS } from '@renderer/lib/env'
 import { cn } from '@renderer/lib/utils'
 import { useScreenSize } from '@renderer/providers/ScreenSizeProvider'
-import { useRef } from 'react'
+import { useEffect, useRef, useState } from 'react'
 
 export default function SecondaryPageLayout({
   children,
@@ -18,30 +18,58 @@ export default function SecondaryPageLayout({
   hideBackButton?: boolean
 }): JSX.Element {
   const scrollAreaRef = useRef<HTMLDivElement>(null)
+  const [visible, setVisible] = useState(true)
+  const [lastScrollTop, setLastScrollTop] = useState(0)
+
+  useEffect(() => {
+    const handleScroll = () => {
+      const scrollTop = scrollAreaRef.current?.scrollTop || 0
+      if (scrollTop > lastScrollTop) {
+        setVisible(false)
+      } else {
+        setVisible(true)
+      }
+      setLastScrollTop(scrollTop)
+    }
+
+    const scrollArea = scrollAreaRef.current
+    scrollArea?.addEventListener('scroll', handleScroll)
+
+    return () => {
+      scrollArea?.removeEventListener('scroll', handleScroll)
+    }
+  }, [lastScrollTop])
+
   return (
     <ScrollArea ref={scrollAreaRef} className="h-full" scrollBarClassName="pt-9">
-      <SecondaryPageTitlebar content={titlebarContent} hideBackButton={hideBackButton} />
+      <SecondaryPageTitlebar
+        content={titlebarContent}
+        hideBackButton={hideBackButton}
+        visible={visible}
+      />
       <div className={cn('sm:px-4 pb-4 pt-11 w-full h-full', isMacOS() ? 'max-sm:pt-20' : '')}>
         {children}
       </div>
-      <ScrollToTopButton scrollAreaRef={scrollAreaRef} />
+      <ScrollToTopButton scrollAreaRef={scrollAreaRef} visible={visible} />
     </ScrollArea>
   )
 }
 
 export function SecondaryPageTitlebar({
   content,
-  hideBackButton = false
+  hideBackButton = false,
+  visible = true
 }: {
   content?: React.ReactNode
   hideBackButton?: boolean
+  visible?: boolean
 }): JSX.Element {
   const { isSmallScreen } = useScreenSize()
 
   if (isSmallScreen) {
     return (
-      <Titlebar className="pl-2">
-        <BackButton hide={hideBackButton} />
+      <Titlebar className="pl-2" visible={visible}>
+        <BackButton hide={hideBackButton} variant="small-screen-titlebar" />
         <div className="truncate text-lg">{content}</div>
       </Titlebar>
     )
diff --git a/src/renderer/src/pages/secondary/NotePage/index.tsx b/src/renderer/src/pages/secondary/NotePage/index.tsx
index 8d89e46..8fbc233 100644
--- a/src/renderer/src/pages/secondary/NotePage/index.tsx
+++ b/src/renderer/src/pages/secondary/NotePage/index.tsx
@@ -38,7 +38,7 @@ export default function NotePage({ id }: { id?: string }) {
         <ParentNote key={`parent-note-${event.id}`} eventId={parentEventId} />
         <Note key={`note-${event.id}`} event={event} fetchNoteStats />
       </div>
-      <Separator className="my-4" />
+      <Separator className="mb-2 mt-4" />
       <ReplyNoteList key={`reply-note-list-${event.id}`} event={event} className="max-sm:px-2" />
     </SecondaryPageLayout>
   )