diff --git a/src/app/epub/[id]/page.tsx b/src/app/epub/[id]/page.tsx
index 317528d..6778b4e 100644
--- a/src/app/epub/[id]/page.tsx
+++ b/src/app/epub/[id]/page.tsx
@@ -6,12 +6,16 @@ import { useCallback, useEffect, useState } from 'react';
 import { useEPUB } from '@/contexts/EPUBContext';
 import { DocumentSkeleton } from '@/components/DocumentSkeleton';
 import { EPUBViewer } from '@/components/EPUBViewer';
+import { Button } from '@headlessui/react';
+import { DocumentSettings } from '@/components/DocumentSettings';
+import { SettingsIcon } from '@/components/icons/Icons';
 
 export default function EPUBPage() {
   const { id } = useParams();
   const { setCurrentDocument, currDocName, clearCurrDoc } = useEPUB();
   const [error, setError] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState(true);
+  const [isSettingsOpen, setIsSettingsOpen] = useState(false);
 
   const loadDocument = useCallback(async () => {
     if (!isLoading) return;
@@ -66,6 +70,13 @@ export default function EPUBPage() {
               </svg>
               Documents
             </Link>
+            <Button
+              onClick={() => setIsSettingsOpen(true)}
+              className="rounded-full p-1 text-foreground hover:bg-offbase transform transition-transform duration-200 ease-in-out hover:scale-[1.1] hover:text-accent"
+              aria-label="View Settings"
+            >
+              <SettingsIcon className="w-5 h-5 hover:animate-spin-slow" />
+            </Button>
           </div>
           <h1 className="ml-2 mr-2 text-md font-semibold text-foreground truncate">
             {isLoading ? 'Loading...' : currDocName}
@@ -79,6 +90,7 @@ export default function EPUBPage() {
       ) : (
         <EPUBViewer className="p-4" />
       )}
+      <DocumentSettings epub isOpen={isSettingsOpen} setIsOpen={setIsSettingsOpen} />
     </>
   );
 }
\ No newline at end of file
diff --git a/src/app/pdf/[id]/page.tsx b/src/app/pdf/[id]/page.tsx
index 591a86c..bbf602e 100644
--- a/src/app/pdf/[id]/page.tsx
+++ b/src/app/pdf/[id]/page.tsx
@@ -8,7 +8,7 @@ import { useCallback, useEffect, useState } from 'react';
 import { DocumentSkeleton } from '@/components/DocumentSkeleton';
 import { useTTS } from '@/contexts/TTSContext';
 import { Button } from '@headlessui/react';
-import { PDFViewSettings } from '@/components/PDFViewSettings';
+import { DocumentSettings } from '@/components/DocumentSettings';
 import { SettingsIcon } from '@/components/icons/Icons';
 
 // Dynamic import for client-side rendering only
@@ -123,7 +123,7 @@ export default function PDFViewerPage() {
       ) : (
         <PDFViewer zoomLevel={zoomLevel} />
       )}
-      <PDFViewSettings isOpen={isSettingsOpen} setIsOpen={setIsSettingsOpen} />
+      <DocumentSettings isOpen={isSettingsOpen} setIsOpen={setIsSettingsOpen} />
     </>
   );
 }
diff --git a/src/components/DocumentList.tsx b/src/components/DocumentList.tsx
index a6ed5f6..a81c5ea 100644
--- a/src/components/DocumentList.tsx
+++ b/src/components/DocumentList.tsx
@@ -3,6 +3,7 @@ import { Button, Dialog } from '@headlessui/react';
 import { Transition, TransitionChild, DialogPanel, DialogTitle } from '@headlessui/react';
 import { Fragment, useState } from 'react';
 import { useDocuments } from '@/contexts/DocumentContext';
+import { PDFIcon, EPUBIcon } from '@/components/icons/Icons';
 
 type DocumentToDelete = {
   id: string;
@@ -82,13 +83,9 @@ export function DocumentList() {
               >
                 <div className="flex-shrink-0">
                   {doc.type === 'pdf' ? (
-                    <svg className="w-6 h-6 sm:w-8 sm:h-8 text-red-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M7 21h10a2 2 0 002-2V9.414a1 1 0 00-.293-.707l-5.414-5.414A1 1 0 0012.586 3H7a2 2 0 00-2 2v14a2 2 0 002 2z" />
-                    </svg>
+                    <PDFIcon />
                   ) : (
-                    <svg className="w-6 h-6 sm:w-8 sm:h-8 text-blue-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253" />
-                    </svg>
+                    <EPUBIcon />
                   )}
                 </div>
                 <div className="flex-1 min-w-0 transform transition-transform duration-200 ease-in-out hover:scale-[1.02]">
diff --git a/src/components/PDFViewSettings.tsx b/src/components/DocumentSettings.tsx
similarity index 96%
rename from src/components/PDFViewSettings.tsx
rename to src/components/DocumentSettings.tsx
index 8628c9e..dc15191 100644
--- a/src/components/PDFViewSettings.tsx
+++ b/src/components/DocumentSettings.tsx
@@ -5,9 +5,10 @@ import { Dialog, DialogPanel, DialogTitle, Transition, TransitionChild, Listbox,
 import { useConfig, ViewType } from '@/contexts/ConfigContext';
 import { ChevronUpDownIcon, CheckIcon } from '@/components/icons/Icons';
 
-interface PDFViewSettingsProps {
+interface DocViewSettingsProps {
   isOpen: boolean;
   setIsOpen: (isOpen: boolean) => void;
+  epub?: boolean;
 }
 
 const viewTypes = [
@@ -16,7 +17,7 @@ const viewTypes = [
   { id: 'scroll', name: 'Continuous Scroll' },
 ];
 
-export function PDFViewSettings({ isOpen, setIsOpen }: PDFViewSettingsProps) {
+export function DocumentSettings({ isOpen, setIsOpen, epub }: DocViewSettingsProps) {
   const { viewType, skipBlank, updateConfigKey } = useConfig();
   const selectedView = viewTypes.find(v => v.id === viewType) || viewTypes[0];
 
@@ -55,7 +56,7 @@ export function PDFViewSettings({ isOpen, setIsOpen }: PDFViewSettingsProps) {
                 </DialogTitle>
                 <div className="mt-4">
                   <div className="space-y-4">
-                    <div className="space-y-2">
+                    {!epub && <div className="space-y-2">
                       <label className="block text-sm font-medium text-foreground">Mode</label>
                       <Listbox 
                         value={selectedView} 
@@ -108,7 +109,7 @@ export function PDFViewSettings({ isOpen, setIsOpen }: PDFViewSettingsProps) {
                           Note: Continuous scroll may perform poorly for larger documents.
                         </p>
                       )}
-                    </div>
+                    </div>}
                     <div className="space-y-2">
                       <label className="flex items-center space-x-2">
                         <input
diff --git a/src/components/icons/Icons.tsx b/src/components/icons/Icons.tsx
index a049707..eb17f6e 100644
--- a/src/components/icons/Icons.tsx
+++ b/src/components/icons/Icons.tsx
@@ -140,7 +140,7 @@ export function SettingsIcon(props: React.SVGProps<SVGSVGElement>) {
       className={props.className || "w-6 h-6"}
       {...props}
     >
-      <path fillRule="evenodd" clipRule="evenodd" d="M14.2788 2.15224C13.9085 2 13.439 2 12.5 2C11.561 2 11.0915 2 10.7212 2.15224C10.2274 2.35523 9.83509 2.74458 9.63056 3.23463C9.53719 3.45834 9.50065 3.7185 9.48635 4.09799C9.46534 4.65568 9.17716 5.17189 8.69017 5.45093C8.20318 5.72996 7.60864 5.71954 7.11149 5.45876C6.77318 5.2813 6.52789 5.18262 6.28599 5.15102C5.75609 5.08178 5.22018 5.22429 4.79616 5.5472C4.47814 5.78938 4.24339 6.1929 3.7739 6.99993C3.30441 7.80697 3.06967 8.21048 3.01735 8.60491C2.94758 9.1308 3.09118 9.66266 3.41655 10.0835C3.56506 10.2756 3.77377 10.437 4.0977 10.639C4.57391 10.936 4.88032 11.4419 4.88029 12C4.88026 12.5581 4.57386 13.0639 4.0977 13.3608C3.77372 13.5629 3.56497 13.7244 3.41645 13.9165C3.09108 14.3373 2.94749 14.8691 3.01725 15.395C3.06957 15.7894 3.30432 16.193 3.7738 17C4.24329 17.807 4.47804 18.2106 4.79606 18.4527C5.22008 18.7756 5.75599 18.9181 6.28589 18.8489C6.52778 18.8173 6.77305 18.7186 7.11133 18.5412C7.60852 18.2804 8.2031 18.27 8.69012 18.549C9.17714 18.8281 9.46533 19.3443 9.48635 19.9021C9.50065 20.2815 9.53719 20.5417 9.63056 20.7654C9.83509 21.2554 10.2274 21.6448 10.7212 21.8478C11.0915 22 11.561 22 12.5 22C13.439 22 13.9085 22 14.2788 21.8478C14.7726 21.6448 15.1649 21.2554 15.3694 20.7654C15.4628 20.5417 15.4994 20.2815 15.5137 19.902C15.5347 19.3443 15.8228 18.8281 16.3098 18.549C16.7968 18.2699 17.3914 18.2804 17.8886 18.5412C18.2269 18.7186 18.4721 18.8172 18.714 18.8488C19.2439 18.9181 19.7798 18.7756 20.2038 18.4527C20.5219 18.2105 20.7566 17.807 21.2261 16.9999C21.6956 16.1929 21.9303 15.7894 21.9827 15.395C22.0524 14.8691 21.9088 14.3372 21.5835 13.9164C21.4349 13.7243 21.2262 13.5628 20.9022 13.3608C20.4261 13.0639 20.1197 12.558 20.1197 11.9999C20.1197 11.4418 20.4261 10.9361 20.9022 10.6392C21.2263 10.4371 21.435 10.2757 21.5836 10.0835C21.9089 9.66273 22.0525 9.13087 21.9828 8.60497C21.9304 8.21055 21.6957 7.80703 21.2262 7C20.7567 6.19297 20.522 5.78945 20.2039 5.54727C19.7799 5.22436 19.244 5.08185 18.7141 5.15109C18.4722 5.18269 18.2269 5.28136 17.8887 5.4588C17.3915 5.71959 16.7969 5.73002 16.3099 5.45096C15.8229 5.17191 15.5347 4.65566 15.5136 4.09794C15.4993 3.71848 15.4628 3.45833 15.3694 3.23463C15.1649 2.74458 14.7726 2.35523 14.2788 2.15224ZM12.5 15C14.1695 15 15.5228 13.6569 15.5228 12C15.5228 10.3431 14.1695 9 12.5 9C10.8305 9 9.47716 10.3431 9.47716 12C9.47716 13.6569 10.8305 15 12.5 15Z"/>
+      <path fillRule="evenodd" clipRule="evenodd" d="M14.2788 2.15224C13.9085 2 13.439 2 12.5 2C11.561 2 11.0915 2 10.7212 2.15224C10.2274 2.35523 9.83509 2.74458 9.63056 3.23463C9.53719 3.45834 9.50065 3.7185 9.48635 4.09799C9.46534 4.65568 9.17716 5.17189 8.69017 5.45093C8.20318 5.72996 7.60864 5.71954 7.11149 5.45876C6.77318 5.2813 6.52789 5.18262 6.28599 5.15102C5.75609 5.08178 5.22018 5.22429 4.79616 5.5472C4.47814 5.78938 4.24339 6.1929 3.7739 6.99993C3.30441 7.80697 3.06967 8.21048 3.01735 8.60491C2.94758 9.1308 3.09118 9.66266 3.41655 10.0835C3.56506 10.2756 3.77377 10.437 4.0977 10.639C4.57391 10.936 4.88032 11.4419 4.88029 12C4.88026 12.5581 4.57386 13.0639 4.0977 13.3608C3.77372 13.5629 3.56497 13.7244 3.41645 13.9165C3.09108 14.3373 2.94749 14.8691 3.01725 15.395C3.06957 15.7894 3.30432 16.193 3.7738 17C4.24329 17.807 4.47804 18.2106 4.79606 18.4527C5.22008 18.7756 5.75599 18.9181 6.28589 18.8489C6.52778 18.8173 6.77305 18.7186 7.11133 18.5412C7.60852 18.2804 8.2031 18.27 8.69012 18.549C9.17714 18.8281 9.46533 19.3443 9.48635 19.9021C9.50065 20.2815 9.53719 20.5417 9.63056 20.7654C9.83509 21.2554 10.2274 21.6448 10.7212 21.8478C11.0915 22 11.561 22 12.5 22C13.439 22 13.9085 22 14.2788 21.8478C14.7726 21.6448 15.1649 21.2554 15.3694 20.7654C15.4628 20.5417 15.4994 20.2815 15.5137 19.902C15.5347 19.3443 15.8228 18.8281 16.3098 18.549C16.7968 18.2699 17.3914 18.2804 17.8886 18.5412C18.2269 18.7186 18.4721 18.8172 18.714 18.8488C19.2439 18.9181 19.7798 18.7756 20.2038 18.4527C20.5219 18.2105 20.7566 17.807 21.2261 16.9999C21.6956 16.1929 21.9303 15.7894 21.9827 15.395C22.0524 14.8691 21.9088 14.3372 21.5835 13.9164C21.4349 13.7243 21.2262 13.5628 20.9022 13.3608C20.4261 13.0639 20.1197 12.558 20.1197 11.9999C20.1197 11.4418 20.4261 10.9361 20.9022 10.6392C21.2263 10.4371 21.435 10.2757 21.5836 10.0835C21.9089 9.66273 22.0525 9.13087 21.9828 8.60497C21.9304 8.21055 21.6957 7.80703 21.2262 7C20.7567 6.19297 20.522 5.78945 20.2039 5.54727C19.7799 5.22436 19.244 5.08185 18.7141 5.15109C18.4722 5.18269 18.2269 5.28136 17.8887 5.4588C17.3915 5.71959 16.7969 5.73002 16.3099 5.45096C15.8229 5.17191 15.5347 4.65566 15.5136 4.09794C15.4993 3.71848 15.4628 3.45833 15.3694 3.23463C15.1649 2.74458 14.7726 2.35523 14.2788 2.15224ZM12.5 15C14.1695 15 15.5228 13.6569 15.5228 12C15.5228 10.3431 14.1695 9 12.5 9C10.8305 9 9.47716 10.3431 9.47716 12C9.47716 13.6569 10.8305 15 12.5 15Z" />
     </svg>
   );
 }
@@ -178,7 +178,7 @@ export function UploadIcon(props: React.SVGProps<SVGSVGElement>) {
       {...props}
     >
       <path d="M12.5535 16.5061C12.4114 16.6615 12.2106 16.75 12 16.75C11.7894 16.75 11.5886 16.6615 11.4465 16.5061L7.44648 12.1311C7.16698 11.8254 7.18822 11.351 7.49392 11.0715C7.79963 10.792 8.27402 10.8132 8.55352 11.1189L11.25 14.0682V3C11.25 2.58579 11.5858 2.25 12 2.25C12.4142 2.25 12.75 2.58579 12.75 3V14.0682L15.4465 11.1189C15.726 10.8132 16.2004 10.792 16.5061 11.0715C16.8118 11.351 16.833 11.8254 16.5535 12.1311L12.5535 16.5061Z" />
-      <path d="M3.75 15C3.75 14.5858 3.41422 14.25 3 14.25C2.58579 14.25 2.25 14.5858 2.25 15V15.0549C2.24998 16.4225 2.24996 17.5248 2.36652 18.3918C2.48754 19.2919 2.74643 20.0497 3.34835 20.6516C3.95027 21.2536 4.70814 21.5125 5.60825 21.6335C6.47522 21.75 7.57754 21.75 8.94513 21.75H15.0549C16.4225 21.75 17.5248 21.75 18.3918 21.6335C19.2919 21.5125 20.0497 21.2536 20.6517 20.6516C21.2536 20.0497 21.5125 19.2919 21.6335 18.3918C21.75 17.5248 21.75 16.4225 21.75 15.0549V15C21.75 14.5858 21.4142 14.25 21 14.25C20.5858 14.25 20.25 14.5858 20.25 15C20.25 16.4354 20.2484 17.4365 20.1469 18.1919C20.0482 18.9257 19.8678 19.3142 19.591 19.591C19.3142 19.8678 18.9257 20.0482 18.1919 20.1469C17.4365 20.2484 16.4354 20.25 15 20.25H9C7.56459 20.25 6.56347 20.2484 5.80812 20.1469C5.07435 20.0482 4.68577 19.8678 4.40901 19.591C4.13225 19.3142 3.9518 18.9257 3.85315 18.1919C3.75159 17.4365 3.75 16.4354 3.75 15Z"/>
+      <path d="M3.75 15C3.75 14.5858 3.41422 14.25 3 14.25C2.58579 14.25 2.25 14.5858 2.25 15V15.0549C2.24998 16.4225 2.24996 17.5248 2.36652 18.3918C2.48754 19.2919 2.74643 20.0497 3.34835 20.6516C3.95027 21.2536 4.70814 21.5125 5.60825 21.6335C6.47522 21.75 7.57754 21.75 8.94513 21.75H15.0549C16.4225 21.75 17.5248 21.75 18.3918 21.6335C19.2919 21.5125 20.0497 21.2536 20.6517 20.6516C21.2536 20.0497 21.5125 19.2919 21.6335 18.3918C21.75 17.5248 21.75 16.4225 21.75 15.0549V15C21.75 14.5858 21.4142 14.25 21 14.25C20.5858 14.25 20.25 14.5858 20.25 15C20.25 16.4354 20.2484 17.4365 20.1469 18.1919C20.0482 18.9257 19.8678 19.3142 19.591 19.591C19.3142 19.8678 18.9257 20.0482 18.1919 20.1469C17.4365 20.2484 16.4354 20.25 15 20.25H9C7.56459 20.25 6.56347 20.2484 5.80812 20.1469C5.07435 20.0482 4.68577 19.8678 4.40901 19.591C4.13225 19.3142 3.9518 18.9257 3.85315 18.1919C3.75159 17.4365 3.75 16.4354 3.75 15Z" />
     </svg>
   );
 }
@@ -210,7 +210,40 @@ export function GithubIcon(props: React.SVGProps<SVGSVGElement>) {
       height={props.height || "1.5em"}
       {...props}
     >
-      <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
+      <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z" />
+    </svg>
+  );
+}
+
+export function PDFIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      className={`w-6 h-6 sm:w-8 sm:h-8 text-red-500 ${props.className || ''}`}
+      fill="currentColor"
+      stroke="currentColor"
+      viewBox="-4 0 40 40"
+      strokeWidth='0.25'
+      {...props}
+    >
+      <path d="M25.6686 26.0962C25.1812 26.2401 24.4656 26.2563 23.6984 26.145C22.875 26.0256 22.0351 25.7739 21.2096 25.403C22.6817 25.1888 23.8237 25.2548 24.8005 25.6009C25.0319 25.6829 25.412 25.9021 25.6686 26.0962ZM17.4552 24.7459C17.3953 24.7622 17.3363 24.7776 17.2776 24.7939C16.8815 24.9017 16.4961 25.0069 16.1247 25.1005L15.6239 25.2275C14.6165 25.4824 13.5865 25.7428 12.5692 26.0529C12.9558 25.1206 13.315 24.178 13.6667 23.2564C13.9271 22.5742 14.193 21.8773 14.468 21.1894C14.6075 21.4198 14.7531 21.6503 14.9046 21.8814C15.5948 22.9326 16.4624 23.9045 17.4552 24.7459ZM14.8927 14.2326C14.958 15.383 14.7098 16.4897 14.3457 17.5514C13.8972 16.2386 13.6882 14.7889 14.2489 13.6185C14.3927 13.3185 14.5105 13.1581 14.5869 13.0744C14.7049 13.2566 14.8601 13.6642 14.8927 14.2326ZM9.63347 28.8054C9.38148 29.2562 9.12426 29.6782 8.86063 30.0767C8.22442 31.0355 7.18393 32.0621 6.64941 32.0621C6.59681 32.0621 6.53316 32.0536 6.44015 31.9554C6.38028 31.8926 6.37069 31.8476 6.37359 31.7862C6.39161 31.4337 6.85867 30.8059 7.53527 30.2238C8.14939 29.6957 8.84352 29.2262 9.63347 28.8054ZM27.3706 26.1461C27.2889 24.9719 25.3123 24.2186 25.2928 24.2116C24.5287 23.9407 23.6986 23.8091 22.7552 23.8091C21.7453 23.8091 20.6565 23.9552 19.2582 24.2819C18.014 23.3999 16.9392 22.2957 16.1362 21.0733C15.7816 20.5332 15.4628 19.9941 15.1849 19.4675C15.8633 17.8454 16.4742 16.1013 16.3632 14.1479C16.2737 12.5816 15.5674 11.5295 14.6069 11.5295C13.948 11.5295 13.3807 12.0175 12.9194 12.9813C12.0965 14.6987 12.3128 16.8962 13.562 19.5184C13.1121 20.5751 12.6941 21.6706 12.2895 22.7311C11.7861 24.0498 11.2674 25.4103 10.6828 26.7045C9.04334 27.3532 7.69648 28.1399 6.57402 29.1057C5.8387 29.7373 4.95223 30.7028 4.90163 31.7107C4.87693 32.1854 5.03969 32.6207 5.37044 32.9695C5.72183 33.3398 6.16329 33.5348 6.6487 33.5354C8.25189 33.5354 9.79489 31.3327 10.0876 30.8909C10.6767 30.0029 11.2281 29.0124 11.7684 27.8699C13.1292 27.3781 14.5794 27.011 15.985 26.6562L16.4884 26.5283C16.8668 26.4321 17.2601 26.3257 17.6635 26.2153C18.0904 26.0999 18.5296 25.9802 18.976 25.8665C20.4193 26.7844 21.9714 27.3831 23.4851 27.6028C24.7601 27.7883 25.8924 27.6807 26.6589 27.2811C27.3486 26.9219 27.3866 26.3676 27.3706 26.1461ZM30.4755 36.2428C30.4755 38.3932 28.5802 38.5258 28.1978 38.5301H3.74486C1.60224 38.5301 1.47322 36.6218 1.46913 36.2428L1.46884 3.75642C1.46884 1.6039 3.36763 1.4734 3.74457 1.46908H20.263L20.2718 1.4778V7.92396C20.2718 9.21763 21.0539 11.6669 24.0158 11.6669H30.4203L30.4753 11.7218L30.4755 36.2428ZM28.9572 10.1976H24.0169C21.8749 10.1976 21.7453 8.29969 21.7424 7.92417V2.95307L28.9572 10.1976ZM31.9447 36.2428V11.1157L21.7424 0.871022V0.823357H21.6936L20.8742 0H3.74491C2.44954 0 0 0.785336 0 3.75711V36.2435C0 37.5427 0.782956 40 3.74491 40H28.2001C29.4952 39.9997 31.9447 39.2143 31.9447 36.2428Z"/>
+    </svg>
+  );
+}
+
+export function EPUBIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      className={`w-6 h-6 sm:w-8 sm:h-8 text-blue-500 ${props.className || ''}`}
+      fill="none"
+      stroke="currentColor"
+      viewBox="0 0 24 24"
+      {...props}
+    >
+      <path d="M4 8C4 5.17157 4 3.75736 4.87868 2.87868C5.75736 2 7.17157 2 10 2H14C16.8284 2 18.2426 2 19.1213 2.87868C20 3.75736 20 5.17157 20 8V16C20 18.8284 20 20.2426 19.1213 21.1213C18.2426 22 16.8284 22 14 22H10C7.17157 22 5.75736 22 4.87868 21.1213C4 20.2426 4 18.8284 4 16V8Z" strokeWidth="1.5" />
+      <path d="M19.8978 16H7.89778C6.96781 16 6.50282 16 6.12132 16.1022C5.08604 16.3796 4.2774 17.1883 4 18.2235" strokeWidth="1.5" />
+      <path d="M8 7H16" strokeWidth="1" strokeLinecap="round" />
+      <path d="M8 10.5H13" strokeWidth="1" strokeLinecap="round" />
+      <path d="M19.5 19H8" strokeWidth="1" strokeLinecap="round" />
     </svg>
   );
 }
diff --git a/src/contexts/TTSContext.tsx b/src/contexts/TTSContext.tsx
index 2b1b3e6..6eadc35 100644
--- a/src/contexts/TTSContext.tsx
+++ b/src/contexts/TTSContext.tsx
@@ -124,6 +124,9 @@ export function TTSProvider({ children }: { children: React.ReactNode }) {
   const [currDocPages, setCurrDocPages] = useState<number>();
   const [nextPageLoading, setNextPageLoading] = useState(false);
 
+  // Add this state to track if we're in EPUB mode
+  const [isEPUB, setIsEPUB] = useState(false);
+
   console.log('page:', currDocPage, 'pages:', currDocPages);
 
   /**
@@ -139,37 +142,55 @@ export function TTSProvider({ children }: { children: React.ReactNode }) {
 
   /**
    * Sets the current text and splits it into sentences
-   * 
-   * @param {string} text - The text to be processed
-   * @returns {void}
    */
   const setText = useCallback((text: string) => {
     console.log('Setting page text:', text);
     const newSentences = splitIntoSentences(text);
 
-    // If skipBlank is enabled and there's no text and we are playing audio, automatically move to next page
-    if (isPlaying && skipBlank && newSentences.length === 0 && currDocPage < currDocPages!) {
-      incrementPage();
-
-      toast.success(`Skipping blank page ${currDocPage}`, {
-        id: `page-${currDocPage}`,
-        iconTheme: {
-          primary: 'var(--accent)',
-          secondary: 'var(--background)',
-        },
-        style: {
-          background: 'var(--background)',
-          color: 'var(--accent)',
-        },
-        duration: 1000,
-        position: 'top-center',
-      });
-      return;
+    // If skipBlank is enabled and there's no text
+    if (isPlaying && skipBlank && newSentences.length === 0) {
+      if (isEPUB && locationChangeHandlerRef.current) {
+        // For EPUB, use the location handler to move to next section
+        locationChangeHandlerRef.current('next');
+        
+        toast.success('Skipping blank section', {
+          id: `epub-section-skip`,
+          iconTheme: {
+            primary: 'var(--accent)',
+            secondary: 'var(--background)',
+          },
+          style: {
+            background: 'var(--background)',
+            color: 'var(--accent)',
+          },
+          duration: 1000,
+          position: 'top-center',
+        });
+        return;
+      } else if (currDocPage < currDocPages!) {
+        // For PDF, increment the page
+        incrementPage();
+        
+        toast.success(`Skipping blank page ${currDocPage}`, {
+          id: `page-${currDocPage}`,
+          iconTheme: {
+            primary: 'var(--accent)',
+            secondary: 'var(--background)',
+          },
+          style: {
+            background: 'var(--background)',
+            color: 'var(--accent)',
+          },
+          duration: 1000,
+          position: 'top-center',
+        });
+        return;
+      }
     }
     
     setSentences(newSentences);
     setNextPageLoading(false);
-  }, [isPlaying, skipBlank, currDocPage, currDocPages, incrementPage]);
+  }, [isPlaying, skipBlank, currDocPage, currDocPages, incrementPage, isEPUB]);
 
   /**
    * Stops the current audio playback and clears the active Howl instance
@@ -220,22 +241,35 @@ export function TTSProvider({ children }: { children: React.ReactNode }) {
   const [currChapter, setCurrChapter] = useState<string | number>('');
   const setEPUBPageInChapter = useCallback((page: string | number, total: number, chapter: string | number) => {
     const alreadyPlaying = isPlaying;
-    if (chapter !== currChapter) {
+    const isNewChapter = chapter !== currChapter;
+
+    // Mark that we're in EPUB mode
+    setIsEPUB(true);
+
+    // Update chapter info
+    if (isNewChapter) {
       setCurrDocPages(total);
       setCurrChapter(chapter);
+      console.log('Changed to chapter:', chapter);
     }
 
+    // Reset state for new content
     abortAudio();
     setIsPlaying(false);
     setNextPageLoading(true);
     setCurrentIndex(0);
     setSentences([]);
 
+    // Update current page
     setCurrDocPage(Number(page));
 
-    setIsPlaying(alreadyPlaying);
+    // Resume playback if it was playing before
+    // Only auto-resume if this was triggered by automatic navigation (not manual page turns)
+    if (alreadyPlaying) {
+      setIsPlaying(true);
+    }
 
-  }, [abortAudio, currChapter]);
+  }, [abortAudio, currChapter, isPlaying]);
 
   /**
    * Moves to the next or previous sentence
@@ -253,40 +287,34 @@ export function TTSProvider({ children }: { children: React.ReactNode }) {
       return;
     }
     
-    // Handle next page
-    if (nextIndex >= sentences.length && currDocPage < currDocPages!) {
-      console.log('Advancing to next page:', currDocPage + 1);
+    // For EPUB documents, always try to advance to next/prev section
+    if (isEPUB && locationChangeHandlerRef.current) {
+      console.log('EPUB: Advancing to next/prev section');
       setCurrentIndex(0);
-      
-      // Trigger page turn in React Reader
-      if (locationChangeHandlerRef.current) {
-        locationChangeHandlerRef.current('next');
-      } else {
-        incrementPage();
-      }
+      setSentences([]);
+      locationChangeHandlerRef.current(nextIndex >= sentences.length ? 'next' : 'prev');
       return;
     }
     
-    // Handle previous page
-    if (nextIndex < 0 && currDocPage > 1) {
-      console.log('Advancing to previous page:', currDocPage - 1);
-      setCurrentIndex(0);
+    // For PDFs and other documents, check page bounds
+    if (!isEPUB) {
+      // Handle next/previous page transitions
+      if ((nextIndex >= sentences.length && currDocPage < currDocPages!) || 
+          (nextIndex < 0 && currDocPage > 1)) {
+        console.log('PDF: Advancing to next/prev page');
+        setCurrentIndex(0);
+        setSentences([]);
+        incrementPage(nextIndex >= sentences.length ? 1 : -1);
+        return;
+      }
       
-      // Trigger page turn in React Reader
-      if (locationChangeHandlerRef.current) {
-        locationChangeHandlerRef.current('prev');
-      } else {
-        incrementPage(-1);
+      // Handle end of document (PDF only)
+      if (nextIndex >= sentences.length && currDocPage >= currDocPages!) {
+        console.log('PDF: Reached end of document');
+        setIsPlaying(false);
       }
-      return;
-    }
-    
-    // Handle end of document
-    if (nextIndex >= sentences.length && currDocPage >= currDocPages!) {
-      console.log('Reached end of document');
-      setIsPlaying(false);
     }
-  }, [currentIndex, incrementPage, sentences, currDocPage, currDocPages]);
+  }, [currentIndex, incrementPage, sentences, currDocPage, currDocPages, isEPUB]);
 
   /**
    * Moves forward one sentence in the text
@@ -525,6 +553,7 @@ export function TTSProvider({ children }: { children: React.ReactNode }) {
     setCurrDocPages(undefined);
     setNextPageLoading(false);
     setIsProcessing(false);
+    setIsEPUB(false);
   }, [abortAudio]);
 
   /**
diff --git a/src/utils/nlp.ts b/src/utils/nlp.ts
index d702be9..3eb435f 100644
--- a/src/utils/nlp.ts
+++ b/src/utils/nlp.ts
@@ -15,9 +15,31 @@ export const preprocessSentenceForAudio = (text: string): string => {
     .trim();
 };
 
+const isShortSentence = (sentence: string): boolean => {
+  const words = sentence.trim().split(/\s+/);
+  return words.length <= 5;
+};
+
 export const splitIntoSentences = (text: string): string[] => {
   // Preprocess the text before splitting into sentences
   const cleanedText = preprocessSentenceForAudio(text);
   const doc = nlp(cleanedText);
-  return doc.sentences().out('array') as string[];
+  const rawSentences = doc.sentences().out('array') as string[];
+  
+  // Combine short sentences with previous ones
+  const processedSentences: string[] = [];
+  
+  for (let i = 0; i < rawSentences.length; i++) {
+    const currentSentence = rawSentences[i].trim();
+    
+    if (isShortSentence(currentSentence) && processedSentences.length > 0) {
+      // Combine with previous sentence
+      const lastIndex = processedSentences.length - 1;
+      processedSentences[lastIndex] = `${processedSentences[lastIndex]} ${currentSentence}`;
+    } else {
+      processedSentences.push(currentSentence);
+    }
+  }
+  
+  return processedSentences;
 };
\ No newline at end of file