diff --git a/src/Bundle/ChillMainBundle/Resources/views/Pagination/long.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Pagination/long.html.twig
index 3166c187b..b0b787078 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Pagination/long.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Pagination/long.html.twig
@@ -1,27 +1,29 @@
 {%- macro page(text, page, class = "") -%}
-<span class="link {{ class }}"><a href="{{ page.generateUrl() }}">{{ text }}</a></span>
+<li class="page-item {{ class }}"><a class="page-link" href="{{ page.generateUrl() }}">{{ text }}</a></li>
 {%- endmacro -%}
 
 {% import _self as m %}
 
 {% if paginator|length > 1 %}
-<div class="pagination long">
-    {%- if paginator.hasPreviousPage() -%}
-        {{ m.page('Previous'|trans, paginator.getPreviousPage() ) }}
-    {%- endif -%}
-    {% for i in range(10, 1) %}
-        {%- if paginator.hasPage(current - i) -%}
-        {{ m.page(current - i, paginator.getPage(current - i) ) }}
+<nav aria-label="Page navigation">
+    <ul class="pagination justify-content-center long">
+        {%- if paginator.hasPreviousPage() -%}
+            {{ m.page('Previous'|trans, paginator.getPreviousPage() ) }}
         {%- endif -%}
-    {%- endfor -%}
-    <span class="current link">{{ current }}</span>
-    {% for i in range(1,10) %}
-        {%- if paginator.hasPage(current + i) -%}
-        {{ m.page(current + i, paginator.getPage(current + i) ) }}
+        {% for i in range(10, 1) %}
+            {%- if paginator.hasPage(current - i) -%}
+            {{ m.page(current - i, paginator.getPage(current - i) ) }}
+            {%- endif -%}
+        {%- endfor -%}
+        <li class="active page-item"><span class="page-link">{{ current }}</span></li>
+        {% for i in range(1,10) %}
+            {%- if paginator.hasPage(current + i) -%}
+            {{ m.page(current + i, paginator.getPage(current + i) ) }}
+            {%- endif -%}
+        {%- endfor -%}
+        {%- if paginator.hasNextPage() -%}
+            {{ m.page('Next'|trans, paginator.getNextPage() ) }}
         {%- endif -%}
-    {%- endfor -%}
-    {%- if paginator.hasNextPage() -%}
-        {{ m.page('Next'|trans, paginator.getNextPage() ) }}
-    {%- endif -%}
-</div>
+    </ul>
+</nav>
 {% endif %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Pagination/short.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Pagination/short.html.twig
new file mode 100644
index 000000000..27bc0c75d
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Pagination/short.html.twig
@@ -0,0 +1,25 @@
+{%- macro page(text, page, class = "") -%}
+    <li class="page-item {{ class }}"><a class="page-link" href="{{ page.generateUrl() }}">{{ text }}</a></li>
+{%- endmacro -%}
+
+{% import _self as m %}
+
+{% if paginator|length > 1 %}
+    <nav aria-label="Page navigation">
+        <ul class="pagination pagination-sm justify-content-center short">
+
+            {% for i in range(10, 1) %}
+                {%- if paginator.hasPage(current - i) -%}
+                    {{ m.page(current - i, paginator.getPage(current - i) ) }}
+                {%- endif -%}
+            {%- endfor -%}
+            <li class="active page-item"><span class="page-link">{{ current }}</span></li>
+            {% for i in range(1,10) %}
+                {%- if paginator.hasPage(current + i) -%}
+                    {{ m.page(current + i, paginator.getPage(current + i) ) }}
+                {%- endif -%}
+            {%- endfor -%}
+
+        </ul>
+    </nav>
+{% endif %}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
index aa3f61088..992aaecca 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/ThirdParty/index.html.twig
@@ -15,7 +15,6 @@
 
                 <nav class="filter-actions border border-secondary my-4 p-3">
                     filter nav
-                    {{ dump() }}
                 </nav>
 
         </div>