diff --git a/assets/index.php b/assets/index.php
index 7e6098d..d4a08aa 100644
--- a/assets/index.php
+++ b/assets/index.php
@@ -42,7 +42,7 @@
     <?php $lib->printNsfwCheck(); ?>
 
     <div class="pager">
-        <a class="prev"><</a><?php $lib->printPagerNumbers(); ?><a class="next">></a>
+        <?php $lib->printPagerNumbers(); ?>
     </div>
 
     <footer>
diff --git a/avatars/index.php b/avatars/index.php
index 789d403..73fae34 100644
--- a/avatars/index.php
+++ b/avatars/index.php
@@ -42,7 +42,7 @@
     <?php $lib->printNsfwCheck(); ?>
 
     <div class="pager">
-        <a class="prev"><</a><?php $lib->printPagerNumbers(); ?><a class="next">></a>
+        <?php $lib->printPagerNumbers(); ?>
     </div>
 
     <footer>
diff --git a/bases/index.php b/bases/index.php
index fb63b2a..c2e46fb 100644
--- a/bases/index.php
+++ b/bases/index.php
@@ -42,7 +42,7 @@
     <?php $lib->printNsfwCheck(); ?>
 
     <div class="pager">
-        <a class="prev"><</a><?php $lib->printPagerNumbers(); ?><a class="next">></a>
+        <?php $lib->printPagerNumbers(); ?>
     </div>
 
     <footer>
diff --git a/data/script/furatalog.lib.php b/data/script/furatalog.lib.php
index b859062..9f4f191 100644
--- a/data/script/furatalog.lib.php
+++ b/data/script/furatalog.lib.php
@@ -325,6 +325,10 @@ class furatalogLib {
         $currentpage = (isset($_GET["p"]) ? $_GET["p"] : 1);
         $currentMaxPages = $this->maxpages;
 
+        if (!($currentpage <= 1)) {
+            echo "<a class=\"prev\" href=\"?p=" . ($currentpage-1) . "\"><</a>";
+        }
+
         for ($i = $currentpage-1; $i > 0; $i--) {
             if (($i+1) == 1) return;
             echo "<a class=\"number\" href=\"?p=" . $i . "\">" . $i . "</a>";
@@ -336,5 +340,9 @@ class furatalogLib {
             if ($currentMaxPages == $currentpage) return;
             echo "<a class=\"number\" href=\"?p=" . $i . "\">" . $i . "</a>";
         }
+
+        if (!($currentpage >= $currentMaxPages)) {
+            echo "<a class=\"prev\" href=\"?p=" . ($currentpage+1) . "\"><</a>";
+        }
     }
 }
\ No newline at end of file
diff --git a/index.php b/index.php
index c0d6f19..7ec9e04 100644
--- a/index.php
+++ b/index.php
@@ -43,7 +43,7 @@
             echo "</div>";
 
             echo "<div class=\"pager\">";
-            echo "<a class=\"prev\"><</a>" . $lib->printPagerNumbers() . "<a class=\"next\">></a>";
+            echo $lib->printPagerNumbers();
             echo "</div>";
 
             $lib->printScriptSec();