diff --git a/data/resources/style.css b/data/resources/style.css
index 5476f045..08f3d628 100644
--- a/data/resources/style.css
+++ b/data/resources/style.css
@@ -489,11 +489,13 @@ message-reactions .reaction-count {
 
 
 /* Explore */
-
-.explore listview row {
-  padding: 12px;
+.explore listview {
+	background: transparent;
 }
 
+.explore .padded-button {
+  min-width: 64px;
+}
 
 /* Invite */
 
diff --git a/data/resources/ui/content-explore.ui b/data/resources/ui/content-explore.ui
index 7129a01f..ffa4504c 100644
--- a/data/resources/ui/content-explore.ui
+++ b/data/resources/ui/content-explore.ui
@@ -79,14 +79,8 @@
                     <property name="tightening-threshold">550</property>
                     <property name="child">
                       <object class="GtkListView" id="listview">
-                        <property name="show-separators">True</property>
-                        <property name="margin-top">24</property>
-                        <property name="margin-bottom">24</property>
-                        <property name="margin-start">24</property>
                         <property name="margin-end">24</property>
-                        <style>
-                          <class name="card"/>
-                        </style>
+                        <property name="margin-start">24</property>
                         <property name="factory">
                           <object class="GtkBuilderListItemFactory">
                             <property name="resource">/org/gnome/Fractal/content-explore-item.ui</property>
diff --git a/data/resources/ui/content-public-room-row.ui b/data/resources/ui/content-public-room-row.ui
index d8fb83f4..47a0d30b 100644
--- a/data/resources/ui/content-public-room-row.ui
+++ b/data/resources/ui/content-public-room-row.ui
@@ -4,8 +4,8 @@
     <property name="child">
       <object class="GtkBox">
         <property name="spacing">12</property>
-        <property name="margin-top">12</property>
-        <property name="margin-bottom">12</property>
+        <property name="margin-top">18</property>
+        <property name="margin-bottom">18</property>
         <child>
           <object class="ComponentsAvatar" id="avatar">
             <property name="size">48</property>
@@ -14,6 +14,7 @@
         </child>
         <child>
           <object class="GtkBox">
+            <property name="spacing">6</property>
             <property name="orientation">vertical</property>
             <property name="hexpand">True</property>
             <property name="halign">start</property>
@@ -47,33 +48,36 @@
                 </style>
               </object>
             </child>
-          </object>
-        </child>
-        <child type="end">
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="SpinnerButton" id="button">
-                <property name="valign">center</property>
-              </object>
-            </child>
             <child>
               <object class="GtkBox">
-                <property name="halign">center</property>
+                <property name="spacing">12</property>
                 <child>
-                  <object class="GtkImage">
-                    <property name="icon-name">system-users-symbolic</property>
+                  <object class="SpinnerButton" id="button">
+                    <property name="valign">center</property>
                     <style>
-                      <class name="dim-label"/>
+                      <class name="padded-button"/>
                     </style>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="members_count">
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
+                  <object class="GtkBox">
+                    <property name="halign">center</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkImage">
+                        <property name="icon-name">system-users-symbolic</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="members_count">
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -84,4 +88,3 @@
     </property>
   </template>
 </interface>
-