diff --git a/borrowed/goffice/go-optionmenu.c b/borrowed/goffice/go-optionmenu.c
index 4e0ba1b656..a145e2d38f 100644
--- a/borrowed/goffice/go-optionmenu.c
+++ b/borrowed/goffice/go-optionmenu.c
@@ -354,7 +354,7 @@ static void go_option_menu_init(GOOptionMenu *option_menu)
 
     option_menu->button_label = GTK_LABEL(gtk_label_new(""));
     gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(option_menu->button_label), FALSE, TRUE, 0);
-    arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
+    arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_BUTTON);
     gtk_widget_set_margin_start (GTK_WIDGET(arrow), 5);
 
     gtk_box_pack_end(GTK_BOX(box), arrow, FALSE, FALSE, 0);
diff --git a/gnucash/gnome-utils/gnc-cell-renderer-popup-entry.c b/gnucash/gnome-utils/gnc-cell-renderer-popup-entry.c
index 7d7f15e4f1..84e3852309 100644
--- a/gnucash/gnome-utils/gnc-cell-renderer-popup-entry.c
+++ b/gnucash/gnome-utils/gnc-cell-renderer-popup-entry.c
@@ -112,6 +112,7 @@ static void
 gnc_popup_entry_init (GncPopupEntry *widget)
 {
     GtkWidget *arrow;
+    GtkStyleContext *context;
 
     widget->editing_canceled = FALSE;
 
@@ -123,14 +124,17 @@ gnc_popup_entry_init (GncPopupEntry *widget)
     gtk_entry_set_visibility (GTK_ENTRY(widget->entry), TRUE);
     gtk_widget_show (widget->entry);
 
+    context = gtk_widget_get_style_context (widget->entry);
+    gtk_style_context_add_class (context, "combo");
+
     widget->button = gtk_button_new ();
     gtk_widget_show (widget->button);
 
-    arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
-    gtk_widget_show (arrow);
+    context = gtk_widget_get_style_context (widget->button);
+    gtk_style_context_add_class (context, "combo");
 
-    g_signal_connect (G_OBJECT(arrow), "draw",
-                      G_CALLBACK(gnc_draw_arrow_cb), GINT_TO_POINTER(1));
+    arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_BUTTON);
+    gtk_widget_show (arrow);
 
     gtk_container_add (GTK_CONTAINER(widget->button), arrow);
 
@@ -144,6 +148,13 @@ gnc_popup_entry_init (GncPopupEntry *widget)
     gtk_widget_add_events (GTK_WIDGET(widget), GDK_KEY_RELEASE_MASK);
 }
 
+static void
+gpw_grab_focus (GtkWidget *box)
+{
+    GncPopupEntry *widget = GNC_POPUP_ENTRY(box);
+    gtk_widget_grab_focus (widget->entry);
+}
+
 static void
 gnc_popup_entry_class_init (GncPopupEntryClass *klass)
 {
@@ -151,6 +162,7 @@ gnc_popup_entry_class_init (GncPopupEntryClass *klass)
     GObjectClass   *gobject_class = G_OBJECT_CLASS(klass);
 
     widget_class->key_press_event = gpw_key_press_event;
+    widget_class->grab_focus = gpw_grab_focus;
 
     gobject_class->set_property = gpw_set_property;
     gobject_class->get_property = gpw_get_property;
@@ -249,7 +261,7 @@ gtk_cell_editable_key_press_event (GtkEntry      *entry,
     if (qof_scan_date (date_string, &day, &month, &year))
     {
         when.tm_year = year - 1900;
-        when.tm_mon = month - 1 ;
+        when.tm_mon = month - 1;
         when.tm_mday = day;
 
         if (!gnc_handle_date_accelerator (key_event, &when, date_string))
@@ -363,7 +375,7 @@ gnc_popup_get_button_width (void)
     gtk_widget_show (button);
     gtk_container_add (GTK_CONTAINER(window), button);
 
-    arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
+    arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_BUTTON);
     gtk_widget_show (arrow);
 
     gtk_container_add (GTK_CONTAINER(button), arrow);
diff --git a/gnucash/gnome-utils/gnc-combott.c b/gnucash/gnome-utils/gnc-combott.c
index 2be7adc972..b4187ad0a2 100644
--- a/gnucash/gnome-utils/gnc-combott.c
+++ b/gnucash/gnome-utils/gnc-combott.c
@@ -177,6 +177,7 @@ gnc_combott_init (GncCombott *combott)
     GtkWidget *arrow;
     GtkWidget *button;
     GtkWidget *sep;
+    GtkStyleContext *context;
 
     GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott);
 
@@ -192,10 +193,7 @@ gnc_combott_init (GncCombott *combott)
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE);
 
-    arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
-
-    g_signal_connect (G_OBJECT (arrow), "draw",
-                      G_CALLBACK (gnc_draw_arrow_cb), GINT_TO_POINTER(1));
+    arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_BUTTON);
 
     gtk_widget_set_margin_start (GTK_WIDGET(arrow), 5);
     gtk_box_pack_end (GTK_BOX (hbox), arrow, FALSE, FALSE, 0);
@@ -207,10 +205,16 @@ gnc_combott_init (GncCombott *combott)
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
     priv->label = label;
 
+    context = gtk_widget_get_style_context (priv->label);
+    gtk_style_context_add_class (context, "combo");
+
     button = gtk_button_new();
     gtk_container_add(GTK_CONTAINER(button), GTK_WIDGET(hbox));
     priv->button = button;
 
+    context = gtk_widget_get_style_context (priv->button);
+    gtk_style_context_add_class (context, "combo");
+
     gtk_container_add(GTK_CONTAINER(combott), GTK_WIDGET(button));
 
     g_signal_connect (button, "event",
diff --git a/gnucash/gnome-utils/gnc-date-edit.c b/gnucash/gnome-utils/gnc-date-edit.c
index 40758a5af2..7f4181fbb3 100644
--- a/gnucash/gnome-utils/gnc-date-edit.c
+++ b/gnucash/gnome-utils/gnc-date-edit.c
@@ -892,10 +892,7 @@ create_children (GNCDateEdit *gde)
         gtk_widget_show (GTK_WIDGET(gde->cal_label));
 
     /* Graphic for the popup button. */
-    arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
-
-    g_signal_connect (G_OBJECT (arrow), "draw",
-                      G_CALLBACK (gnc_draw_arrow_cb), GINT_TO_POINTER(1));
+    arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_BUTTON);
 
     gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, FALSE, 0);
     gtk_widget_show (GTK_WIDGET(arrow));
diff --git a/gnucash/gnome-utils/gnc-tree-view.c b/gnucash/gnome-utils/gnc-tree-view.c
index 27a765dc95..025b1d69c4 100644
--- a/gnucash/gnome-utils/gnc-tree-view.c
+++ b/gnucash/gnome-utils/gnc-tree-view.c
@@ -274,7 +274,7 @@ gnc_tree_view_init (GncTreeView *view, void *data)
     /* Create the last column which contains the column selection
      * widget.  gnc_tree_view_add_text_column will do most of the
      * work. */
-    icon = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_SMALL_TOOLBAR);
+    icon = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR);
 
     priv->column_menu_icon_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_set_homogeneous (GTK_BOX(priv->column_menu_icon_box), FALSE);
@@ -288,9 +288,6 @@ gnc_tree_view_init (GncTreeView *view, void *data)
 
     gtk_widget_show_all (priv->column_menu_icon_box);
 
-    g_signal_connect (G_OBJECT(icon), "draw",
-                      G_CALLBACK(gnc_draw_arrow_cb), GINT_TO_POINTER(1));
-
     column = gnc_tree_view_add_text_column (view, NULL, NULL, NULL, NULL,
                                             -1, -1, NULL);
     g_object_set (G_OBJECT(column),
diff --git a/gnucash/gnome/gnc-plugin-page-invoice.c b/gnucash/gnome/gnc-plugin-page-invoice.c
index c47cde0db1..09254df3ad 100644
--- a/gnucash/gnome/gnc-plugin-page-invoice.c
+++ b/gnucash/gnome/gnc-plugin-page-invoice.c
@@ -201,12 +201,12 @@ static GtkActionEntry gnc_plugin_page_invoice_actions [] =
         G_CALLBACK (gnc_plugin_page_invoice_cmd_duplicateEntry)
     },
     {
-        "EntryUpAction", "go-up", N_("Move Entry _Up"), NULL,
+        "EntryUpAction", "pan-up-symbolic", N_("Move Entry _Up"), NULL,
         N_("Move the current entry one row upwards"),
         G_CALLBACK (gnc_plugin_page_invoice_cmd_entryUp)
     },
     {
-        "EntryDownAction", "go-down", N_("Move Entry Do_wn"), NULL,
+        "EntryDownAction", "pan-down-symbolic", N_("Move Entry Do_wn"), NULL,
         N_("Move the current entry one row downwards"),
         G_CALLBACK (gnc_plugin_page_invoice_cmd_entryDown)
     },
diff --git a/gnucash/gnome/gnc-plugin-page-register2.c b/gnucash/gnome/gnc-plugin-page-register2.c
index 5151b4a52e..1082ab929d 100644
--- a/gnucash/gnome/gnc-plugin-page-register2.c
+++ b/gnucash/gnome/gnc-plugin-page-register2.c
@@ -324,12 +324,12 @@ static GtkActionEntry gnc_plugin_page_register2_actions [] =
         G_CALLBACK (gnc_plugin_page_register2_cmd_reverse_transaction)
     },
     {
-        TRANSACTION_UP_ACTION, "go-up", N_("Move Transaction _Up"), NULL,
+        TRANSACTION_UP_ACTION, "pan-up-symbolic", N_("Move Transaction _Up"), NULL,
         N_("Move the current transaction one row upwards. Only available if the date and number of both rows are identical and the register window is sorted by date."),
         G_CALLBACK (gnc_plugin_page_register2_cmd_entryUp)
     },
     {
-        TRANSACTION_DOWN_ACTION, "go-down", N_("Move Transaction Do_wn"), NULL,
+        TRANSACTION_DOWN_ACTION, "pan-down-symbolic", N_("Move Transaction Do_wn"), NULL,
         N_("Move the current transaction one row downwards. Only available if the date and number of both rows are identical and the register window is sorted by date."),
         G_CALLBACK (gnc_plugin_page_register2_cmd_entryDown)
     },