diff --git a/src/themes/clean/templates/elements/journal_footer.html b/src/themes/clean/templates/elements/journal_footer.html
index 8818bc98e3..deca7b1ba0 100644
--- a/src/themes/clean/templates/elements/journal_footer.html
+++ b/src/themes/clean/templates/elements/journal_footer.html
@@ -3,7 +3,7 @@
 <div class="row">
     <div class="col-md-6">
         <small><div class="text-left">
-            <ul class="list-inline"><p></p>
+            <ul class="list-inline">
             {% if request.journal.issn %}<li class="list-inline-item">ISSN: {{ request.journal.issn }}</li>{% endif %}
             {% if request.journal.print_issn %}<li class="list-inline-item"> {% trans 'Print ISSN' %}: {{ request.journal.print_issn }}</li>{% endif %}
             {% if journal_settings.general.publisher_name %}
diff --git a/src/themes/material/templates/core/news/index.html b/src/themes/material/templates/core/news/index.html
index acd1f5f635..dda11615f5 100644
--- a/src/themes/material/templates/core/news/index.html
+++ b/src/themes/material/templates/core/news/index.html
@@ -42,22 +42,22 @@ <h2>{% trans "This journal currently has no items to display." %}</h2>
         {% endfor %}
     </div>
     <div class="pagination-block">
-        <ul class="d-flex justify-content-center">
+        <ul class="list-inline d-flex justify-content-center">
             {% if news_items.has_previous %}
-                <a href="?page={{ news_items.previous_page_number }}" class="btn btn-outline-primary">
+                <li><a href="?page={{ news_items.previous_page_number }}" class="btn btn-outline-primary">
                     {% include "elements/icons/page_previous.html" %}
                 </a>
-                &nbsp;{% endif %}
+                &nbsp;</li>{% endif %}
             {{ news_items.page.page_range }}
             {% for page in news_items.paginator.page_range %}
-                <a href="?page={{ page }}"
+                <li><a href="?page={{ page }}"
                    class="btn {% if news_items.number == page %}btn-primary{% else %}btn-outline-primary{% endif %}">{{ page }}</a>
-                &nbsp;
+                &nbsp;</li>
             {% endfor %}
             {% if news_items.has_next %}
-                <a href="?page={{ news_items.next_page_number }}" class="btn btn-outline-primary">
+                <li><a href="?page={{ news_items.next_page_number }}" class="btn btn-outline-primary">
                     {% include "elements/icons/page_next.html" %}
-                </a>
+                </a></li>
             {% endif %}
         </ul>
     </div>
diff --git a/src/themes/material/templates/press/core/news/index.html b/src/themes/material/templates/press/core/news/index.html
index cc4af132d7..27ddaa2562 100644
--- a/src/themes/material/templates/press/core/news/index.html
+++ b/src/themes/material/templates/press/core/news/index.html
@@ -36,22 +36,21 @@ <h2>{% trans "This journal currently has no news items to display." %}</h2>
         {% endfor %}
     </div>
     <div class="pagination-block">
-        <ul class="d-flex justify-content-center">
+        <ul class="list-inline">
             {% if news_items.has_previous %}
-                <a href="?page={{ news_items.previous_page_number }}" class="btn btn-outline-primary">
+                <li><a href="?page={{ news_items.previous_page_number }}" class="btn btn-outline-primary">
                     {% include "elements/icons/page_previous.html" %}
-                </a>
-                &nbsp;{% endif %}
-            {{ news_items.page.page_range }}
+                </a></li>
+            {% endif %}
             {% for page in news_items.paginator.page_range %}
-                <a href="?page={{ page }}"
+                <li><a href="?page={{ page }}"
                    class="btn {% if news_items.number == page %}btn-primary{% else %}btn-outline-primary{% endif %}">{{ page }}</a>
-                &nbsp;
+                </li>
             {% endfor %}
             {% if news_items.has_next %}
-                <a href="?page={{ news_items.next_page_number }}" class="btn btn-outline-primary">
+                <li><a href="?page={{ news_items.next_page_number }}" class="btn btn-outline-primary">
                     {% include "elements/icons/page_next.html" %}
-                </a>
+                </a></li>
             {% endif %}
         </ul>
     </div>
diff --git a/src/themes/material/templates/repository/list.html b/src/themes/material/templates/repository/list.html
index dd4c7a17f4..90405267d0 100644
--- a/src/themes/material/templates/repository/list.html
+++ b/src/themes/material/templates/repository/list.html
@@ -24,8 +24,8 @@ <h1>{{ request.repository.object_name_plural }}</h1>
                         {% if preprints.has_previous %}
                             <li class="waves-effect"><a href="?page={{ preprints.previous_page_number }}">
                             {% include "elements/icons/page_previous.html" %}
-                        </a></li>
-                            &nbsp;{% endif %}
+                        </a>
+                            &nbsp;</li>{% endif %}
                         {{ preprints.page.page_range }}
                         {% for page in preprints|slice_pages:3 %}
                             <li class="waves-effect {% if preprints.number == page.number %}active{% endif %}"><a