diff --git a/gtk/inspector/data-list.ui b/gtk/inspector/data-list.ui
index e9905532d7..889b50ce46 100644
--- a/gtk/inspector/data-list.ui
+++ b/gtk/inspector/data-list.ui
@@ -13,17 +13,8 @@
             <property name="visible">True</property>
             <property name="relief">none</property>
             <property name="tooltip-text" translatable="yes">Show data</property>
+            <property name="icon-name">view-refresh-symbolic</property>
             <signal name="toggled" handler="toggle_show"/>
-            <style>
-              <class name="image-button"/>
-            </style>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="icon-name">view-refresh-symbolic</property>
-                <property name="icon-size">1</property>
-              </object>
-            </child>
           </object>
           <packing>
             <property name="pack-type">start</property>
diff --git a/gtk/inspector/resource-list.ui b/gtk/inspector/resource-list.ui
index 5178a9280f..7e4182a16b 100644
--- a/gtk/inspector/resource-list.ui
+++ b/gtk/inspector/resource-list.ui
@@ -43,33 +43,15 @@
                     <child>
                       <object class="GtkButton">
                         <property name="visible">True</property>
+                        <property name="icon-name">go-down-symbolic</property>
                         <signal name="clicked" handler="next_match"/>
-                        <style>
-                          <class name="image-button"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage">
-                            <property name="visible">True</property>
-                            <property name="icon-name">go-down-symbolic</property>
-                            <property name="icon-size">1</property>
-                          </object>
-                        </child>
                       </object>
                     </child>
                     <child>
                       <object class="GtkButton">
                         <property name="visible">True</property>
+                        <property name="icon-name">go-up-symbolic</property>
                         <signal name="clicked" handler="previous_match"/>
-                        <style>
-                          <class name="image-button"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage">
-                            <property name="visible">True</property>
-                            <property name="icon-name">go-up-symbolic</property>
-                            <property name="icon-size">1</property>
-                          </object>
-                        </child>
                       </object>
                     </child>
                   </object>
diff --git a/gtk/inspector/window.ui b/gtk/inspector/window.ui
index c2a0ccfb5b..226a707403 100644
--- a/gtk/inspector/window.ui
+++ b/gtk/inspector/window.ui
@@ -31,17 +31,8 @@
                     <property name="tooltip-text" translatable="yes">Select an Object</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
+                    <property name="icon-name">find-location-symbolic</property>
                     <signal name="clicked" handler="gtk_inspector_on_inspect"/>
-                    <style>
-                      <class name="image-button"/>
-                    </style>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">1</property>
-                        <property name="icon-name">find-location-symbolic</property>
-                        <property name="icon-size">1</property>
-                      </object>
-                    </child>
                   </object>
                 </child>
                 <child>
@@ -54,17 +45,8 @@
                         <property name="tooltip-text" translatable="yes">Show Details</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
+                        <property name="icon-name">dialog-information-symbolic</property>
                         <signal name="clicked" handler="open_object_details"/>
-                        <style>
-                          <class name="image-button"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage">
-                            <property name="visible">1</property>
-                            <property name="icon-name">dialog-information-symbolic</property>
-                            <property name="icon-size">1</property>
-                          </object>
-                        </child>
                       </object>
                       <packing>
                         <property name="name">list</property>
@@ -77,17 +59,8 @@
                         <property name="tooltip-text" translatable="yes">Show all Objects</property>
                         <property name="halign">center</property>
                         <property name="valign">center</property>
+                        <property name="icon-name">view-list-symbolic</property>
                         <signal name="clicked" handler="close_object_details"/>
-                        <style>
-                          <class name="image-button"/>
-                        </style>
-                        <child>
-                          <object class="GtkImage">
-                            <property name="visible">1</property>
-                            <property name="icon-name">view-list-symbolic</property>
-                            <property name="icon-size">1</property>
-                          </object>
-                        </child>
                       </object>
                       <packing>
                         <property name="name">details</property>
@@ -107,16 +80,7 @@
                 <property name="tooltip-text" translatable="yes">Collect Statistics</property>
                 <property name="halign">start</property>
                 <property name="valign">center</property>
-                <style>
-                  <class name="image-button"/>
-                </style>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">1</property>
-                    <property name="icon-name">media-record-symbolic</property>
-                    <property name="icon-size">1</property>
-                  </object>
-                </child>
+                <property name="icon-name">media-record-symbolic</property>
               </object>
               <packing>
                 <property name="name">statistics</property>
@@ -134,16 +98,7 @@
                     <property name="tooltip-text" translatable="yes">Show Details</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
-                    <style>
-                      <class name="image-button"/>
-                    </style>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">1</property>
-                        <property name="icon-name">dialog-information-symbolic</property>
-                        <property name="icon-size">1</property>
-                      </object>
-                    </child>
+                    <property name="icon-name">dialog-information-symbolic</property>
                   </object>
                   <packing>
                     <property name="name">list</property>
@@ -156,16 +111,7 @@
                     <property name="tooltip-text" translatable="yes">Show all Resources</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
-                    <style>
-                      <class name="image-button"/>
-                    </style>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">1</property>
-                        <property name="icon-name">view-list-symbolic</property>
-                        <property name="icon-size">1</property>
-                      </object>
-                    </child>
+                    <property name="icon-name">view-list-symbolic</property>
                   </object>
                   <packing>
                     <property name="name">details</property>
@@ -265,16 +211,7 @@
                                 <property name="visible">True</property>
                                 <property name="relief">none</property>
                                 <property name="tooltip-text" translatable="yes">Trace signal emissions on this object</property>
-                                <style>
-                                  <class name="image-button"/>
-                                </style>
-                                <child>
-                                  <object class="GtkImage">
-                                    <property name="visible">True</property>
-                                    <property name="icon-name">media-record-symbolic</property>
-                                    <property name="icon-size">1</property>
-                                  </object>
-                                </child>
+                                <property name="icon-name">media-record-symbolic</property>
                               </object>
                             </child>
                             <child>
@@ -282,16 +219,7 @@
                                 <property name="visible">True</property>
                                 <property name="relief">none</property>
                                 <property name="tooltip-text" translatable="yes">Clear log</property>
-                                <style>
-                                  <class name="image-button"/>
-                                </style>
-                                <child>
-                                  <object class="GtkImage">
-                                    <property name="visible">True</property>
-                                    <property name="icon-name">edit-clear-symbolic</property>
-                                    <property name="icon-size">1</property>
-                                  </object>
-                                </child>
+                                <property name="icon-name">edit-clear-symbolic</property>
                               </object>
                             </child>
                           </object>