diff --git a/hammond.doap b/Hammond.doap
similarity index 100%
rename from hammond.doap
rename to Hammond.doap
diff --git a/hammond-gtk/gtk/empty_view.ui b/hammond-gtk/gtk/empty_view.ui
index 17c99c2..f4937cd 100644
--- a/hammond-gtk/gtk/empty_view.ui
+++ b/hammond-gtk/gtk/empty_view.ui
@@ -17,6 +17,7 @@
         <property name="can_focus">False</property>
         <property name="pixel_size">128</property>
         <property name="icon_name">application-rss+xml-symbolic</property>
+        <property name="use_fallback">True</property>
         <style>
           <class name="dim-label"/>
         </style>
diff --git a/hammond-gtk/gtk/episode_widget.ui b/hammond-gtk/gtk/episode_widget.ui
index 268209e..35f9a6c 100644
--- a/hammond-gtk/gtk/episode_widget.ui
+++ b/hammond-gtk/gtk/episode_widget.ui
@@ -44,7 +44,6 @@
                 <property name="shadow_type">in</property>
                 <property name="min_content_height">60</property>
                 <property name="max_content_height">400</property>
-                <property name="propagate_natural_height">True</property>
                 <child>
                   <object class="GtkViewport">
                     <property name="visible">True</property>
@@ -98,6 +97,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="icon_name">gtk-save</property>
+            <property name="use_fallback">True</property>
           </object>
         </child>
       </object>
@@ -121,6 +121,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="icon_name">gtk-media-play</property>
+            <property name="use_fallback">True</property>
           </object>
         </child>
       </object>
diff --git a/hammond-gtk/gtk/headerbar.ui b/hammond-gtk/gtk/headerbar.ui
index 879a1fe..ebb1e3b 100644
--- a/hammond-gtk/gtk/headerbar.ui
+++ b/hammond-gtk/gtk/headerbar.ui
@@ -127,7 +127,8 @@
           <object class="GtkImage">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="stock">gtk-home</property>
+            <property name="icon_name">gtk-home</property>
+            <property name="use_fallback">True</property>
           </object>
         </child>
       </object>
@@ -147,7 +148,8 @@
           <object class="GtkImage">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="stock">gtk-refresh</property>
+            <property name="icon_name">gtk-refresh</property>
+            <property name="use_fallback">True</property>
           </object>
         </child>
       </object>
@@ -158,7 +160,6 @@
     </child>
     <child>
       <object class="GtkToggleButton" id="searchbutton">
-        <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="tooltip_text" translatable="yes">Search</property>
@@ -166,7 +167,8 @@
         <child>
           <object class="GtkImage" id="search-button-image">
             <property name="can_focus">False</property>
-            <property name="icon_name">edit-find-symbolic</property>
+            <property name="icon_name">gtk-find</property>
+            <property name="use_fallback">True</property>
             <property name="icon_size">1</property>
           </object>
         </child>
@@ -190,7 +192,8 @@
           <object class="GtkImage" id="add-button-image">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="icon_name">list-add-symbolic</property>
+            <property name="icon_name">gtk-add</property>
+            <property name="use_fallback">True</property>
             <property name="icon_size">1</property>
           </object>
         </child>
diff --git a/hammond-gtk/gtk/podcast_widget.ui b/hammond-gtk/gtk/podcast_widget.ui
index 4be262e..7b920fc 100644
--- a/hammond-gtk/gtk/podcast_widget.ui
+++ b/hammond-gtk/gtk/podcast_widget.ui
@@ -54,6 +54,7 @@
                 <property name="margin_start">1</property>
                 <property name="margin_end">1</property>
                 <property name="icon_name">gtk-missing-image</property>
+                <property name="use_fallback">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
diff --git a/hammond-gtk/gtk/podcasts_child.ui b/hammond-gtk/gtk/podcasts_child.ui
index d2c139c..050a685 100644
--- a/hammond-gtk/gtk/podcasts_child.ui
+++ b/hammond-gtk/gtk/podcasts_child.ui
@@ -23,6 +23,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="icon_name">gtk-missing-image</property>
+                <property name="use_fallback">True</property>
                 <property name="icon_size">6</property>
               </object>
             </child>