diff --git a/Changelog.md b/Changelog.md
index 1cb82ccc2..771c9095a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -157,6 +157,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
 * Display correct error message for too long tags [#5783](https://github.com/diaspora/diaspora/pull/5783)
 * Fix displaying reshares in the stream on mobile [#5790](https://github.com/diaspora/diaspora/pull/5790)
 * Remove bottom margin from lists that are the last element of a post. [#5721](https://github.com/diaspora/diaspora/pull/5721)
+* Fix pagination design on conversations page [#5791](https://github.com/diaspora/diaspora/pull/5791)
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss
index c32f6ff77..c7cb3d39b 100644
--- a/app/assets/stylesheets/conversations.scss
+++ b/app/assets/stylesheets/conversations.scss
@@ -180,6 +180,21 @@
     a:hover {
       text-decoration: none;
     }
+    .pagination {
+      margin-left: auto;
+      margin-right: auto;
+      text-align: center;
+
+      .disabled a {
+        background: $background-grey;
+      }
+    }
+  }
+}
+
+@media (max-width: 1354px) {
+  #left_pane #conversation_inbox .pagination ul > li > a {
+    padding: 4px 7px;
   }
 }
 
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index d566b4a55..e43135d88 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -847,6 +847,22 @@ form#new_user.new_user input.btn {
   text-shadow: 1px 1px 20px rgb(126, 240, 77);
 }
 
+#conversation_inbox {
+  .pagination {
+    margin-left: auto;
+    margin-right: auto;
+    text-align: center;
+
+    ul > li > a {
+      padding: 4px 8px;
+    }
+
+    .disabled a{
+      background: $background-grey;
+    }
+  }
+}
+
 input#user_password, #user_username, #user_password_confirmation, #user_email {
   height: 30px;
 }
diff --git a/app/views/conversations/index.haml b/app/views/conversations/index.haml
index d064f042f..ecbcb6aff 100644
--- a/app/views/conversations/index.haml
+++ b/app/views/conversations/index.haml
@@ -21,7 +21,7 @@
             - else
               #no_conversations
                 = t('.no_messages')
-            = will_paginate @conversations, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer
+            = will_paginate @conversations, :previous_label => '«', :next_label => '»', :inner_window => 1, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer
 
     .span8
       - if @conversation
diff --git a/app/views/conversations/index.mobile.haml b/app/views/conversations/index.mobile.haml
index eb1f5f0ce..57341e0d5 100644
--- a/app/views/conversations/index.mobile.haml
+++ b/app/views/conversations/index.mobile.haml
@@ -27,4 +27,4 @@
         %i
           = t('.no_messages')
 
-  = will_paginate @conversations, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer
+  = will_paginate @conversations, :previous_label => '«', :next_label => '»', :inner_window => 1, :outer_window => 0, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer