diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index baebe182e6..a3c6a27298 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -264,7 +264,7 @@ AddRouteDialog::AddRouteDialog ()
 	++n;
 
 	/* Number */
-	add_label.set_alignment (Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
+	add_label.set_alignment (Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
 	settings_table->attach (add_label, 0, 1, n, n + 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
 	Gtk::Alignment *align = manage (new Alignment (0, .5, 0, 0));
 	align->add (routes_spinner);
@@ -273,24 +273,24 @@ AddRouteDialog::AddRouteDialog ()
 	++n;
 
 	/* Name */
-	name_label.set_alignment (Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
+	name_label.set_alignment (Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
 	settings_table->attach (name_label, 0, 1, n, n + 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
 	settings_table->attach (name_template_entry, 1, 3, n, n + 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
 
 	/* Route configuration */
-	configuration_label.set_alignment (Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
+	configuration_label.set_alignment (Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
 	settings_table->attach (configuration_label, 4, 5, n, n + 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
 	settings_table->attach (channel_combo, 5, 6, n, n + 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
 
 	++n;
 
 	/* instrument choice (for MIDI) */
-	instrument_label.set_alignment (Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
+	instrument_label.set_alignment (Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
 	settings_table->attach (instrument_label, 0, 1, n, n + 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
 	settings_table->attach (instrument_combo, 1, 3, n, n + 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
 
 	/* Group choice */
-	group_label.set_alignment (Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
+	group_label.set_alignment (Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
 	settings_table->attach (group_label, 4, 5, n, n + 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
 	settings_table->attach (route_group_combo, 5, 6, n, n + 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
 
@@ -300,7 +300,7 @@ AddRouteDialog::AddRouteDialog ()
 	if (Profile->get_mixbus ()) {
 		strict_io_combo.set_active (1);
 	} else {
-		strict_io_label.set_alignment (Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
+		strict_io_label.set_alignment (Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
 		settings_table->attach (strict_io_label, 0, 1, n, n + 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
 		settings_table->attach (strict_io_combo, 1, 3, n, n + 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
 
@@ -308,7 +308,7 @@ AddRouteDialog::AddRouteDialog ()
 				_("With strict-i/o enabled, Effect Processors will not modify the number of channels on a track. The number of output channels will always match the number of input channels."));
 
 		/* recording mode */
-		mode_label.set_alignment (Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
+		mode_label.set_alignment (Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
 		settings_table->attach (mode_label, 4, 5, n, n + 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
 		settings_table->attach (mode_combo, 5, 6, n, n + 1, Gtk::FILL, Gtk::SHRINK, 0, 0);
 
@@ -321,7 +321,7 @@ AddRouteDialog::AddRouteDialog ()
 	outer_box->set_spacing (4);
 
 	/* New route will be inserted at.. */
-	insert_label.set_alignment (Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
+	insert_label.set_alignment (Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
 	outer_box->pack_start (insert_label, false, false);
 	outer_box->pack_start (insert_at_combo, false, false);
 	outer_box->pack_start (show_on_cue_chkbox, false, false);
diff --git a/gtk2_ardour/add_video_dialog.cc b/gtk2_ardour/add_video_dialog.cc
index 97a1b205ca..9a49174086 100644
--- a/gtk2_ardour/add_video_dialog.cc
+++ b/gtk2_ardour/add_video_dialog.cc
@@ -155,16 +155,16 @@ AddVideoDialog::AddVideoDialog (Session* s)
 	l = manage (new Label (_("<b>Video Information</b>"), Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER, false));
 	l->set_use_markup ();
 	table->attach (*l, 0, 2, 0, 1, FILL, FILL);
-	l = manage (new Label (_("Start:"), Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER, false));
+	l = manage (new Label (_("Start:"), Gtk::ALIGN_END, Gtk::ALIGN_CENTER, false));
 	table->attach (*l, 0, 1, 1, 2, FILL, FILL);
 	table->attach (pi_tcin, 1, 2, 1, 2, FILL, FILL);
-	l = manage (new Label (_("End:"), Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER, false));
+	l = manage (new Label (_("End:"), Gtk::ALIGN_END, Gtk::ALIGN_CENTER, false));
 	table->attach (*l, 0, 1, 2, 3, FILL, FILL);
 	table->attach (pi_tcout, 1, 2, 2, 3, FILL, FILL);
-	l = manage (new Label (_("Frame rate:"), Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER, false));
+	l = manage (new Label (_("Frame rate:"), Gtk::ALIGN_END, Gtk::ALIGN_CENTER, false));
 	table->attach (*l, 0, 1, 3, 4, FILL, FILL);
 	table->attach (pi_fps, 1, 2, 3, 4, FILL, FILL);
-	l = manage (new Label (_("Aspect Ratio:"), Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER, false));
+	l = manage (new Label (_("Aspect Ratio:"), Gtk::ALIGN_END, Gtk::ALIGN_CENTER, false));
 	table->attach (*l, 0, 1, 4, 5, FILL, FILL);
 	table->attach (pi_aspect, 1, 2, 4, 5, FILL, FILL);
 
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 88ed561517..27f3f51a16 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -619,8 +619,8 @@ ARDOUR_UI::setup_transport ()
 	transport_table.attach (io_latency_value, TCOL, 1, 2 , SHRINK, EXPAND|FILL, hpadding, 0);
 	++col;
 
-	route_latency_value.set_alignment (Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
-	io_latency_value.set_alignment (Gtk::ALIGN_RIGHT, Gtk::ALIGN_CENTER);
+	route_latency_value.set_alignment (Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
+	io_latency_value.set_alignment (Gtk::ALIGN_END, Gtk::ALIGN_CENTER);
 
 	transport_table.attach (latency_spacer, TCOL, 0, 2 , SHRINK, EXPAND|FILL, 3, 0);
 	++col;
diff --git a/gtk2_ardour/dsp_stats_ui.cc b/gtk2_ardour/dsp_stats_ui.cc
index fa6abb2227..f3d7de1402 100644
--- a/gtk2_ardour/dsp_stats_ui.cc
+++ b/gtk2_ardour/dsp_stats_ui.cc
@@ -38,7 +38,7 @@ using namespace Gtkmm2ext;
 using namespace Gtk;
 
 DspStatisticsGUI::DspStatisticsGUI ()
-	: buffer_size_label ("", ALIGN_RIGHT, ALIGN_CENTER)
+	: buffer_size_label ("", ALIGN_END, ALIGN_CENTER)
 	, reset_button (_("Reset"))
 {
 	const size_t nlabels = Session::NTT + AudioEngine::NTT + AudioBackend::NTT;
@@ -48,34 +48,34 @@ DspStatisticsGUI::DspStatisticsGUI ()
 	snprintf (buf, sizeof (buf), "%7.2f msec %6.2f%%", 10000.0, 100.0);
 
 	for (size_t n = 0; n < nlabels; ++n) {
-		labels[n] = new Label ("", ALIGN_RIGHT, ALIGN_CENTER);
+		labels[n] = new Label ("", ALIGN_END, ALIGN_CENTER);
 		set_size_request_to_display_given_text (*labels[n], buf, 0, 0);
 	}
 
 	int row = 0;
 
-	table.attach (*manage (new Gtk::Label (_("Buffer size: "), ALIGN_RIGHT, ALIGN_CENTER)), 0, 1, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
+	table.attach (*manage (new Gtk::Label (_("Buffer size: "), ALIGN_END, ALIGN_CENTER)), 0, 1, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
 	table.attach (buffer_size_label, 2, 3, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
 	row++;
 
-	table.attach (*manage (new Gtk::Label (_("Idle: "), ALIGN_RIGHT, ALIGN_CENTER)), 0, 1, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
+	table.attach (*manage (new Gtk::Label (_("Idle: "), ALIGN_END, ALIGN_CENTER)), 0, 1, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
 	table.attach (*labels[AudioEngine::NTT + Session::NTT + AudioBackend::DeviceWait], 2, 3, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
 	row++;
 
-	table.attach (*manage (new Gtk::Label (_("DSP: "), ALIGN_RIGHT, ALIGN_CENTER)), 0, 1, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
+	table.attach (*manage (new Gtk::Label (_("DSP: "), ALIGN_END, ALIGN_CENTER)), 0, 1, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
 	table.attach (*labels[AudioEngine::NTT + Session::NTT + AudioBackend::RunLoop], 2, 3, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
 	row++;
 
-	Label* right_angle_text1 = manage (new Label ("\xe2\x94\x94", ALIGN_RIGHT, ALIGN_CENTER));
+	Label* right_angle_text1 = manage (new Label ("\xe2\x94\x94", ALIGN_END, ALIGN_CENTER));
 
-	table.attach (*manage (new Gtk::Label (_("Engine: "), ALIGN_RIGHT, ALIGN_CENTER)), 1, 2, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
+	table.attach (*manage (new Gtk::Label (_("Engine: "), ALIGN_END, ALIGN_CENTER)), 1, 2, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
 	table.attach (*right_angle_text1, 0, 1, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
 	table.attach (*labels[AudioEngine::ProcessCallback], 2, 3, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
 	row++;
 
-	Label* right_angle_text2 = manage (new Label ("\xe2\x94\x94", ALIGN_RIGHT, ALIGN_CENTER));
+	Label* right_angle_text2 = manage (new Label ("\xe2\x94\x94", ALIGN_END, ALIGN_CENTER));
 
-	table.attach (*manage (new Gtk::Label (_("Session: "), ALIGN_RIGHT, ALIGN_CENTER)), 1, 2, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
+	table.attach (*manage (new Gtk::Label (_("Session: "), ALIGN_END, ALIGN_CENTER)), 1, 2, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
 	table.attach (*right_angle_text2, 0, 1, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
 	table.attach (*labels[AudioEngine::NTT + Session::OverallProcess], 2, 3, row, row+1, Gtk::FILL, Gtk::SHRINK, 2, 0);
 	row++;
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index d75123165c..f687a14344 100644
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -75,9 +75,9 @@ EditorRegions::init ()
 	TreeViewColumn* tvc;
 
 	tvc = append_col (_columns.start, bbt_width);
-	setup_col (tvc, 16, ALIGN_RIGHT, _("Start"), _("Position of start of region"));
+	setup_col (tvc, 16, ALIGN_END, _("Start"), _("Position of start of region"));
 	tvc = append_col (_columns.length, bbt_width);
-	setup_col (tvc, 4, ALIGN_RIGHT, _("Length"), _("Length of the region"));
+	setup_col (tvc, 4, ALIGN_END, _("Length"), _("Length of the region"));
 
 	tvc = append_col (_columns.locked, cb_width);
 	setup_col (tvc, -1, ALIGN_CENTER, S_("Lock|L"), _("Region position locked?"));
@@ -97,13 +97,13 @@ EditorRegions::init ()
 
 #ifdef SHOW_REGION_EXTRAS
 	tvc = append_col (_columns.end, bbt_width);
-	setup_col (tvc, 5, ALIGN_RIGHT, _("End"), _("Position of end of region"));
+	setup_col (tvc, 5, ALIGN_END, _("End"), _("Position of end of region"));
 	tvc = append_col (_columns.sync, bbt_width);
-	setup_col (tvc, -1, ALIGN_RIGHT, _("Sync"), _("Position of region sync point, relative to start of the region"));
+	setup_col (tvc, -1, ALIGN_END, _("Sync"), _("Position of region sync point, relative to start of the region"));
 	tvc = append_col (_columns.fadein, bbt_width);
-	setup_col (tvc, -1, ALIGN_RIGHT, _("Fade In"), _("Length of region fade-in (unit: secondary clock, enclosed in parenthesis if the fade is disabled)"));
+	setup_col (tvc, -1, ALIGN_END, _("Fade In"), _("Length of region fade-in (unit: secondary clock, enclosed in parenthesis if the fade is disabled)"));
 	tvc = append_col (_columns.fadeout, bbt_width);
-	setup_col (tvc, -1, ALIGN_RIGHT, _("Fade out"), _("Length of region fade-out (unit: secondary clock, enclosed in parenthesis if the fade is disabled)"));
+	setup_col (tvc, -1, ALIGN_END, _("Fade out"), _("Length of region fade-out (unit: secondary clock, enclosed in parenthesis if the fade is disabled)"));
 #endif
 }
 
diff --git a/gtk2_ardour/editor_sources.cc b/gtk2_ardour/editor_sources.cc
index 8072179173..1369605aee 100644
--- a/gtk2_ardour/editor_sources.cc
+++ b/gtk2_ardour/editor_sources.cc
@@ -86,12 +86,12 @@ EditorSources::init ()
 
 	setup_col (append_col (_columns.channels, "Chans    "), 1, ALIGN_START, _("# Ch"), _("# Channels in the region"));
 	setup_col (append_col (_columns.captd_for, date_width), 17, ALIGN_START, _("Captured For"), _("Original Track this was recorded on"));
-	setup_col (append_col (_columns.captd_xruns, "1234567890"), 21, ALIGN_RIGHT, _("# Xruns"), _("Number of dropouts that occurred during recording"));
+	setup_col (append_col (_columns.captd_xruns, "1234567890"), 21, ALIGN_END, _("# Xruns"), _("Number of dropouts that occurred during recording"));
 
 	add_tag_column ();
 
 	setup_col (append_col (_columns.take_id, date_width), 18, ALIGN_START, _("Take ID"), _("Take ID"));
-	setup_col (append_col (_columns.natural_pos, bbt_width), 20, ALIGN_RIGHT, _("Orig Pos"), _("Original Position of the file on timeline, when it was recorded"));
+	setup_col (append_col (_columns.natural_pos, bbt_width), 20, ALIGN_END, _("Orig Pos"), _("Original Position of the file on timeline, when it was recorded"));
 
 	TreeViewColumn* tvc = append_col (_columns.path, bbt_width);
 	setup_col (tvc, 13, ALIGN_START, _("Path"), _("Path (folder) of the file location"));
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index 3a78f14a23..c7eb6bb2b1 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -59,7 +59,7 @@ ExportDialog::ExportDialog (PublicEditor & editor, std::string title, ARDOUR::Ex
   , type (type)
   , editor (editor)
   , warn_label ("", Gtk::ALIGN_START)
-  , list_files_label (_("<span color=\"#ffa755\">Some already existing files will be overwritten.</span>"), Gtk::ALIGN_RIGHT)
+  , list_files_label (_("<span color=\"#ffa755\">Some already existing files will be overwritten.</span>"), Gtk::ALIGN_END)
   , list_files_button (_("List files"))
   , previous_progress (0)
   , _initialized (false)
diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc
index dd7cbb1399..51ce6d0f75 100644
--- a/gtk2_ardour/export_format_dialog.cc
+++ b/gtk2_ardour/export_format_dialog.cc
@@ -78,7 +78,7 @@ ExportFormatDialog::ExportFormatDialog (FormatPtr format, bool new_dialog)
 	, format_label (_("File format"), Gtk::ALIGN_START)
 	, sample_rate_label (_("Sample rate"), Gtk::ALIGN_START)
 
-	, src_quality_label (_("Sample rate conversion quality:"), Gtk::ALIGN_RIGHT)
+	, src_quality_label (_("Sample rate conversion quality:"), Gtk::ALIGN_END)
 
 	/* Watermarking */
 	, watermark_heading (_("Preview / Watermark"), Gtk::ALIGN_START)
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 6a874a4b4c..aa74166dbd 100644
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -660,7 +660,7 @@ GenericPluginUI::build_midi_table ()
 		cui->set_text_ellipsize (Pango::ELLIPSIZE_END);
 		cui->set_layout_ellipsize_width (PANGO_SCALE * 112 * UIConfiguration::instance ().get_ui_scale ());
 		midi_pgmsel.push_back (cui);
-		pgm_table->attach (*manage (new Label (string_compose ("C%1:", (int)(chn + 1)), ALIGN_RIGHT)), col, col + 1, row, row+1, FILL, SHRINK);
+		pgm_table->attach (*manage (new Label (string_compose ("C%1:", (int)(chn + 1)), ALIGN_END)), col, col + 1, row, row+1, FILL, SHRINK);
 		pgm_table->attach (*cui, col + 1, col + 2, row, row+1, SHRINK, SHRINK);
 	}
 
diff --git a/gtk2_ardour/idleometer.cc b/gtk2_ardour/idleometer.cc
index 5e60f11bbe..e294343180 100644
--- a/gtk2_ardour/idleometer.cc
+++ b/gtk2_ardour/idleometer.cc
@@ -47,30 +47,30 @@ IdleOMeter::IdleOMeter ()
 	get_vbox()->pack_start (*hbox, false, false);
 	get_vbox()->pack_start (*b, false, false);
 
-	_label_cur.set_alignment (ALIGN_RIGHT, ALIGN_CENTER);
-	_label_min.set_alignment (ALIGN_RIGHT, ALIGN_CENTER);
-	_label_max.set_alignment (ALIGN_RIGHT, ALIGN_CENTER);
-	_label_avg.set_alignment (ALIGN_RIGHT, ALIGN_CENTER);
-	_label_dev.set_alignment (ALIGN_RIGHT, ALIGN_CENTER);
+	_label_cur.set_alignment (ALIGN_END, ALIGN_CENTER);
+	_label_min.set_alignment (ALIGN_END, ALIGN_CENTER);
+	_label_max.set_alignment (ALIGN_END, ALIGN_CENTER);
+	_label_avg.set_alignment (ALIGN_END, ALIGN_CENTER);
+	_label_dev.set_alignment (ALIGN_END, ALIGN_CENTER);
 	_label_acq.set_alignment (ALIGN_CENTER, ALIGN_CENTER);
 
 	int row = 0;
-	t->attach (*manage (new Label (_("Current:"), ALIGN_RIGHT)), 0, 1, row, row + 1, FILL, SHRINK);
+	t->attach (*manage (new Label (_("Current:"), ALIGN_END)), 0, 1, row, row + 1, FILL, SHRINK);
 	t->attach (_label_cur, 1, 2, row, row + 1, FILL, SHRINK);
 	++row;
-	t->attach (*manage (new Label (_("Min:"),     ALIGN_RIGHT)), 0, 1, row, row + 1, FILL, SHRINK);
+	t->attach (*manage (new Label (_("Min:"),     ALIGN_END)), 0, 1, row, row + 1, FILL, SHRINK);
 	t->attach (_label_min, 1, 2, row, row + 1, FILL, SHRINK);
 	++row;
-	t->attach (*manage (new Label (_("Max:"),     ALIGN_RIGHT)), 0, 1, row, row + 1, FILL, SHRINK);
+	t->attach (*manage (new Label (_("Max:"),     ALIGN_END)), 0, 1, row, row + 1, FILL, SHRINK);
 	t->attach (_label_max, 1, 2, row, row + 1, FILL, SHRINK);
 	++row;
-	t->attach (*manage (new Label (_("Mean:"),    ALIGN_RIGHT)), 0, 1, row, row + 1, FILL, SHRINK);
+	t->attach (*manage (new Label (_("Mean:"),    ALIGN_END)), 0, 1, row, row + 1, FILL, SHRINK);
 	t->attach (_label_avg, 1, 2, row, row + 1, FILL, SHRINK);
 	++row;
-	t->attach (*manage (new Label (_("\u03c3:"),  ALIGN_RIGHT)), 0, 1, row, row + 1, FILL, SHRINK);
+	t->attach (*manage (new Label (_("\u03c3:"),  ALIGN_END)), 0, 1, row, row + 1, FILL, SHRINK);
 	t->attach (_label_dev, 1, 2, row, row + 1, FILL, SHRINK);
 	++row;
-	t->attach (*manage (new Label (_("Elapsed:"),  ALIGN_RIGHT)), 0, 1, row, row + 1, FILL, SHRINK);
+	t->attach (*manage (new Label (_("Elapsed:"),  ALIGN_END)), 0, 1, row, row + 1, FILL, SHRINK);
 	t->attach (_label_acq, 1, 2, row, row + 1, FILL, SHRINK);
 }
 
diff --git a/gtk2_ardour/loudness_dialog.cc b/gtk2_ardour/loudness_dialog.cc
index 0a12c726df..14ef9b55a4 100644
--- a/gtk2_ardour/loudness_dialog.cc
+++ b/gtk2_ardour/loudness_dialog.cc
@@ -253,22 +253,22 @@ LoudnessDialog::LoudnessDialog (Session* s, TimelineRange const& ar, bool as)
 		  "<b>When disabled</b>, the gain is applied directly to the output of the master-bus. This results in an efficient and reliable volume adjustment."
 		 ));
 
-	_dbfs_label.set_alignment (ALIGN_RIGHT);
-	_dbtp_label.set_alignment (ALIGN_RIGHT);
-	_lufs_i_label.set_alignment (ALIGN_RIGHT);
-	_lufs_s_label.set_alignment (ALIGN_RIGHT);
-	_lufs_m_label.set_alignment (ALIGN_RIGHT);
+	_dbfs_label.set_alignment (ALIGN_END);
+	_dbtp_label.set_alignment (ALIGN_END);
+	_lufs_i_label.set_alignment (ALIGN_END);
+	_lufs_s_label.set_alignment (ALIGN_END);
+	_lufs_m_label.set_alignment (ALIGN_END);
 
-	_delta_dbfs_label.set_alignment (ALIGN_RIGHT);
-	_delta_dbtp_label.set_alignment (ALIGN_RIGHT);
-	_delta_lufs_i_label.set_alignment (ALIGN_RIGHT);
-	_delta_lufs_s_label.set_alignment (ALIGN_RIGHT);
-	_delta_lufs_m_label.set_alignment (ALIGN_RIGHT);
+	_delta_dbfs_label.set_alignment (ALIGN_END);
+	_delta_dbtp_label.set_alignment (ALIGN_END);
+	_delta_lufs_i_label.set_alignment (ALIGN_END);
+	_delta_lufs_s_label.set_alignment (ALIGN_END);
+	_delta_lufs_m_label.set_alignment (ALIGN_END);
 
-	_gain_norm_label.set_alignment (ALIGN_RIGHT);
-	_gain_out_label.set_alignment (ALIGN_RIGHT);
-	_gain_total_label.set_alignment (ALIGN_RIGHT);
-	_gain_exceeds_label.set_alignment (ALIGN_RIGHT);
+	_gain_norm_label.set_alignment (ALIGN_END);
+	_gain_out_label.set_alignment (ALIGN_END);
+	_gain_total_label.set_alignment (ALIGN_END);
+	_gain_exceeds_label.set_alignment (ALIGN_END);
 
 	HBox* hb = manage (new (HBox));
 	hb->pack_start (_loudness_graph, true, false);
diff --git a/gtk2_ardour/luadialog.cc b/gtk2_ardour/luadialog.cc
index a6c54185f7..9058f57b1b 100644
--- a/gtk2_ardour/luadialog.cc
+++ b/gtk2_ardour/luadialog.cc
@@ -623,7 +623,7 @@ Dialog::Dialog (std::string const& title, luabridge::LuaRef lr)
 				if (align == "left") {
 					xalign = Gtk::ALIGN_START;
 				} else if (align == "right") {
-					xalign = Gtk::ALIGN_RIGHT;
+					xalign = Gtk::ALIGN_END;
 				}
 			}
 			w = new LuaDialogHeading (title, xalign);
@@ -634,7 +634,7 @@ Dialog::Dialog (std::string const& title, luabridge::LuaRef lr)
 				if (align == "left") {
 					xalign = Gtk::ALIGN_START;
 				} else if (align == "right") {
-					xalign = Gtk::ALIGN_RIGHT;
+					xalign = Gtk::ALIGN_END;
 				}
 			}
 			w = new LuaDialogLabel (title, xalign);
diff --git a/gtk2_ardour/plugin_dspload_ui.cc b/gtk2_ardour/plugin_dspload_ui.cc
index 3b2e3f50e7..48598d421e 100644
--- a/gtk2_ardour/plugin_dspload_ui.cc
+++ b/gtk2_ardour/plugin_dspload_ui.cc
@@ -30,10 +30,10 @@ using namespace Gtk;
 
 PluginLoadStatsGui::PluginLoadStatsGui (boost::shared_ptr<ARDOUR::PluginInsert> insert)
 	: _insert (insert)
-	, _lbl_min ("", ALIGN_RIGHT, ALIGN_CENTER)
-	, _lbl_max ("", ALIGN_RIGHT, ALIGN_CENTER)
-	, _lbl_avg ("", ALIGN_RIGHT, ALIGN_CENTER)
-	, _lbl_dev ("", ALIGN_RIGHT, ALIGN_CENTER)
+	, _lbl_min ("", ALIGN_END, ALIGN_CENTER)
+	, _lbl_max ("", ALIGN_END, ALIGN_CENTER)
+	, _lbl_avg ("", ALIGN_END, ALIGN_CENTER)
+	, _lbl_dev ("", ALIGN_END, ALIGN_CENTER)
 	, _reset_button (_("Reset"))
 	, _valid (false)
 {
@@ -43,13 +43,13 @@ PluginLoadStatsGui::PluginLoadStatsGui (boost::shared_ptr<ARDOUR::PluginInsert>
 	set_size_request_to_display_given_text (_lbl_dev, string_compose (_("%1 [ms]"), 99.123), 0, 0);
 	_darea.set_size_request (360, 32); // TODO  max (320, 360 * UIConfiguration::instance().get_ui_scale ())
 
-	attach (*manage (new Gtk::Label (_("Minimum"), ALIGN_RIGHT, ALIGN_CENTER)),
+	attach (*manage (new Gtk::Label (_("Minimum"), ALIGN_END, ALIGN_CENTER)),
 			0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 0);
-	attach (*manage (new Gtk::Label (_("Maximum"), ALIGN_RIGHT, ALIGN_CENTER)),
+	attach (*manage (new Gtk::Label (_("Maximum"), ALIGN_END, ALIGN_CENTER)),
 			0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, 2, 0);
-	attach (*manage (new Gtk::Label (_("Average"), ALIGN_RIGHT, ALIGN_CENTER)),
+	attach (*manage (new Gtk::Label (_("Average"), ALIGN_END, ALIGN_CENTER)),
 			0, 1, 2, 3, Gtk::FILL, Gtk::SHRINK, 2, 0);
-	attach (*manage (new Gtk::Label (_("Std.Dev"), ALIGN_RIGHT, ALIGN_CENTER)),
+	attach (*manage (new Gtk::Label (_("Std.Dev"), ALIGN_END, ALIGN_CENTER)),
 			0, 1, 3, 4, Gtk::FILL, Gtk::SHRINK, 2, 0);
 
 	attach (_lbl_min, 1, 2, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 0);
diff --git a/gtk2_ardour/plugin_manager_ui.cc b/gtk2_ardour/plugin_manager_ui.cc
index b434fb7c51..fbc6fc84e3 100644
--- a/gtk2_ardour/plugin_manager_ui.cc
+++ b/gtk2_ardour/plugin_manager_ui.cc
@@ -606,37 +606,37 @@ PluginManagerUI::refill ()
 	}
 
 	Label* head_type  = new Label (_("Type"), ALIGN_START, ALIGN_CENTER);
-	Label* head_count = new Label (_("Total"), ALIGN_RIGHT, ALIGN_CENTER);
+	Label* head_count = new Label (_("Total"), ALIGN_END, ALIGN_CENTER);
 	_tbl_nfo.attach (*head_type,  0, 1, row, row + 1, SHRINK | FILL, SHRINK, 2, 2);
 	_tbl_nfo.attach (*head_count, 1, 2, row, row + 1, SHRINK | FILL, SHRINK, 2, 2);
 	if (pc_max.error > 0) {
-		Label* hd = new Label (_("Err"), ALIGN_RIGHT, ALIGN_CENTER);
+		Label* hd = new Label (_("Err"), ALIGN_END, ALIGN_CENTER);
 		_tbl_nfo.attach (*hd, 2, 3, row, row + 1, SHRINK | FILL, SHRINK, 2, 2);
 	}
 	if (pc_max.stale > 0) {
-		Label* hd = new Label (_("Mis"), ALIGN_RIGHT, ALIGN_CENTER);
+		Label* hd = new Label (_("Mis"), ALIGN_END, ALIGN_CENTER);
 		_tbl_nfo.attach (*hd, 3, 4, row, row + 1, SHRINK | FILL, SHRINK, 2, 2);
 	}
 	if (pc_max.ndscn > 0) {
-		Label* hd = new Label (_("New"), ALIGN_RIGHT, ALIGN_CENTER);
+		Label* hd = new Label (_("New"), ALIGN_END, ALIGN_CENTER);
 		_tbl_nfo.attach (*hd, 4, 5, row, row + 1, SHRINK | FILL, SHRINK, 2, 2);
 	}
 	++row;
 	for (std::map<PluginType, PluginCount>::const_iterator i = plugin_count.begin (); i != plugin_count.end (); ++i, ++row) {
 		Label* lbl_type  = new Label (plugin_type (i->first), ALIGN_START, ALIGN_CENTER);
-		Label* lbl_count = new Label (string_compose ("%1", i->second.total), ALIGN_RIGHT, ALIGN_CENTER);
+		Label* lbl_count = new Label (string_compose ("%1", i->second.total), ALIGN_END, ALIGN_CENTER);
 		_tbl_nfo.attach (*lbl_type,  0, 1, row, row + 1, EXPAND | FILL, SHRINK, 2, 2);
 		_tbl_nfo.attach (*lbl_count, 1, 2, row, row + 1, SHRINK | FILL, SHRINK, 2, 2);
 		if (pc_max.error > 0) {
-			Label* lbl = new Label (string_compose ("%1", i->second.error), ALIGN_RIGHT, ALIGN_CENTER);
+			Label* lbl = new Label (string_compose ("%1", i->second.error), ALIGN_END, ALIGN_CENTER);
 			_tbl_nfo.attach (*lbl, 2, 3, row, row + 1, SHRINK | FILL, SHRINK, 2, 2);
 		}
 		if (pc_max.stale > 0) {
-			Label* lbl = new Label (string_compose ("%1", i->second.stale), ALIGN_RIGHT, ALIGN_CENTER);
+			Label* lbl = new Label (string_compose ("%1", i->second.stale), ALIGN_END, ALIGN_CENTER);
 			_tbl_nfo.attach (*lbl, 3, 4, row, row + 1, SHRINK | FILL, SHRINK, 2, 2);
 		}
 		if (pc_max.ndscn > 0) {
-			Label* lbl = new Label (string_compose ("%1", i->second.ndscn), ALIGN_RIGHT, ALIGN_CENTER);
+			Label* lbl = new Label (string_compose ("%1", i->second.ndscn), ALIGN_END, ALIGN_CENTER);
 			_tbl_nfo.attach (*lbl, 4, 5, row, row + 1, SHRINK | FILL, SHRINK, 2, 2);
 		}
 	}
diff --git a/gtk2_ardour/region_list_base.cc b/gtk2_ardour/region_list_base.cc
index 6d8399eebf..38290f8a3d 100644
--- a/gtk2_ardour/region_list_base.cc
+++ b/gtk2_ardour/region_list_base.cc
@@ -133,7 +133,7 @@ RegionListBase::setup_col (TreeViewColumn* col, int sort_idx, Gtk::AlignmentEnum
 	/* ...and this sets the alignment for the data cells */
 	CellRendererText* renderer = dynamic_cast<CellRendererText*> (col->get_first_cell_renderer ());
 	if (renderer) {
-		renderer->property_xalign () = (al == ALIGN_RIGHT ? 1.0 : (al == ALIGN_START ? 0.0 : 0.5));
+		renderer->property_xalign () = (al == ALIGN_END ? 1.0 : (al == ALIGN_START ? 0.0 : 0.5));
 	}
 }
 
diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index 8f6cf2aa1f..28f436384b 100644
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -53,8 +53,8 @@ TempoDialog::TempoDialog (TempoMap::SharedPtr const & map, timepos_t const & pos
 	, end_bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
 	, end_bpm_spinner (end_bpm_adjustment)
 	, _end_bpm_label (_("End Beats per Minute:"), ALIGN_START, ALIGN_CENTER)
-	, when_bar_label (_("bar:"), ALIGN_RIGHT, ALIGN_CENTER)
-	, when_beat_label (_("beat:"), ALIGN_RIGHT, ALIGN_CENTER)
+	, when_bar_label (_("bar:"), ALIGN_END, ALIGN_CENTER)
+	, when_beat_label (_("beat:"), ALIGN_END, ALIGN_CENTER)
 	, pulse_selector_label (_("Pulse:"), ALIGN_START, ALIGN_CENTER)
 	, tap_tempo_button (_("Tap tempo"))
 {
@@ -73,8 +73,8 @@ TempoDialog::TempoDialog (TempoMap::SharedPtr const & map, TempoPoint& point, co
 	, end_bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0)
 	, end_bpm_spinner (end_bpm_adjustment)
 	, _end_bpm_label (_("End Beats per Minute:"), ALIGN_START, ALIGN_CENTER)
-	, when_bar_label (_("bar:"), ALIGN_RIGHT, ALIGN_CENTER)
-	, when_beat_label (_("beat:"), ALIGN_RIGHT, ALIGN_CENTER)
+	, when_bar_label (_("bar:"), ALIGN_END, ALIGN_CENTER)
+	, when_beat_label (_("beat:"), ALIGN_END, ALIGN_CENTER)
 	, pulse_selector_label (_("Pulse:"), ALIGN_START, ALIGN_CENTER)
 	, tap_tempo_button (_("Tap tempo"))
 {
@@ -563,9 +563,9 @@ MeterDialog::init (const Temporal::BBT_Time& when, double bpb, double divisor, b
 		lock_style.set_active_text (strings[0]); // "music"
 	}
 
-	Label* note_label = manage (new Label (_("Note value:"), ALIGN_RIGHT, ALIGN_CENTER));
-	Label* lock_label = manage (new Label (_("Lock style:"), ALIGN_RIGHT, ALIGN_CENTER));
-	Label* bpb_label = manage (new Label (_("Beats per bar:"), ALIGN_RIGHT, ALIGN_CENTER));
+	Label* note_label = manage (new Label (_("Note value:"), ALIGN_END, ALIGN_CENTER));
+	Label* lock_label = manage (new Label (_("Lock style:"), ALIGN_END, ALIGN_CENTER));
+	Label* bpb_label = manage (new Label (_("Beats per bar:"), ALIGN_END, ALIGN_CENTER));
 	Table* table = manage (new Table (3, 3));
 	table->set_spacings (6);
 
diff --git a/gtk2_ardour/trigger_jump_dialog.cc b/gtk2_ardour/trigger_jump_dialog.cc
index 6071f5fd57..94fb614242 100644
--- a/gtk2_ardour/trigger_jump_dialog.cc
+++ b/gtk2_ardour/trigger_jump_dialog.cc
@@ -64,7 +64,7 @@ TriggerJumpDialog::on_trigger_set ()
 
 		b->signal_clicked.connect(sigc::bind(sigc::mem_fun(*this, &TriggerJumpDialog::button_clicked), i));
 
-		Gtk::Label* l = manage(new Gtk::Label (cue_marker_name(i), ALIGN_RIGHT));
+		Gtk::Label* l = manage(new Gtk::Label (cue_marker_name(i), ALIGN_END));
 		_table.attach (*l, 0, 1, r,r+1, Gtk::FILL,        Gtk::FILL);
 		_table.attach (*b, 1, 2, r,r+1, Gtk::FILL|EXPAND, Gtk::FILL);
 
diff --git a/gtk2_ardour/trigger_source_list.cc b/gtk2_ardour/trigger_source_list.cc
index 7728c37ee7..b7d6d20b10 100644
--- a/gtk2_ardour/trigger_source_list.cc
+++ b/gtk2_ardour/trigger_source_list.cc
@@ -31,7 +31,7 @@ TriggerSourceList::TriggerSourceList ()
 	setup_col (append_col (_columns.channels, "Chans    "), 1, ALIGN_START, _("# Ch"), _("# Channels in the region"));
 	add_tag_column ();
 
-	setup_col (append_col (_columns.captd_xruns, "1234567890"), 21, ALIGN_RIGHT, _("# Xruns"), _("Number of dropouts that occurred during recording"));
+	setup_col (append_col (_columns.captd_xruns, "1234567890"), 21, ALIGN_END, _("# Xruns"), _("Number of dropouts that occurred during recording"));
 	setup_col (append_col (_columns.take_id, "2021-01-19 02:34:03"), 18, ALIGN_START, _("Take ID"), _("Take ID"));
 	_display.get_column (0)->set_resizable (true);
 }