diff --git a/src/ui/call-record-row.ui b/src/ui/call-record-row.ui
index d9f69c8..8cc7e5c 100644
--- a/src/ui/call-record-row.ui
+++ b/src/ui/call-record-row.ui
@@ -39,11 +39,7 @@
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="tooltip-text">Call</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="icon-name">call-start-symbolic</property>
-                  </object>
-                </child>
+                <property name="icon-name">call-start-symbolic</property>
               </object>
             </child>
             <child>
diff --git a/src/ui/call-window.ui b/src/ui/call-window.ui
index 36ac0d5..37b200d 100644
--- a/src/ui/call-window.ui
+++ b/src/ui/call-window.ui
@@ -65,12 +65,8 @@
               <object class="GtkHeaderBar">
                 <child>
                   <object class="GtkButton" id="show_calls">
+                    <property name="icon-name">system-switch-user-symbolic</property>
                     <signal name="clicked" handler="show_calls_clicked_cb" swapped="no"/>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="icon_name">system-switch-user-symbolic</property>
-                      </object>
-                    </child>
                   </object>
                 </child>
               </object>
diff --git a/src/ui/main-window.ui b/src/ui/main-window.ui
index 9b3611a..a26edb4 100644
--- a/src/ui/main-window.ui
+++ b/src/ui/main-window.ui
@@ -22,11 +22,7 @@
             <child type="end">
               <object class="GtkMenuButton">
                 <property name="popover">menu_popover</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="icon_name">open-menu-symbolic</property>
-                  </object>
-                </child>
+                <property name="icon-name">open-menu-symbolic</property>
               </object>
             </child>
           </object>
diff --git a/src/ui/new-call-box.ui b/src/ui/new-call-box.ui
index 8dd0e0a..ba57b2e 100644
--- a/src/ui/new-call-box.ui
+++ b/src/ui/new-call-box.ui
@@ -66,15 +66,11 @@
                         </child>
                         <child>
                           <object class="GtkButton" id="dial_result_btn">
+                            <property name="icon-name">call-start-symbolic</property>
                             <signal name="clicked" handler="dial_result_clicked_cb" swapped="yes"/>
                             <style>
                               <class name="rounded-button"/>
                             </style>
-                            <child>
-                              <object class="GtkImage">
-                                <property name="icon-name">call-start-symbolic</property>
-                              </object>
-                            </child>
                           </object>
                         </child>
                       </object>
diff --git a/src/ui/new-call-header-bar.ui b/src/ui/new-call-header-bar.ui
index 4a8bbf8..70bfbac 100644
--- a/src/ui/new-call-header-bar.ui
+++ b/src/ui/new-call-header-bar.ui
@@ -8,17 +8,12 @@
         <property name="action-name">win.back</property>
         <property name="valign">center</property>
         <property name="use-underline">True</property>
+        <property name="icon-name">go-previous-symbolic</property>
         <child internal-child="accessible">
           <object class="AtkObject" id="a11y-back">
             <property name="accessible-name" translatable="yes">Back</property>
           </object>
         </child>
-        <child>
-          <object class="GtkImage" id="back_image">
-            <property name="icon-name">go-previous-symbolic</property>
-            <property name="icon-size">normal</property>
-          </object>
-        </child>
       </object>
     </child>
     <child type="title">