diff --git a/weblate/templates/paginator.html b/weblate/templates/paginator.html
index f63da7bee353..de37d6ccd7c6 100644
--- a/weblate/templates/paginator.html
+++ b/weblate/templates/paginator.html
@@ -1,95 +1,29 @@
-{% load i18n %}
-{% load icons %}
+{% load querystring %}
 
-{% if page_obj.paginator.num_pages > 1 %}
-  <ul class="pagination">
-    <li {% if page_obj.number == 1 %}class="disabled"{% endif %}>
-      <a href="?page=1&amp;limit={{ page_obj.paginator.per_page }}{% if page_obj.paginator.sort_by %}&amp;sort_by={{ page_obj.paginator.sort_by }}{% endif %}{% if query_string %}&amp;{{ query_string }}{% endif %}{% if anchor %}#{{ anchor }}{% endif %}"
-         class="green">
-        {% if LANGUAGE_BIDI %}
-          {% icon "page-last.svg" %}
-        {% else %}
-          {% icon "page-first.svg" %}
-        {% endif %}
-      </a>
-    </li>
-    <li {% if not page_obj.has_previous %}class="disabled"{% endif %}>
-      <a
-        {% if page_obj.has_previous %}
-          rel="prev"
-          {# djlint:off #}
-          href="?page={{ page_obj.previous_page_number }}&amp;limit={{ page_obj.paginator.per_page }}{% if page_obj.paginator.sort_by %}&amp;sort_by={{ page_obj.paginator.sort_by }}{% endif %}{% if query_string %}&amp;{{ query_string }}{% endif %}{% if anchor %}#{{ anchor }}{% endif %}"
-          {# djlint:on #}
-        {% endif %}
-        class="green">
-        {% if LANGUAGE_BIDI %}
-          {% icon "page-next.svg" %}
-        {% else %}
-          {% icon "page-previous.svg" %}
-        {% endif %}
-      </a>
-    </li>
-    <li>
-      <a class="position-input" title="{% trans "Click to edit position" %}">
-        {% blocktrans with page_obj.number as position and page_obj.paginator.num_pages as total %}{{ position }} / {{ total }}{% endblocktrans %}
-      </a>
-      <a class="position-input-editable" title="{% trans "Go to position" %}">
-        {% if not paginator_form %}<form method="get">{% endif %}
-          {% for key, value in search_items %}
-            <input {% if paginator_form %}form="{{ paginator_form }}"{% endif %}
-                   type="hidden"
-                   name="{{ key }}"
-                   value="{{ value }}"
-                   aria-label="{{ value }}" />
-          {% endfor %}
-          <input {% if paginator_form %}form="{{ paginator_form }}"{% endif %}
-                 type="hidden"
-                 name="limit"
-                 value="{{ page_obj.paginator.per_page }}"
-                 aria-label="{{ page_obj.paginator.per_page }}" />
-          <div class="input-group">
-            <input {% if paginator_form %}form="{{ paginator_form }}"{% endif %}
-                   type="number"
-                   min="1"
-                   max="{{ page_obj.paginator.num_pages }}"
-                   name="page"
-                   class="form-control"
-                   value="{{ page_obj.number }}"
-                   aria-label="{% trans "Jump to" %}"
-                   id="position-input-editable-input">
-            <span class="input-group-addon">
-              {% comment %}Translators: This is partial position indicator shown when editing position{% endcomment %}
-              {% blocktrans with page_obj.paginator.num_pages as total %}/ {{ total }}{% endblocktrans %}
-            </span>
-          </div>
-          {% if not paginator_form %}</form>{% endif %}
-      </a>
-    </li>
-    <li {% if not page_obj.has_next %}class="disabled"{% endif %}>
-      <a
-        {% if page_obj.has_next %}
-          rel="next"
-          {# djlint:off #}
-          href="?page={{ page_obj.next_page_number }}&amp;limit={{ page_obj.paginator.per_page }}{% if page_obj.paginator.sort_by %}&amp;sort_by={{ page_obj.paginator.sort_by }}{% endif %}{% if query_string %}&amp;{{ query_string }}{% endif %}{% if anchor %}#{{ anchor }}{% endif %}"
-          {# djlint:on #}
-        {% endif %}
-        class="green">
-        {% if not LANGUAGE_BIDI %}
-          {% icon "page-next.svg" %}
-        {% else %}
-          {% icon "page-previous.svg" %}
-        {% endif %}
-      </a>
-    </li>
-    <li {% if page_obj.paginator.num_pages == page_obj.number %}class="disabled"{% endif %}>
-      <a href="?page={{ page_obj.paginator.num_pages }}&amp;limit={{ page_obj.paginator.per_page }}{% if page_obj.paginator.sort_by %}&amp;sort_by={{ page_obj.paginator.sort_by }}{% endif %}{% if query_string %}&amp;{{ query_string }}{% endif %}{% if anchor %}#{{ anchor }}{% endif %}"
-         class="green">
-        {% if not LANGUAGE_BIDI %}
-          {% icon "page-last.svg" %}
-        {% else %}
-          {% icon "page-first.svg" %}
-        {% endif %}
-      </a>
-    </li>
+<nav class="pagination">
+  <ul>
+    {% if page_obj.has_previous %}
+      <li>
+        <a href="?{% querystring page=page_obj.previous_page_number %}">&laquo; Previous</a>
+      </li>
+    {% endif %}
+
+    {% for page_number in page_obj.paginator.page_range %}
+      {% if page_number == page_obj.number %}
+        <li class="active">
+          <span>{{ page_number }}</span>
+        </li>
+      {% else %}
+        <li>
+          <a href="?{% querystring page=page_number %}">{{ page_number }}</a>
+        </li>
+      {% endif %}
+    {% endfor %}
+
+    {% if page_obj.has_next %}
+      <li>
+        <a href="?{% querystring page=page_obj.next_page_number %}">Next &raquo;</a>
+      </li>
+    {% endif %}
   </ul>
-{% endif %}
+</nav>
diff --git a/weblate/templates/search.html b/weblate/templates/search.html
index ed61a1b94b3d..ebb3215138c8 100644
--- a/weblate/templates/search.html
+++ b/weblate/templates/search.html
@@ -17,7 +17,6 @@
   {% endif %}
 {% endblock %}
 
-
 {% block content %}
 
   {% if show_results %}
diff --git a/weblate/trans/forms.py b/weblate/trans/forms.py
index a27cc84139b2..a310fb9f2966 100644
--- a/weblate/trans/forms.py
+++ b/weblate/trans/forms.py
@@ -804,50 +804,50 @@ def clean_offset(self):
             self.cleaned_data["offset"] = 1
         return self.cleaned_data["offset"]
 
-    def items(self):
-        items = []
-        # Skip checksum and offset as these change
-        ignored = {"offset", "checksum"}
-        for param in sorted(self.cleaned_data):
-            value = self.cleaned_data[param]
-            # We don't care about empty values or ignored ones
-            if value is None or param in ignored:
-                continue
-            if isinstance(value, bool):
-                # Only store true values
-                if value:
-                    items.append((param, "1"))
-            elif isinstance(value, int):
-                # Avoid storing 0 values
-                if value > 0:
-                    items.append((param, str(value)))
-            elif isinstance(value, datetime):
-                # Convert date to string
-                items.append((param, value.date().isoformat()))
-            elif isinstance(value, list):
-                items.extend((param, val) for val in value)
-            elif isinstance(value, User):
-                items.append((param, value.username))
-            elif value:
-                # It should be a string here
-                items.append((param, value))
-        return items
-
-    def urlencode(self):
-        return urlencode(self.items())
-
-    def reset_offset(self):
-        """
-        Reset form offset.
-
-        This is needed to avoid issues when using the form as the default for
-        any new search.
-        """
-        data = copy.copy(self.data)  # pylint: disable=access-member-before-definition
-        data["offset"] = "1"
-        data["checksum"] = ""
-        self.data = data
-        return self
+    # def items(self):
+    #     items = []
+    #     # Skip checksum and offset as these change
+    #     ignored = {"offset", "checksum"}
+    #     for param in sorted(self.cleaned_data):
+    #         value = self.cleaned_data[param]
+    #         # We don't care about empty values or ignored ones
+    #         if value is None or param in ignored:
+    #             continue
+    #         if isinstance(value, bool):
+    #             # Only store true values
+    #             if value:
+    #                 items.append((param, "1"))
+    #         elif isinstance(value, int):
+    #             # Avoid storing 0 values
+    #             if value > 0:
+    #                 items.append((param, str(value)))
+    #         elif isinstance(value, datetime):
+    #             # Convert date to string
+    #             items.append((param, value.date().isoformat()))
+    #         elif isinstance(value, list):
+    #             items.extend((param, val) for val in value)
+    #         elif isinstance(value, User):
+    #             items.append((param, value.username))
+    #         elif value:
+    #             # It should be a string here
+    #             items.append((param, value))
+    #     return items
+
+    # def urlencode(self):
+    #     return urlencode(self.items())
+
+    # def reset_offset(self):
+    #     """
+    #     Reset form offset.
+
+    #     This is needed to avoid issues when using the form as the default for
+    #     any new search.
+    #     """
+    #     data = copy.copy(self.data)  # pylint: disable=access-member-before-definition
+    #     data["offset"] = "1"
+    #     data["checksum"] = ""
+    #     self.data = data
+    #     return self
 
 
 class PositionSearchForm(SearchForm):