diff --git a/cps/static/css/caliBlur.min.css b/cps/static/css/caliBlur.min.css
index 0714ea7c..07310a7b 100644
--- a/cps/static/css/caliBlur.min.css
+++ b/cps/static/css/caliBlur.min.css
@@ -1939,7 +1939,9 @@ body > div.container-fluid > div > div.col-sm-10 > div.discover > form > .btn.bt
     z-index: 99999
 }
 
-.pagination:after, body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.next, body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.previous {
+body > div.container-fluid > div > div.col-sm-10 > div.pagination .page-next > a,
+body > div.container-fluid > div > div.col-sm-10 > div.pagination .page-previous > a
+{
     top: 0;
     font-family: plex-icons-new;
     font-weight: 100;
@@ -1947,7 +1949,8 @@ body > div.container-fluid > div > div.col-sm-10 > div.discover > form > .btn.bt
     line-height: 60px;
     height: 60px;
     font-style: normal;
-    -moz-osx-font-smoothing: grayscale
+    -moz-osx-font-smoothing: grayscale;
+    overflow: hidden;
 }
 
 .pagination > a {
@@ -1967,68 +1970,46 @@ body > div.container-fluid > div > div.col-sm-10 > div.discover > form > .btn.bt
     color: #fff !important
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a, body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.previous + a, body > div.container-fluid > div > div.col-sm-10 > div.pagination > a[href*=page] {
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-item:not(.page-next):not(.page-previous)
+{
     display: none
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.next, body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.previous {
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-next > a,
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-previous > a {
     color: transparent;
+    background-color:transparent;
     margin-left: 0;
     width: 65px;
     padding: 0;
     font-size: 15px;
-    position: absolute;
-    display: block !important
+    display: block !important;
+    border: none;
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.next {
-    right: 0
-}
-
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.previous {
-    right: 65px
-}
-
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.next:before {
-    content: "\EA32";
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-next > a:before,
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-previous > a:before {
     visibility: visible;
     color: hsla(0, 0%, 100%, .35);
     height: 60px;
     line-height: 60px;
     border-left: 2px solid transparent;
     font-size: 20px;
-    padding: 20px 0 20px 20px;
-    margin-right: -27px
+    padding: 20px 25px;
+    margin-right: -27px;
 }
 
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.previous:before {
-    content: "\EA33";
-    visibility: visible;
-    color: hsla(0, 0%, 100%, .65);
-    height: 60px;
-    line-height: 60px;
-    font-size: 20px;
-    padding: 20px 25px
-}
-
-body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.next:hover:before, body > div.container-fluid > div > div.col-sm-10 > div.pagination > a.previous:hover:before {
-    color: #fff
-}
-
-.pagination > strong {
-    display: none
-}
-
-.pagination:after {
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-next > a:before {
     content: "\EA32";
-    position: relative;
-    right: 0;
-    display: inline-block;
-    color: hsla(0, 0%, 100%, .55);
-    font-size: 20px;
-    padding: 0 23px;
-    margin-left: 20px;
-    z-index: -1
+}
+
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-previous > a:before {
+    content: "\EA33";
+}
+
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-next > a:hover:before,
+body > div.container-fluid > div > div.col-sm-10 > div.pagination > .page-previous > a:hover:before {
+    color: #fff
 }
 
 .pagination > .ellipsis, .pagination > a:nth-last-of-type(2) {
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 55d6adbc..e4ae2e30 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -151,7 +151,7 @@
           {% if pagination and (pagination.has_next or pagination.has_prev) %}
             <div class="pagination">
               {% if pagination.has_prev %}
-              <li class="page-item page-next"><a class="page-link" aria-label="next page" href="{{ (pagination.page - 1)|url_for_other_page
+              <li class="page-item page-previous"><a class="page-link" aria-label="next page" href="{{ (pagination.page - 1)|url_for_other_page
                 }}">&laquo; {{_('Previous')}}</a></li>
               {% endif %}
             {% for page in pagination.iter_pages() %}