diff --git a/src/components/input/pagination.tsx b/src/components/input/pagination.tsx
index 49ac792..6845bd1 100644
--- a/src/components/input/pagination.tsx
+++ b/src/components/input/pagination.tsx
@@ -97,9 +97,12 @@ export default function Pagination({ mobilePagination, page, totalPages, loading
           <PaginationItemWrapper key="start" isLoadingPage={isLoading}>
             <PaginationLink onClick={() => handlePageChange(1)}>1</PaginationLink>
           </PaginationItemWrapper>
-          <PaginationItemWrapper key="ellipsis-start" isLoadingPage={isLoading}>
-            <PaginationEllipsis />
-          </PaginationItemWrapper>
+          {/* Only show ellipsis if more than 2 pages from the start */}
+          {startPage > 2 && (
+            <PaginationItemWrapper key="ellipsis-start" isLoadingPage={isLoading}>
+              <PaginationEllipsis />
+            </PaginationItemWrapper>
+          )}
         </>
       );
     }
@@ -129,7 +132,7 @@ export default function Pagination({ mobilePagination, page, totalPages, loading
         {renderPageNumbers()}
 
         {/* For desktop, show ellipsis and link to the last page */}
-        {!mobilePagination && currentPage < totalPages && (
+        {!mobilePagination && currentPage < totalPages && totalPages - currentPage > 2 && (
           <>
             <PaginationItemWrapper key="ellipsis-end" isLoadingPage={isLoading}>
               <PaginationEllipsis className="cursor-default" />
diff --git a/src/components/ui/pagination.tsx b/src/components/ui/pagination.tsx
index 8b7e7d0..805edb1 100644
--- a/src/components/ui/pagination.tsx
+++ b/src/components/ui/pagination.tsx
@@ -1,5 +1,5 @@
-import * as React from "react";
 import { ChevronLeftIcon, ChevronRightIcon, DotsHorizontalIcon } from "@radix-ui/react-icons";
+import * as React from "react";
 
 import { cn } from "@/common/utils";
 import { ButtonProps, buttonVariants } from "@/components/ui/button";
@@ -47,16 +47,14 @@ const PaginationLink = ({ className, isActive, size = "icon", ...props }: Pagina
 PaginationLink.displayName = "PaginationLink";
 
 const PaginationPrevious = ({ className, ...props }: React.ComponentProps<typeof PaginationLink>) => (
-  <PaginationLink aria-label="Go to previous page" size="default" className={cn("gap-1 pl-2.5", className)} {...props}>
+  <PaginationLink aria-label="Go to previous page" size="default" className={cn("gap-1", className)} {...props}>
     <ChevronLeftIcon className="h-4 w-4" />
-    <span>Previous</span>
   </PaginationLink>
 );
 PaginationPrevious.displayName = "PaginationPrevious";
 
 const PaginationNext = ({ className, ...props }: React.ComponentProps<typeof PaginationLink>) => (
-  <PaginationLink aria-label="Go to next page" size="default" className={cn("gap-1 pr-2.5", className)} {...props}>
-    <span>Next</span>
+  <PaginationLink aria-label="Go to next page" size="default" className={cn("gap-1", className)} {...props}>
     <ChevronRightIcon className="h-4 w-4" />
   </PaginationLink>
 );
@@ -73,9 +71,9 @@ PaginationEllipsis.displayName = "PaginationEllipsis";
 export {
   Pagination,
   PaginationContent,
-  PaginationLink,
-  PaginationItem,
-  PaginationPrevious,
-  PaginationNext,
   PaginationEllipsis,
+  PaginationItem,
+  PaginationLink,
+  PaginationNext,
+  PaginationPrevious,
 };