diff --git a/ui/component/commentsList/view.jsx b/ui/component/commentsList/view.jsx
index 49b10dbf7..2b47cbe54 100644
--- a/ui/component/commentsList/view.jsx
+++ b/ui/component/commentsList/view.jsx
@@ -379,8 +379,9 @@ const CommentActionButtons = (actionButtonsProps: ActionButtonsProps) => {
           <SortButton {...sortButtonProps} label={__('New')} icon={ICONS.NEW} sortOption={SORT_BY.NEWEST} />
         </span>
       )}
-
-      <Button button="alt" icon={ICONS.REFRESH} title={__('Refresh')} onClick={() => setPage(0)} />
+      <div className="button_refresh">
+        <Button button="alt" icon={ICONS.REFRESH} title={__('Refresh')} onClick={() => setPage(0)} />
+      </div>
       {allServers.length >= 2 && (
         <div className="button_selectedServer">
           <FormField
diff --git a/ui/scss/component/_card.scss b/ui/scss/component/_card.scss
index 218f379e1..13e290a18 100644
--- a/ui/scss/component/_card.scss
+++ b/ui/scss/component/_card.scss
@@ -333,6 +333,7 @@
   align-self: flex-start;
   .button--alt {
     padding-top: 2px;
+    padding: 0 var(--spacing-s);
   }
   .comment__sort {
     .button--alt {
@@ -660,6 +661,14 @@
 
 .button_selectedServer {
   display: inline;
-  width: var(--floating-viewer-height);
   float: right;
+  min-width: var(--side-nav-width--micro);
+  max-width: var(--side-nav-width);
+  margin-left: -10px;
+}
+
+.button_refresh {
+  display: inline;
+  float: right;
+  margin-left: var(--spacing-s);
 }