diff --git a/src/Widgets/SearchToolbar.vala b/src/Widgets/SearchToolbar.vala
index 06f0f2861e..b46e3976dd 100644
--- a/src/Widgets/SearchToolbar.vala
+++ b/src/Widgets/SearchToolbar.vala
@@ -35,14 +35,14 @@ namespace Terminal.Widgets {
             search_entry.hexpand = true;
             search_entry.placeholder_text = _("Find");
 
-            var previous_button = new Gtk.Button.from_icon_name ("go-up-symbolic", Gtk.IconSize.SMALL_TOOLBAR);
+            var previous_button = new Gtk.Button.from_icon_name ("go-up-symbolic");
             previous_button.set_action_name (MainWindow.ACTION_PREFIX + MainWindow.ACTION_SEARCH_PREVIOUS);
             previous_button.tooltip_markup = Granite.markup_accel_tooltip (
                 {"<Control>Up", "<Control><Shift>g"},
                 _("Previous result")
             );
 
-            var next_button = new Gtk.Button.from_icon_name ("go-down-symbolic", Gtk.IconSize.SMALL_TOOLBAR);
+            var next_button = new Gtk.Button.from_icon_name ("go-down-symbolic");
             next_button.set_action_name (MainWindow.ACTION_PREFIX + MainWindow.ACTION_SEARCH_NEXT);
             next_button.tooltip_markup = Granite.markup_accel_tooltip (
                 {"<Control>Down", "<Control>g"},
diff --git a/src/Widgets/SettingsPopover.vala b/src/Widgets/SettingsPopover.vala
index 6be3275a1d..2d7f400942 100644
--- a/src/Widgets/SettingsPopover.vala
+++ b/src/Widgets/SettingsPopover.vala
@@ -36,7 +36,7 @@ public sealed class Terminal.SettingsPopover : Gtk.Popover {
     }
 
     construct {
-        var zoom_out_button = new Gtk.Button.from_icon_name ("zoom-out-symbolic", MENU) {
+        var zoom_out_button = new Gtk.Button.from_icon_name ("zoom-out-symbolic") {
             tooltip_markup = Granite.markup_accel_tooltip (
                 TerminalWidget.ACCELS_ZOOM_OUT,
                 _("Zoom out")
@@ -52,7 +52,7 @@ public sealed class Terminal.SettingsPopover : Gtk.Popover {
         };
         zoom_default_button.set_detailed_action_name (TerminalWidget.ACTION_ZOOM_DEFAULT);
 
-        var zoom_in_button = new Gtk.Button.from_icon_name ("zoom-in-symbolic", MENU) {
+        var zoom_in_button = new Gtk.Button.from_icon_name ("zoom-in-symbolic") {
             tooltip_markup = Granite.markup_accel_tooltip (
                 TerminalWidget.ACCELS_ZOOM_IN,
                 _("Zoom in")