diff --git a/gtk/inspector/classes-list.ui b/gtk/inspector/classes-list.ui
index 25ea88fb3b..c84e2d6e63 100644
--- a/gtk/inspector/classes-list.ui
+++ b/gtk/inspector/classes-list.ui
@@ -16,7 +16,7 @@
         <child>
           <object class="GtkToolButton">
             <property name="visible">True</property>
-            <property name="icon-name">list-add</property>
+            <property name="icon-name">list-add-symbolic</property>
             <property name="tooltip-text" translatable="yes">Add a class</property>
             <signal name="clicked" handler="add_clicked"/>
           </object>
diff --git a/gtk/inspector/css-editor.ui b/gtk/inspector/css-editor.ui
index 7a6d921a25..0c18d3c32e 100644
--- a/gtk/inspector/css-editor.ui
+++ b/gtk/inspector/css-editor.ui
@@ -25,7 +25,7 @@
         <child>
           <object class="GtkToggleToolButton" id="disable_button">
             <property name="visible">True</property>
-            <property name="icon-name">media-playback-pause</property>
+            <property name="icon-name">media-playback-pause-symbolic</property>
             <property name="tooltip-text" translatable="yes">Disable this custom CSS</property>
             <signal name="toggled" handler="disable_toggled"/>
           </object>
diff --git a/gtk/inspector/data-list.ui b/gtk/inspector/data-list.ui
index d2ee69557a..83d0ca3f9a 100644
--- a/gtk/inspector/data-list.ui
+++ b/gtk/inspector/data-list.ui
@@ -9,7 +9,7 @@
         <child>
           <object class="GtkToggleToolButton" id="show_button">
             <property name="visible">True</property>
-            <property name="icon-name">reload</property>
+            <property name="icon-name">view-refresh-symbolic</property>
             <property name="tooltip-text" translatable="yes">Show data</property>
             <signal name="toggled" handler="toggle_show"/>
           </object>
diff --git a/gtk/inspector/signals-list.c b/gtk/inspector/signals-list.c
index bccb6f9ea2..95b8aadb23 100644
--- a/gtk/inspector/signals-list.c
+++ b/gtk/inspector/signals-list.c
@@ -37,6 +37,7 @@ struct _GtkInspectorSignalsListPrivate
   GtkTextBuffer *text;
   GtkWidget *log_win;
   GtkWidget *trace_button;
+  GtkWidget *clear_button;
   GtkTreeViewColumn *count_column;
   GtkCellRenderer *count_renderer;
   GObject *object;
@@ -177,6 +178,9 @@ gtk_inspector_signals_list_init (GtkInspectorSignalsList *sl)
   sl->priv = gtk_inspector_signals_list_get_instance_private (sl);
   gtk_widget_init_template (GTK_WIDGET (sl));
 
+  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (sl->priv->clear_button),
+    gtk_widget_get_direction (GTK_WIDGET (sl)) == GTK_TEXT_DIR_RTL ? "edit-clear-rtl-symbolic" : "edit-clear-symbolic");
+
   gtk_tree_view_column_set_cell_data_func (sl->priv->count_column,
                                            sl->priv->count_renderer,
                                            render_count,
@@ -333,6 +337,7 @@ gtk_inspector_signals_list_class_init (GtkInspectorSignalsListClass *klass)
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorSignalsList, count_column);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorSignalsList, count_renderer);
   gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorSignalsList, trace_button);
+  gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorSignalsList, clear_button);
   gtk_widget_class_bind_template_callback (widget_class, toggle_tracing);
   gtk_widget_class_bind_template_callback (widget_class, clear_log);
 }
diff --git a/gtk/inspector/signals-list.ui b/gtk/inspector/signals-list.ui
index 2729c601d1..e88407ff2d 100644
--- a/gtk/inspector/signals-list.ui
+++ b/gtk/inspector/signals-list.ui
@@ -26,7 +26,7 @@
             <child>
               <object class="GtkToggleToolButton" id="trace_button">
                 <property name="visible">True</property>
-                <property name="icon-name">media-record</property>
+                <property name="icon-name">media-record-symbolic</property>
                 <property name="tooltip-text" translatable="yes">Trace signal emissions on this object</property>
                 <signal name="toggled" handler="toggle_tracing"/>
               </object>
@@ -34,7 +34,6 @@
             <child>
               <object class="GtkToolButton" id="clear_button">
                 <property name="visible">True</property>
-                <property name="icon-name">edit-clear</property>
                 <property name="tooltip-text" translatable="yes">Clear log</property>
                 <signal name="clicked" handler="clear_log"/>
               </object>
diff --git a/gtk/inspector/window.ui b/gtk/inspector/window.ui
index bb183d355d..6b29a6d0ce 100644
--- a/gtk/inspector/window.ui
+++ b/gtk/inspector/window.ui
@@ -2,7 +2,7 @@
 <interface domain="gtk30">
   <object class="GtkImage" id="inspect_image">
     <property name="visible">True</property>
-    <property name="icon-name">edit-find</property>
+    <property name="icon-name">edit-find-symbolic</property>
     <property name="icon-size">4</property>
   </object>
   <object class="GtkMenu" id="widget_popup">