diff --git a/rtdata/languages/default b/rtdata/languages/default
index 09f6fe9c1..6939f5722 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -117,7 +117,7 @@ FILEBROWSER_APPLYPROFILE;Apply
 FILEBROWSER_APPLYPROFILE_PARTIAL;Apply - partial
 FILEBROWSER_AUTODARKFRAME;Auto dark-frame
 FILEBROWSER_AUTOFLATFIELD;Auto flat-field
-FILEBROWSER_BROWSEPATHBUTTONHINT;Click to browse to the chosen path.
+FILEBROWSER_BROWSEPATHBUTTONHINT;Click to open specified path, reload folder and apply "find" keywords.
 FILEBROWSER_BROWSEPATHHINT;Type a path to navigate to.\n\nKeyboard shortcuts:\n<b>Ctrl-o</b> to focus to the path text box.\n<b>Enter</b> / <b>Ctrl-Enter</b> to browse there;\n<b>Esc</b> to clear changes.\n<b>Shift-Esc</b> to remove focus.\n\nPath shortcuts:\n<b>~</b>	- user's home directory.\n<b>!</b>	- user's pictures directory
 FILEBROWSER_CACHE;Cache
 FILEBROWSER_CACHECLEARFROMFULL;Clear all including cached profiles
@@ -887,7 +887,7 @@ MAIN_FRAME_FILEBROWSER;File Browser
 MAIN_FRAME_FILEBROWSER_TOOLTIP;File browser.\nShortcut: <b>Ctrl-F2</b>
 MAIN_FRAME_PLACES;Places
 MAIN_FRAME_PLACES_ADD;Add
-MAIN_FRAME_PLACES_DEL;Del
+MAIN_FRAME_PLACES_DEL;Remove
 MAIN_FRAME_RECENT;Recent Folders
 MAIN_MSG_ALREADYEXISTS;File already exists.
 MAIN_MSG_CANNOTLOAD;Cannot load image
@@ -1264,6 +1264,11 @@ PROFILEPANEL_TOOLTIPCOPY;Copy current processing profile to clipboard.\n<b>Ctrl-
 PROFILEPANEL_TOOLTIPLOAD;Load a profile from file.\n<b>Ctrl-click</b> to select the parameters to load.
 PROFILEPANEL_TOOLTIPPASTE;Paste profile from clipboard.\n<b>Ctrl-click</b> to select the parameters to paste.
 PROFILEPANEL_TOOLTIPSAVE;Save current profile.\n<b>Ctrl-click</b> to select the parameters to save.
+PROGRESSBAR_DECODING;Decoding...
+PROGRESSBAR_GREENEQUIL;Green equilibration...
+PROGRESSBAR_HLREC;Highlight reconstruction...
+PROGRESSBAR_HOTDEADPIXELFILTER;Hot/dead pixel filter...
+PROGRESSBAR_LINEDENOISE;Line noise filter...
 PROGRESSBAR_LOADING;Loading image...
 PROGRESSBAR_LOADINGTHUMBS;Loading thumbnails...
 PROGRESSBAR_LOADJPEG;Loading JPEG file...
@@ -1272,6 +1277,7 @@ PROGRESSBAR_LOADTIFF;Loading TIFF file...
 PROGRESSBAR_NOIMAGES;No images found
 PROGRESSBAR_PROCESSING;Processing image...
 PROGRESSBAR_PROCESSING_PROFILESAVED;Processing profile saved
+PROGRESSBAR_RAWCACORR;Raw CA correction...
 PROGRESSBAR_READY;Ready
 PROGRESSBAR_SAVEJPEG;Saving JPEG file...
 PROGRESSBAR_SAVEPNG;Saving PNG file...
@@ -1538,7 +1544,7 @@ TP_CROP_GTTRIANGLE2;Golden Triangles 2
 TP_CROP_GUIDETYPE;Guide type:
 TP_CROP_H;Height
 TP_CROP_LABEL;Crop
-TP_CROP_PPI;PPI=
+TP_CROP_PPI;PPI
 TP_CROP_RESETCROP;Reset
 TP_CROP_SELECTCROP;Select
 TP_CROP_W;Width
@@ -1785,15 +1791,15 @@ TP_LABCURVE_RSTPRO_TOOLTIP;Works on the Chromaticity slider and the CC curve.
 TP_LENSGEOM_AUTOCROP;Auto-Crop
 TP_LENSGEOM_FILL;Auto-fill
 TP_LENSGEOM_LABEL;Lens / Geometry
-TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automatically
+TP_LENSPROFILE_CORRECTION_AUTOMATCH;Automatically selected
 TP_LENSPROFILE_CORRECTION_LCPFILE;LCP file
-TP_LENSPROFILE_CORRECTION_MANUAL;Manually
+TP_LENSPROFILE_CORRECTION_MANUAL;Manually selected
 TP_LENSPROFILE_LABEL;Profiled Lens Correction
 TP_LENSPROFILE_LENS_WARNING;Warning: the crop factor used for lens profiling is larger than the crop factor of the camera, the results might be wrong.
-TP_LENSPROFILE_MODE_HEADER;Select the lens profile:
+TP_LENSPROFILE_MODE_HEADER;Lens Profile
 TP_LENSPROFILE_USE_CA;Chromatic aberration
-TP_LENSPROFILE_USE_GEOMETRIC;Geometric
-TP_LENSPROFILE_USE_HEADER;Select distortions to correct:
+TP_LENSPROFILE_USE_GEOMETRIC;Geometric distortion
+TP_LENSPROFILE_USE_HEADER;Correct
 TP_LENSPROFILE_USE_VIGNETTING;Vignetting
 TP_LOCALCONTRAST_AMOUNT;Amount
 TP_LOCALCONTRAST_DARKNESS;Darkness level
@@ -1923,6 +1929,8 @@ TP_RAW_SENSOR_BAYER_LABEL;Sensor with Bayer Matrix
 TP_RAW_SENSOR_XTRANS_DMETHOD_TOOLTIP;3-pass gives best results (recommended for low ISO images).\n1-pass is almost undistinguishable from 3-pass for high ISO images and is faster.\n+fast gives less artifacts in flat areas
 TP_RAW_SENSOR_XTRANS_LABEL;Sensor with X-Trans Matrix
 TP_RAW_VNG4;VNG4
+TP_RAW_XTRANS;X-Trans
+TP_RAW_XTRANSFAST;Fast X-Trans
 TP_RESIZE_ALLOW_UPSCALING;Allow Upscaling
 TP_RESIZE_APPLIESTO;Applies to:
 TP_RESIZE_CROPPEDAREA;Cropped Area
diff --git a/rtengine/ahd_demosaic_RT.cc b/rtengine/ahd_demosaic_RT.cc
index 88b4f4024..de331fd53 100644
--- a/rtengine/ahd_demosaic_RT.cc
+++ b/rtengine/ahd_demosaic_RT.cc
@@ -56,7 +56,7 @@ void RawImageSource::ahd_demosaic()
 
     double progress = 0.0;
     if (plistener) {
-        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AHD)));
+        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_AHD")));
         plistener->setProgress (0.0);
     }
 
diff --git a/rtengine/amaze_demosaic_RT.cc b/rtengine/amaze_demosaic_RT.cc
index 2b9775ac0..ffb68dbdd 100644
--- a/rtengine/amaze_demosaic_RT.cc
+++ b/rtengine/amaze_demosaic_RT.cc
@@ -52,7 +52,7 @@ void RawImageSource::amaze_demosaic_RT(int winx, int winy, int winw, int winh, c
     volatile double progress = 0.0;
 
     if (plistener) {
-        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::AMAZE)));
+        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_AMAZE")));
         plistener->setProgress (0.0);
     }
 
diff --git a/rtengine/cfa_linedn_RT.cc b/rtengine/cfa_linedn_RT.cc
index f5563e3de..b5d171034 100644
--- a/rtengine/cfa_linedn_RT.cc
+++ b/rtengine/cfa_linedn_RT.cc
@@ -55,7 +55,7 @@ void RawImageSource::CLASS cfa_linedn(float noise, bool horizontal, bool vertica
     // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
     if (plistener) {
-        plistener->setProgressStr ("Line Denoise...");
+        plistener->setProgressStr ("PROGRESSBAR_LINEDENOISE");
         plistener->setProgress (0.0);
     }
 
diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc
index e8ab4fd5c..3536f1053 100644
--- a/rtengine/demosaic_algos.cc
+++ b/rtengine/demosaic_algos.cc
@@ -74,7 +74,7 @@ void RawImageSource::ppg_demosaic()
     if (plistener) {
         // looks like ppg isn't supported anymore
         //plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::ppg)));
-        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), "xxx"));
+        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("GENERAL_NA")));
         plistener->setProgress (0.0);
     }
 
@@ -383,7 +383,7 @@ void RawImageSource::jdl_interpolate_omp()  // from "Lassus"
     if (plistener) {
         // this function seems to be unused
         //plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::jdl)));
-        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), "xxx"));
+        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("GENERAL_NA")));
         plistener->setProgress (0.0);
     }
 
@@ -578,7 +578,7 @@ void RawImageSource::lmmse_interpolate_omp(int winw, int winh, array2D<float> &r
     }
 
     if (plistener) {
-        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::LMMSE)));
+        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_LMMSE")));
         plistener->setProgress (0.0);
     }
 
@@ -1154,7 +1154,7 @@ void RawImageSource::igv_interpolate(int winw, int winh)
     chr[3] = vdif;
 
     if (plistener) {
-        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::IGV)));
+        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_IGV")));
         plistener->setProgress (0.0);
     }
 
@@ -1543,7 +1543,7 @@ void RawImageSource::igv_interpolate(int winw, int winh)
     hdif  = (float (*))    calloc(width * height / 2, sizeof * hdif);
 
     if (plistener) {
-        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::IGV)));
+        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_IGV")));
         plistener->setProgress (0.0);
     }
 
@@ -2674,7 +2674,7 @@ BENCHFUN
     double currentProgress = 0.0;
 
     if(plistener) {
-        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::DCB)));
+        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_DCB")));
         plistener->setProgress (currentProgress);
     }
 
diff --git a/rtengine/eahd_demosaic.cc b/rtengine/eahd_demosaic.cc
index 18883586c..4bbf37c69 100644
--- a/rtengine/eahd_demosaic.cc
+++ b/rtengine/eahd_demosaic.cc
@@ -216,7 +216,7 @@ void RawImageSource::eahd_demosaic ()
 {
     BENCHFUN
     if (plistener) {
-        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::EAHD)));
+        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_EAHD")));
         plistener->setProgress (0.0);
     }
 
diff --git a/rtengine/fast_demo.cc b/rtengine/fast_demo.cc
index 1584c4ca2..4e3fbdabe 100644
--- a/rtengine/fast_demo.cc
+++ b/rtengine/fast_demo.cc
@@ -62,7 +62,7 @@ void RawImageSource::fast_demosaic()
     //int winw=W, winh=H;
 
     if (plistener) {
-        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::FAST)));
+        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_FAST")));
         plistener->setProgress (progress);
     }
 
diff --git a/rtengine/hilite_recon.cc b/rtengine/hilite_recon.cc
index bb173f11a..699d42071 100644
--- a/rtengine/hilite_recon.cc
+++ b/rtengine/hilite_recon.cc
@@ -391,7 +391,7 @@ void RawImageSource :: HLRecovery_inpaint (float** red, float** green, float** b
     double progress = 0.0;
 
     if (plistener) {
-        plistener->setProgressStr ("HL reconstruction...");
+        plistener->setProgressStr ("PROGRESSBAR_HLREC");
         plistener->setProgress (progress);
     }
 
diff --git a/rtengine/hphd_demosaic_RT.cc b/rtengine/hphd_demosaic_RT.cc
index 1d9aa0dd0..7e27b90a5 100644
--- a/rtengine/hphd_demosaic_RT.cc
+++ b/rtengine/hphd_demosaic_RT.cc
@@ -292,7 +292,7 @@ void RawImageSource::hphd_demosaic ()
 {
     BENCHFUN
     if (plistener) {
-        plistener->setProgressStr(Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::HPHD)));
+        plistener->setProgressStr(Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_HPHD")));
         plistener->setProgress(0.0);
     }
 
diff --git a/rtengine/pixelshift.cc b/rtengine/pixelshift.cc
index befa0d4c6..b31ff62c9 100644
--- a/rtengine/pixelshift.cc
+++ b/rtengine/pixelshift.cc
@@ -553,7 +553,7 @@ BENCHFUN
     static const float ePerIsoILCE7RM3 = 0.8f;
 
     if(plistener) {
-        plistener->setProgressStr(Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::PIXELSHIFT)));
+        plistener->setProgressStr(Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_PIXELSHIFT")));
         plistener->setProgress(0.0);
     }
 
diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
index 57a344e7f..0f0d31c40 100644
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -1523,7 +1523,7 @@ int RawImageSource::load (const Glib::ustring &fname, bool firstFrameOnly)
     fileName = fname;
 
     if (plistener) {
-        plistener->setProgressStr ("Decoding...");
+        plistener->setProgressStr ("PROGRESSBAR_DECODING");
         plistener->setProgress (0.0);
     }
     ri = new RawImage(fname);
@@ -1910,7 +1910,7 @@ void RawImageSource::preprocess  (const RAWParams &raw, const LensProfParams &le
 
     if ( ri->getSensorType() == ST_BAYER && (raw.hotPixelFilter > 0 || raw.deadPixelFilter > 0)) {
         if (plistener) {
-            plistener->setProgressStr ("Hot/Dead Pixel Filter...");
+            plistener->setProgressStr ("PROGRESSBAR_HOTDEADPIXELFILTER");
             plistener->setProgress (0.0);
         }
 
@@ -1977,7 +1977,7 @@ void RawImageSource::preprocess  (const RAWParams &raw, const LensProfParams &le
 
     if ( ri->getSensorType() == ST_BAYER && raw.bayersensor.greenthresh > 0) {
         if (plistener) {
-            plistener->setProgressStr ("Green equilibrate...");
+            plistener->setProgressStr ("PROGRESSBAR_GREENEQUIL");
             plistener->setProgress (0.0);
         }
 
@@ -2011,7 +2011,7 @@ void RawImageSource::preprocess  (const RAWParams &raw, const LensProfParams &le
 
     if ( ri->getSensorType() == ST_BAYER && raw.bayersensor.linenoise > 0 ) {
         if (plistener) {
-            plistener->setProgressStr ("Line Denoise...");
+            plistener->setProgressStr ("PROGRESSBAR_LINEDENOISE");
             plistener->setProgress (0.0);
         }
 
@@ -2028,7 +2028,7 @@ void RawImageSource::preprocess  (const RAWParams &raw, const LensProfParams &le
 
     if ( (raw.ca_autocorrect || fabs(raw.cared) > 0.001 || fabs(raw.cablue) > 0.001) && ri->getSensorType() == ST_BAYER ) { // Auto CA correction disabled for X-Trans, for now...
         if (plistener) {
-            plistener->setProgressStr ("CA Auto Correction...");
+            plistener->setProgressStr ("PROGRESSBAR_RAWCACORR");
             plistener->setProgress (0.0);
         }
         if(numFrames == 4) {
diff --git a/rtengine/rcd_demosaic.cc b/rtengine/rcd_demosaic.cc
index f0f9c1bfd..904daea71 100644
--- a/rtengine/rcd_demosaic.cc
+++ b/rtengine/rcd_demosaic.cc
@@ -52,7 +52,7 @@ void RawImageSource::rcd_demosaic(size_t chunkSize, bool measure)
     volatile double progress = 0.0;
 
     if (plistener) {
-        plistener->setProgressStr(Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::RCD)));
+        plistener->setProgressStr(Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_RCD")));
         plistener->setProgress(0);
     }
     
diff --git a/rtengine/vng4_demosaic_RT.cc b/rtengine/vng4_demosaic_RT.cc
index 0f35389fb..f9a4c5bc2 100644
--- a/rtengine/vng4_demosaic_RT.cc
+++ b/rtengine/vng4_demosaic_RT.cc
@@ -94,7 +94,7 @@ void RawImageSource::vng4_demosaic (const array2D<float> &rawData, array2D<float
     const bool plistenerActive = plistener;
 
     if (plistenerActive) {
-        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), RAWParams::BayerSensor::getMethodString(RAWParams::BayerSensor::Method::VNG4)));
+        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_VNG4")));
         plistener->setProgress (progress);
     }
 
diff --git a/rtengine/xtrans_demosaic.cc b/rtengine/xtrans_demosaic.cc
index cb65db092..cd925fc33 100644
--- a/rtengine/xtrans_demosaic.cc
+++ b/rtengine/xtrans_demosaic.cc
@@ -191,7 +191,7 @@ void RawImageSource::xtrans_interpolate (const int passes, const bool useCieLab,
     const bool plistenerActive = plistener;
 
     if (plistenerActive) {
-        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), "Xtrans"));
+        plistener->setProgressStr (Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_XTRANS")));
         plistener->setProgress (progress);
     }
 
@@ -970,7 +970,7 @@ void RawImageSource::fast_xtrans_interpolate (const array2D<float> &rawData, arr
 {
 
     if (plistener) {
-        plistener->setProgressStr(Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), "fast Xtrans"));
+        plistener->setProgressStr(Glib::ustring::compose(M("TP_RAW_DMETHOD_PROGRESSBAR"), M("TP_RAW_XTRANSFAST")));
         plistener->setProgress(0.0);
     }
 
diff --git a/rtgui/crop.cc b/rtgui/crop.cc
index de693d399..781a916a1 100644
--- a/rtgui/crop.cc
+++ b/rtgui/crop.cc
@@ -205,7 +205,7 @@ Crop::Crop():
     ppisubgrid->get_style_context()->add_class("grid-spacing");
     setExpandAlignProperties(ppisubgrid, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
 
-    Gtk::Label* ppilab = Gtk::manage (new Gtk::Label (M("TP_CROP_PPI")));
+    Gtk::Label* ppilab = Gtk::manage (new Gtk::Label (M("TP_CROP_PPI") + ":"));
     setExpandAlignProperties(ppilab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
 
     ppi = Gtk::manage (new MySpinButton ());
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 5f01ad812..ba222ecb9 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -176,11 +176,7 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
     sigc::connection setc = cr_set->signal_toggled().connect (sigc::mem_fun (*this, &Preferences::behSetRadioToggled));
 
     behTreeView->get_column (1)->add_attribute (*cr_add, "visible", behavColumns.visible);
-    behTreeView->get_column (1)->set_sizing (Gtk::TREE_VIEW_COLUMN_FIXED);
-    behTreeView->get_column (1)->set_fixed_width (50);
     behTreeView->get_column (2)->add_attribute (*cr_set, "visible", behavColumns.visible);
-    behTreeView->get_column (2)->set_sizing (Gtk::TREE_VIEW_COLUMN_FIXED);
-    behTreeView->get_column (2)->set_fixed_width (50);
 
     // fill model
     Gtk::TreeModel::iterator mi, ci;
@@ -556,10 +552,10 @@ Gtk::Widget* Preferences::getImageProcessingPanel ()
     saveParamsPreference->append (M ("PREFERENCES_PROFILESAVEINPUT"));
     saveParamsPreference->append (M ("PREFERENCES_PROFILESAVECACHE"));
     saveParamsPreference->append (M ("PREFERENCES_PROFILESAVEBOTH"));
-    Gtk::Label *splab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_PROFILESAVELOCATION") + ":"));
+    Gtk::Label *splab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_PROFILESAVELOCATION") + ":", Gtk::ALIGN_START));
     vbdp->attach (*splab, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
     vbdp->attach (*saveParamsPreference, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
-    Gtk::Label* lplab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_PROFILELOADPR") + ":"));
+    Gtk::Label* lplab = Gtk::manage (new Gtk::Label (M ("PREFERENCES_PROFILELOADPR") + ":", Gtk::ALIGN_START));
     loadParamsPreference = Gtk::manage (new Gtk::ComboBoxText ());
     loadParamsPreference->append (M ("PREFERENCES_PROFILEPRCACHE"));
     loadParamsPreference->append (M ("PREFERENCES_PROFILEPRFILE"));
@@ -618,13 +614,13 @@ Gtk::Widget* Preferences::getImageProcessingPanel ()
     // Crop
     Gtk::Frame *cropFrame = Gtk::manage(new Gtk::Frame(M("PREFERENCES_CROP")));
     Gtk::Grid *cropGrid = Gtk::manage(new Gtk::Grid());
-    Gtk::Label *cropGuidesLbl = Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_GUIDES") + ": "));
+    Gtk::Label *cropGuidesLbl = Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_GUIDES") + ": ", Gtk::ALIGN_START));
     cropGuidesCombo = Gtk::manage(new Gtk::ComboBoxText());
     cropGuidesCombo->append(M("PREFERENCES_CROP_GUIDES_NONE"));
     cropGuidesCombo->append(M("PREFERENCES_CROP_GUIDES_FRAME"));
     cropGuidesCombo->append(M("PREFERENCES_CROP_GUIDES_FULL"));
     cropAutoFitCB = Gtk::manage(new Gtk::CheckButton());
-    Gtk::Label *cropAutoFitLbl = Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_AUTO_FIT")));
+    Gtk::Label *cropAutoFitLbl = Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_AUTO_FIT"), Gtk::ALIGN_START));
     cropAutoFitLbl->set_line_wrap(true);
     cropAutoFitCB->add(*cropAutoFitLbl);
     cropGrid->attach(*cropGuidesLbl, 0, 0, 1, 1);
@@ -648,7 +644,7 @@ Gtk::Widget* Preferences::getPerformancePanel ()
 
     Gtk::Frame* fprevdemo = Gtk::manage (new Gtk::Frame (M ("PREFERENCES_PREVDEMO")));
     Gtk::HBox* hbprevdemo = Gtk::manage (new Gtk::HBox (false, 4));
-    Gtk::Label* lprevdemo = Gtk::manage (new Gtk::Label (M ("PREFERENCES_PREVDEMO_LABEL")));
+    Gtk::Label* lprevdemo = Gtk::manage (new Gtk::Label (M("PREFERENCES_PREVDEMO_LABEL"), Gtk::ALIGN_START));
     cprevdemo = Gtk::manage (new Gtk::ComboBoxText ());
     cprevdemo->append (M ("PREFERENCES_PREVDEMO_FAST"));
     cprevdemo->append (M ("PREFERENCES_PREVDEMO_SIDECAR"));
@@ -1275,7 +1271,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
     vbro->pack_start (*ckbInternalThumbIfUntouched, Gtk::PACK_SHRINK, 0);
 
     Gtk::HBox* hbrecent = Gtk::manage ( new Gtk::HBox () );
-    Gtk::Label* labrecent = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_MAXRECENTFOLDERS") + ":") );
+    Gtk::Label* labrecent = Gtk::manage (new Gtk::Label (M("PREFERENCES_MAXRECENTFOLDERS") + ":", Gtk::ALIGN_START));
     maxRecentFolders = Gtk::manage ( new Gtk::SpinButton () );
     hbrecent->pack_start (*labrecent, Gtk::PACK_SHRINK, 4);
     hbrecent->pack_start (*maxRecentFolders, Gtk::PACK_SHRINK, 4);
@@ -1288,11 +1284,11 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
 
 
     Gtk::Frame* frmnu = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_MENUOPTIONS")) );
-    
+
     Gtk::Grid* menuGrid = Gtk::manage(new Gtk::Grid());
     menuGrid->get_style_context()->add_class("grid-spacing");
     setExpandAlignProperties(menuGrid, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
-    
+
     ckbmenuGroupRank = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPRANK")) );
     setExpandAlignProperties(ckbmenuGroupRank, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
     ckbmenuGroupLabel = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPLABEL")) );
@@ -1300,12 +1296,15 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
     setExpandAlignProperties(ckbmenuGroupFileOperations, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
     ckbmenuGroupProfileOperations = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPPROFILEOPERATIONS")) );
     ckbmenuGroupExtProg = Gtk::manage ( new Gtk::CheckButton (M ("PREFERENCES_MENUGROUPEXTPROGS")) );
-    
+
+    Gtk::Label* groupRestartNeeded = Gtk::manage(new Gtk::Label (Glib::ustring ("(") + M("PREFERENCES_APPLNEXTSTARTUP") + ")", Gtk::ALIGN_START));
+
     menuGrid->attach (*ckbmenuGroupRank, 0, 0, 1, 1);
     menuGrid->attach (*ckbmenuGroupLabel, 1, 0, 1, 1);
     menuGrid->attach (*ckbmenuGroupFileOperations, 0, 1, 1, 1);
     menuGrid->attach (*ckbmenuGroupProfileOperations, 1, 1, 1, 1);
-    menuGrid->attach (*ckbmenuGroupExtProg, 0, 2, 2, 1);
+    menuGrid->attach (*ckbmenuGroupExtProg, 0, 2, 1, 1);
+    menuGrid->attach (*groupRestartNeeded, 1, 2, 1, 1);
 
     frmnu->add (*menuGrid);
 
@@ -1313,7 +1312,7 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
     Gtk::Frame* fre = Gtk::manage ( new Gtk::Frame (M ("PREFERENCES_PARSEDEXT")) );
     Gtk::VBox* vbre = Gtk::manage ( new Gtk::VBox () );
     Gtk::HBox* hb0 = Gtk::manage ( new Gtk::HBox () );
-    Gtk::Label* elab = Gtk::manage ( new Gtk::Label (M ("PREFERENCES_PARSEDEXTADD") + ":") );
+    Gtk::Label* elab = Gtk::manage (new Gtk::Label (M("PREFERENCES_PARSEDEXTADD") + ":", Gtk::ALIGN_START));
     hb0->pack_start (*elab, Gtk::PACK_SHRINK, 4);
     extension = Gtk::manage ( new Gtk::Entry () );
     extension->set_width_chars (5);
@@ -1455,14 +1454,14 @@ Gtk::Widget* Preferences::getSoundsPanel ()
     vbSounds->pack_start (*ckbSndEnable, Gtk::PACK_SHRINK, 4);
 
     Gtk::HBox* hblSndHelp = Gtk::manage (new Gtk::HBox ());
-    Gtk::Label* lSndHelp = Gtk::manage (new Gtk::Label (M ("PREFERENCES_SND_HELP")));
+    Gtk::Label* lSndHelp = Gtk::manage (new Gtk::Label (M("PREFERENCES_SND_HELP"), Gtk::ALIGN_START));
     hblSndHelp->pack_start (*lSndHelp, Gtk::PACK_SHRINK, 4);
     vbSounds->pack_start (*hblSndHelp, Gtk::PACK_SHRINK, 4);
 
     // BatchQueueDone
     Gtk::HBox* pBatchQueueDone = Gtk::manage ( new Gtk::HBox() );
 
-    Gtk::Label* lSndBatchQueueDone = Gtk::manage (new Gtk::Label (M ("PREFERENCES_SND_BATCHQUEUEDONE") + Glib::ustring (":")));
+    Gtk::Label* lSndBatchQueueDone = Gtk::manage (new Gtk::Label (M("PREFERENCES_SND_BATCHQUEUEDONE") + Glib::ustring (":"), Gtk::ALIGN_START));
     pBatchQueueDone->pack_start (*lSndBatchQueueDone, Gtk::PACK_SHRINK, 4);
 
     txtSndBatchQueueDone = Gtk::manage (new Gtk::Entry());
@@ -1473,13 +1472,13 @@ Gtk::Widget* Preferences::getSoundsPanel ()
     // LngEditProcDone
     Gtk::HBox* pSndLngEditProcDone = Gtk::manage ( new Gtk::HBox() );
 
-    Gtk::Label* lSndLngEditProcDone = Gtk::manage (new Gtk::Label (M ("PREFERENCES_SND_LNGEDITPROCDONE") + Glib::ustring (":")));
+    Gtk::Label* lSndLngEditProcDone = Gtk::manage (new Gtk::Label (M("PREFERENCES_SND_LNGEDITPROCDONE") + Glib::ustring (":"), Gtk::ALIGN_START));
     pSndLngEditProcDone->pack_start (*lSndLngEditProcDone, Gtk::PACK_SHRINK, 4);
 
     txtSndLngEditProcDone = Gtk::manage (new Gtk::Entry());
     pSndLngEditProcDone->pack_start (*txtSndLngEditProcDone, Gtk::PACK_EXPAND_WIDGET, 4);
 
-    Gtk::Label* lSndLngEditProcDoneSecs = Gtk::manage (new Gtk::Label (M ("PREFERENCES_SND_THRESHOLDSECS") + Glib::ustring (":")));
+    Gtk::Label* lSndLngEditProcDoneSecs = Gtk::manage (new Gtk::Label (M("PREFERENCES_SND_THRESHOLDSECS") + Glib::ustring (":"), Gtk::ALIGN_START));
     pSndLngEditProcDone->pack_start (*lSndLngEditProcDoneSecs, Gtk::PACK_SHRINK, 12);
 
     spbSndLngEditProcDoneSecs = Gtk::manage ( new Gtk::SpinButton () );
diff --git a/rtgui/resize.cc b/rtgui/resize.cc
index 4635dca50..106715a17 100644
--- a/rtgui/resize.cc
+++ b/rtgui/resize.cc
@@ -41,9 +41,8 @@ Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), fals
     appliesTo->append (M("TP_RESIZE_FULLIMAGE"));
     appliesTo->set_active (0);
 
-    Gtk::Label *label = Gtk::manage (new Gtk::Label (M("TP_RESIZE_APPLIESTO")));
-    label->set_alignment(0., 0.);
-    combos->attach (*label, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
+    Gtk::Label *label = Gtk::manage (new Gtk::Label (M("TP_RESIZE_APPLIESTO"), Gtk::ALIGN_START));
+    combos->attach (*label, 0, 1, 0, 1, Gtk::SHRINK | Gtk::FILL, Gtk::SHRINK, 2, 2);
     combos->attach (*appliesTo, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
 
     // See Resize::methodChanged() when adding a new method.
@@ -52,9 +51,8 @@ Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), fals
     method->append (M("TP_RESIZE_NEAREST"));
     method->set_active (0);
 
-    label = Gtk::manage (new Gtk::Label (M("TP_RESIZE_METHOD")));
-    label->set_alignment(0., 0.);
-    combos->attach (*label, 0, 1, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
+    label = Gtk::manage (new Gtk::Label (M("TP_RESIZE_METHOD"), Gtk::ALIGN_START));
+    combos->attach (*label, 0, 1, 1, 2, Gtk::SHRINK | Gtk::FILL, Gtk::SHRINK, 2, 2);
     combos->attach (*method, 1, 2, 1, 2, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
 
     spec = Gtk::manage (new MyComboBoxText ());
@@ -64,9 +62,8 @@ Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), fals
     spec->append (M("TP_RESIZE_FITBOX"));
     spec->set_active (0);
 
-    label = Gtk::manage (new Gtk::Label (M("TP_RESIZE_SPECIFY")));
-    label->set_alignment(0., 0.);
-    combos->attach (*label, 0, 1, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 2, 2);
+    label = Gtk::manage (new Gtk::Label (M("TP_RESIZE_SPECIFY"), Gtk::ALIGN_START));
+    combos->attach (*label, 0, 1, 2, 3, Gtk::SHRINK | Gtk::FILL, Gtk::SHRINK, 2, 2);
     combos->attach (*spec, 1, 2, 2, 3, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK, 2, 2);
 
     pack_start (*combos, Gtk::PACK_SHRINK, 4);