diff --git a/components/common/Button/Button.module.scss b/components/common/Button/Button.module.scss
index 7e5c9b2..b473530 100644
--- a/components/common/Button/Button.module.scss
+++ b/components/common/Button/Button.module.scss
@@ -2,11 +2,10 @@
   appearance: none;
   padding: 0.5rem 1.5rem;
   border-radius: 4px;
-  cursor: pointer;
   transition: background linear 0.33s;
 
-  &[disabled] {
-    cursor: default;
+  &:not([disabled]) {
+    cursor: pointer;
   }
 
   &.default {
diff --git a/components/common/Paginator/Paginator.module.scss b/components/common/Paginator/Paginator.module.scss
index b9f0438..15a33bf 100644
--- a/components/common/Paginator/Paginator.module.scss
+++ b/components/common/Paginator/Paginator.module.scss
@@ -10,13 +10,19 @@
     &.previous {
       border-top-left-radius: 8px;
       border-bottom-left-radius: 8px;
-      border-right: 0;
     }
 
     &.next {
       border-top-right-radius: 8px;
       border-bottom-right-radius: 8px;
-      border-left: 0;
+    }
+
+    &:not(:last-of-type) {
+      border-right: 0;
+    }
+
+    &:not([disabled]) {
+      cursor: pointer;
     }
   }
 }
diff --git a/components/common/Paginator/Paginator.tsx b/components/common/Paginator/Paginator.tsx
index b92bb62..cd15e5b 100644
--- a/components/common/Paginator/Paginator.tsx
+++ b/components/common/Paginator/Paginator.tsx
@@ -37,7 +37,7 @@ export const Paginator = ({
       <button
         className={[styles.pageButton, styles.next].join(' ')}
         onClick={() => setPage(pagination.page + 1)}
-        disabled={pagination.page + 1 >= pagination.pageCount}
+        disabled={pagination.page + 1 > pagination.pageCount}
       >
         Next
       </button>