diff --git a/main/data/conversation_row.ui b/main/data/conversation_row.ui
index 1dd75035..ff08eac2 100644
--- a/main/data/conversation_row.ui
+++ b/main/data/conversation_row.ui
@@ -136,12 +136,14 @@
                                         <property name="visible">True</property>
                                         <child>
                                             <object class="GtkButton" id="x_button">
+                                                <property name="width-request">27</property>
+                                                <property name="height-request">27</property>
                                                 <property name="vexpand">False</property>
                                                 <property name="visible">True</property>
                                                 <property name="margin-start">5</property>
                                                 <style>
                                                     <class name="conversation_list_row_xbutton"/>
-                                                    <class name="circular"/>
+                                                    <class name="circular-button"/>
                                                     <class name="flat"/>
                                                 </style>
                                                 <child>
diff --git a/main/data/conversation_view.ui b/main/data/conversation_view.ui
index 3c157960..c968f992 100644
--- a/main/data/conversation_view.ui
+++ b/main/data/conversation_view.ui
@@ -27,12 +27,14 @@
                                 <property name="margin-bottom">30</property>
                                 <child>
                                     <object class="GtkButton" id="goto_end_button">
+                                        <property name="width-request">30</property>
+                                        <property name="height-request">30</property>
                                         <property name="vexpand">False</property>
                                         <property name="halign">end</property>
                                         <property name="valign">end</property>
                                         <property name="visible">True</property>
                                         <style>
-                                            <class name="circular"/>
+                                            <class name="circular-button"/>
                                         </style>
                                         <child>
                                             <object class="GtkImage">
diff --git a/main/data/theme.css b/main/data/theme.css
index 36b3cb5b..d581cac2 100644
--- a/main/data/theme.css
+++ b/main/data/theme.css
@@ -78,6 +78,11 @@ window.dino-main .dino-sidebar > frame {
     transition: background .05s ease;
 }
 
+window.dino-main .circular-button {
+    padding: 0;
+    border-radius: 1000px;
+}
+
 window.dino-main .dino-conversation .message-box.edit-mode {
     background: alpha(@theme_selected_bg_color, 0.1);
 }