diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index 35870cb6c3..47c9871015 100644
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -267,7 +267,7 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *)
 		}
 	}
 
-	if ( ((_elements & FlatFace)==FlatFace) && (active_state() != Gtkmm2ext::ExplicitActive) ) {
+	if ( ((_elements & Inset)==Inset) && (active_state() != Gtkmm2ext::ExplicitActive) ) {
 
 		if ( !_flat_buttons ) {
 			float rheight = get_height()*0.5-REFLECTION_HEIGHT;
diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index c3a18869b3..18de7230d2 100644
--- a/gtk2_ardour/ardour_button.h
+++ b/gtk2_ardour/ardour_button.h
@@ -37,7 +37,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 		Body = 0x2,
 		Text = 0x4,
 		Indicator = 0x8,
-		FlatFace = 0x10,
+		Inset = 0x10,
 		Menu = 0x20,
 	};
 
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 232d465d29..9617bb2d1f 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -667,11 +667,11 @@ Editor::Editor ()
 	/* nudge stuff */
 
 	nudge_forward_button.set_name ("nudge button");
-//	nudge_forward_button.add_elements (ArdourButton::FlatFace);
+//	nudge_forward_button.add_elements (ArdourButton::Inset);
 	nudge_forward_button.set_image(::get_icon("nudge_right"));
 
 	nudge_backward_button.set_name ("nudge button");
-//	nudge_backward_button.add_elements (ArdourButton::FlatFace);
+//	nudge_backward_button.add_elements (ArdourButton::Inset);
 	nudge_backward_button.set_image(::get_icon("nudge_left"));
 
 	fade_context_menu.set_name ("ArdourContextMenu");
@@ -2896,7 +2896,7 @@ Editor::setup_toolbar ()
 
 	edit_mode_selector.set_name ("mouse mode button");
 	edit_mode_selector.set_size_request (65, -1);
-	edit_mode_selector.add_elements (ArdourButton::FlatFace);
+	edit_mode_selector.add_elements (ArdourButton::Inset);
 
 	mode_box->pack_start (edit_mode_selector, false, false);
 	mode_box->pack_start (*mouse_mode_box, false, false);
@@ -2926,21 +2926,21 @@ Editor::setup_toolbar ()
 	RefPtr<Action> act;
 
 	zoom_in_button.set_name ("zoom button");
-//	zoom_in_button.add_elements ( ArdourButton::FlatFace );
+//	zoom_in_button.add_elements ( ArdourButton::Inset );
 	zoom_in_button.set_tweaks ((ArdourButton::Tweaks) (ArdourButton::ShowClick) );
 	zoom_in_button.set_image(::get_icon ("zoom_in"));
 	act = ActionManager::get_action (X_("Editor"), X_("temporal-zoom-in"));
 	zoom_in_button.set_related_action (act);
 
 	zoom_out_button.set_name ("zoom button");
-//	zoom_out_button.add_elements ( ArdourButton::FlatFace );
+//	zoom_out_button.add_elements ( ArdourButton::Inset );
 	zoom_out_button.set_tweaks ((ArdourButton::Tweaks) (ArdourButton::ShowClick) );
 	zoom_out_button.set_image(::get_icon ("zoom_out"));
 	act = ActionManager::get_action (X_("Editor"), X_("temporal-zoom-out"));
 	zoom_out_button.set_related_action (act);
 
 	zoom_out_full_button.set_name ("zoom button");
-//	zoom_out_full_button.add_elements ( ArdourButton::FlatFace );
+//	zoom_out_full_button.add_elements ( ArdourButton::Inset );
 	zoom_out_full_button.set_tweaks ((ArdourButton::Tweaks) (ArdourButton::ShowClick) );
 	zoom_out_full_button.set_image(::get_icon ("zoom_full"));
 	act = ActionManager::get_action (X_("Editor"), X_("zoom-to-session"));
@@ -2948,7 +2948,7 @@ Editor::setup_toolbar ()
 
 	zoom_focus_selector.set_name ("zoom button");
 	zoom_focus_selector.set_size_request (80, -1);
-//	zoom_focus_selector.add_elements (ArdourButton::FlatFace);
+//	zoom_focus_selector.add_elements (ArdourButton::Inset);
 
 	_zoom_box.pack_start (zoom_out_button, false, false);
 	_zoom_box.pack_start (zoom_in_button, false, false);
@@ -2958,7 +2958,7 @@ Editor::setup_toolbar ()
 
 	/* Track zoom buttons */
 	visible_tracks_selector.set_name ("zoom button");
-//	visible_tracks_selector.add_elements ( ArdourButton::FlatFace );
+//	visible_tracks_selector.add_elements ( ArdourButton::Inset );
 	set_size_request_to_display_given_text (visible_tracks_selector, _("all"), 40, 2);
 
 	tav_expand_button.set_name ("zoom button");
@@ -2998,15 +2998,15 @@ Editor::setup_toolbar ()
 
 	snap_type_selector.set_name ("mouse mode button");
 	snap_type_selector.set_size_request (140, -1);
-	snap_type_selector.add_elements (ArdourButton::FlatFace);
+	snap_type_selector.add_elements (ArdourButton::Inset);
 
 	snap_mode_selector.set_name ("mouse mode button");
 	snap_mode_selector.set_size_request (85, -1);
-	snap_mode_selector.add_elements (ArdourButton::FlatFace);
+	snap_mode_selector.add_elements (ArdourButton::Inset);
 
 	edit_point_selector.set_name ("mouse mode button");
 	edit_point_selector.set_size_request (85, -1);
-	edit_point_selector.add_elements (ArdourButton::FlatFace);
+	edit_point_selector.add_elements (ArdourButton::Inset);
 
 	snap_box.pack_start (snap_mode_selector, false, false);
 	snap_box.pack_start (snap_type_selector, false, false);
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index cb7345438f..dcd92c47e1 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -414,49 +414,49 @@ Editor::register_actions ()
 	smart_mode_action = Glib::RefPtr<ToggleAction>::cast_static (act);
 	smart_mode_button.set_related_action (smart_mode_action);
 	smart_mode_button.set_text (_("Smart"));
-	smart_mode_button.add_elements ( ArdourButton::FlatFace );
+	smart_mode_button.add_elements ( ArdourButton::Inset );
 	smart_mode_button.set_name ("mouse mode button");
 
 	act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-object", _("Object Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject));
 	mouse_move_button.set_related_action (act);
 	mouse_move_button.set_image (::get_icon("tool_object"));
-	mouse_move_button.add_elements ( ArdourButton::FlatFace );
+	mouse_move_button.add_elements ( ArdourButton::Inset );
 	mouse_move_button.set_name ("mouse mode button");
 
 	act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-range", _("Range Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange));	
 	mouse_select_button.set_related_action (act);
 	mouse_select_button.set_image (::get_icon("tool_range"));
-	mouse_select_button.add_elements ( ArdourButton::FlatFace );
+	mouse_select_button.add_elements ( ArdourButton::Inset );
 	mouse_select_button.set_name ("mouse mode button");
 
 	act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-draw", _("Note Drawing Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseDraw));	
 	mouse_draw_button.set_related_action (act);
 	mouse_draw_button.set_image (::get_icon("midi_tool_pencil"));
-	mouse_draw_button.add_elements ( ArdourButton::FlatFace );
+	mouse_draw_button.add_elements ( ArdourButton::Inset );
 	mouse_draw_button.set_name ("mouse mode button");
 
 	act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-gain", _("Gain Tool"), sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain));	
 	mouse_gain_button.set_related_action (act);
 	mouse_gain_button.set_image (::get_icon("tool_gain"));
-	mouse_gain_button.add_elements ( ArdourButton::FlatFace );
+	mouse_gain_button.add_elements ( ArdourButton::Inset );
 	mouse_gain_button.set_name ("mouse mode button");
 
 	act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-zoom", _("Zoom Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom));	
 	mouse_zoom_button.set_related_action (act);
 	mouse_zoom_button.set_image (::get_icon("tool_zoom"));
-	mouse_zoom_button.add_elements ( ArdourButton::FlatFace );
+	mouse_zoom_button.add_elements ( ArdourButton::Inset );
 	mouse_zoom_button.set_name ("mouse mode button");
 
 	act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-audition", _("Audition Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition));	
 	mouse_audition_button.set_related_action (act);
 	mouse_audition_button.set_image (::get_icon("tool_audition"));
-	mouse_audition_button.add_elements ( ArdourButton::FlatFace );
+	mouse_audition_button.add_elements ( ArdourButton::Inset );
 	mouse_audition_button.set_name ("mouse mode button");
 
 	act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-timefx", _("Time FX Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX));	
 	mouse_timefx_button.set_related_action (act);
 	mouse_timefx_button.set_image (::get_icon("tool_stretch"));
-	mouse_timefx_button.add_elements ( ArdourButton::FlatFace );
+	mouse_timefx_button.add_elements ( ArdourButton::Inset );
 	mouse_timefx_button.set_name ("mouse mode button");
 
 	ActionManager::register_action (editor_actions, "step-mouse-mode", _("Step Mouse Mode"), sigc::bind (sigc::mem_fun(*this, &Editor::step_mouse_mode), true));
@@ -464,7 +464,7 @@ Editor::register_actions ()
 	act = ActionManager::register_toggle_action (mouse_mode_actions, "toggle-internal-edit", _("Edit MIDI"), sigc::mem_fun(*this, &Editor::toggle_internal_editing));
 	internal_edit_button.set_related_action (act);
 	internal_edit_button.set_image (::get_icon("tool_note"));
-	internal_edit_button.add_elements ( ArdourButton::FlatFace );
+	internal_edit_button.add_elements ( ArdourButton::Inset );
 	internal_edit_button.set_name ("mouse mode button");
 
 	RadioAction::Group edit_point_group;