diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index c75a40eeb4..775f5ae3d2 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -258,7 +258,6 @@ ARDOUR_UI::setup_transport ()
 
 //	auto_input_button.set_text (_("Auto Input"));
 
-	click_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
 	click_button.set_icon (ArdourButton::TransportMetronom);
 
 	act = ActionManager::get_action ("Transport", "ToggleClick");
@@ -276,23 +275,13 @@ ARDOUR_UI::setup_transport ()
 
 	stop_button.set_active (true);
 
-	goto_start_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
 	goto_start_button.set_icon (ArdourButton::TransportStart);
-	goto_end_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
 	goto_end_button.set_icon (ArdourButton::TransportEnd);
-	roll_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
 	roll_button.set_icon (ArdourButton::TransportPlay);
-	stop_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
 	stop_button.set_icon (ArdourButton::TransportStop);
-	play_selection_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
 	play_selection_button.set_icon (ArdourButton::TransportRange);
-	auto_loop_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
 	auto_loop_button.set_icon (ArdourButton::TransportLoop);
-
-	rec_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
 	rec_button.set_icon (ArdourButton::RecButton);
-
-	midi_panic_button.set_elements ((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
 	midi_panic_button.set_icon (ArdourButton::TransportPanic);
 
 	act = ActionManager::get_action (X_("Transport"), X_("Stop"));
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 56bf61dc8b..8f9f895575 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -149,7 +149,6 @@ AutomationTimeAxisView::AutomationTimeAxisView (
 		_base_rect->lower_to_bottom();
 	}
 
-	hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
 	hide_button.set_icon (ArdourButton::CloseCross);
 	hide_button.set_tweaks(ArdourButton::TrackHeader);
 
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 474fb4c6f9..1d29fe866f 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -695,10 +695,10 @@ Editor::Editor ()
 	/* nudge stuff */
 
 	nudge_forward_button.set_name ("nudge button");
-	nudge_forward_button.set_image(::get_icon("nudge_right"));
+	nudge_forward_button.set_icon(ArdourButton::NudgeRight);
 
 	nudge_backward_button.set_name ("nudge button");
-	nudge_backward_button.set_image(::get_icon("nudge_left"));
+	nudge_backward_button.set_icon(ArdourButton::NudgeLeft);
 
 	fade_context_menu.set_name ("ArdourContextMenu");
 
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 4995818e11..e8c3c6cc16 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -154,11 +154,9 @@ MixerStrip::init ()
 		t += string_compose (_("\n%1-%2-click to toggle the width of all strips."), Keyboard::primary_modifier_name(), Keyboard::tertiary_modifier_name ());
 	}
 	
-	width_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
 	width_button.set_icon (ArdourButton::StripWidth);
 	ARDOUR_UI::instance()->set_tip (width_button, t);
 
-	hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
 	hide_button.set_icon (ArdourButton::CloseCross);
 	ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));
 
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 9b6e800072..3dfba200e9 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -148,7 +148,6 @@ RouteUI::init ()
 
 	rec_enable_button = manage (new ArdourButton);
 	rec_enable_button->set_name ("record enable button");
-	rec_enable_button->set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
 	rec_enable_button->set_icon (ArdourButton::RecButton);
 	UI::instance()->set_tip (rec_enable_button, _("Enable recording on this track"), "");