diff --git a/rtengine/procevents.h b/rtengine/procevents.h
index a41413682..d8ab2f6b6 100644
--- a/rtengine/procevents.h
+++ b/rtengine/procevents.h
@@ -73,7 +73,7 @@ enum ProcEvent {
     EvLDNRadius = 43, // obsolete
     EvLDNEdgeTolerance = 44, // obsolete
     EvCDNEnabled = 45, // obsolete
-    EvBlendCMSMatrix = 46,
+    EvBlendCMSMatrix = 46, // obsolete
     EvDCPToneCurve = 47,
     EvDCPIlluminant = 48,
     EvSHEnabled = 49,
diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index ef480de81..1e32817b7 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -974,7 +974,6 @@ void RAWParams::setDefaults()
 void ColorManagementParams::setDefaults()
 {
     input   = "(cameraICC)";
-    blendCMSMatrix = false;
     toneCurve = false;
     applyLookTable = false;
     applyBaselineExposureOffset = true;
@@ -2679,10 +2678,6 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
             keyFile.set_boolean ("Color Management", "ApplyHueSatMap",   icm.applyHueSatMap);
         }
 
-        if (!pedited || pedited->icm.blendCMSMatrix) {
-            keyFile.set_boolean ("Color Management", "BlendCMSMatrix",   icm.blendCMSMatrix);
-        }
-
         if (!pedited || pedited->icm.dcpIlluminant) {
             keyFile.set_integer ("Color Management", "DCPIlluminant",   icm.dcpIlluminant);
         }
@@ -6063,14 +6058,6 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
                 }
             }
 
-            if (keyFile.has_key ("Color Management", "BlendCMSMatrix")) {
-                icm.blendCMSMatrix = keyFile.get_boolean ("Color Management", "BlendCMSMatrix");
-
-                if (pedited) {
-                    pedited->icm.blendCMSMatrix = true;
-                }
-            }
-
             if (keyFile.has_key ("Color Management", "DCPIlluminant"))  {
                 icm.dcpIlluminant  = keyFile.get_integer ("Color Management", "DCPIlluminant");
 
@@ -8366,7 +8353,6 @@ bool ProcParams::operator== (const ProcParams& other)
         && icm.applyLookTable == other.icm.applyLookTable
         && icm.applyBaselineExposureOffset == other.icm.applyBaselineExposureOffset
         && icm.applyHueSatMap == other.icm.applyHueSatMap
-        && icm.blendCMSMatrix == other.icm.blendCMSMatrix
         && icm.dcpIlluminant == other.icm.dcpIlluminant
         && icm.working == other.icm.working
         && icm.output == other.icm.output
diff --git a/rtengine/procparams.h b/rtengine/procparams.h
index 8a7967f92..a5b5f4fb2 100644
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -982,7 +982,6 @@ public:
     bool          applyLookTable;
     bool          applyBaselineExposureOffset;
     bool          applyHueSatMap;
-    bool          blendCMSMatrix; // setting no longer used
     int dcpIlluminant;
     Glib::ustring working;
     Glib::ustring output;
diff --git a/rtengine/refreshmap.cc b/rtengine/refreshmap.cc
index c5ebf8b1d..6f96d6be7 100644
--- a/rtengine/refreshmap.cc
+++ b/rtengine/refreshmap.cc
@@ -73,7 +73,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
     0,                // EvLDNRadius: obsolete,
     0,                // EvLDNEdgeTolerance: obsolete,
     0,                // EvCDNEnabled:obsolete,
-    ALL,              // EvBlendCMSMatrix,
+    0,                // free entry
     RGBCURVE,         // EvDCPToneCurve,
     ALLNORAW,         // EvDCPIlluminant,
     RETINEX,          // EvSHEnabled,
diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index a334c84a8..13b1eb81c 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -548,7 +548,6 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
 
     Gtk::VSeparator* vsep1 = Gtk::manage (new Gtk::VSeparator ());
     Gtk::VSeparator* vsep2 = Gtk::manage (new Gtk::VSeparator ());
-    Gtk::VSeparator* vsep3 = Gtk::manage (new Gtk::VSeparator ());
 
     iareapanel = new ImageAreaPanel ();
     tpc->setEditProvider (iareapanel->imageArea);
@@ -695,6 +694,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
     colorMgmtToolBar->pack_right_in (iops);
 
     if (!simpleEditor && !options.tabbedUI) {
+        Gtk::VSeparator* vsep3 = Gtk::manage (new Gtk::VSeparator ());
         iops->attach_next_to (*vsep3, Gtk::POS_RIGHT, 1, 1);
         iops->attach_next_to (*navPrev, Gtk::POS_RIGHT, 1, 1);
         iops->attach_next_to (*navSync, Gtk::POS_RIGHT, 1, 1);
diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc
index 3051e6e74..34cb2c064 100644
--- a/rtgui/exifpanel.cc
+++ b/rtgui/exifpanel.cc
@@ -88,10 +88,6 @@ ExifPanel::ExifPanel () : idata(nullptr)
 
     pack_start (*scrolledWindow);
 
-    Gtk::Grid* buttons = Gtk::manage(new Gtk::Grid());
-    buttons->set_row_homogeneous(true);
-    buttons->set_column_homogeneous(true);
-    setExpandAlignProperties(buttons, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
     Gtk::Grid* buttons1 = Gtk::manage(new Gtk::Grid());
     buttons1->set_row_homogeneous(true);
     buttons1->set_column_homogeneous(true);
diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc
index 232d626a0..e80b2028a 100644
--- a/rtgui/icmpanel.cc
+++ b/rtgui/icmpanel.cc
@@ -32,7 +32,7 @@ extern Options options;
 ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunchanged(nullptr), icmplistener(nullptr), lastRefFilename(""), camName("")
 {
 
-    isBatchMode = lastToneCurve = lastApplyLookTable = lastApplyBaselineExposureOffset = lastApplyHueSatMap = lastBlendCMSMatrix = lastgamfree = false;
+    isBatchMode = lastToneCurve = lastApplyLookTable = lastApplyBaselineExposureOffset = lastApplyHueSatMap = lastgamfree = false;
 
     ipDialog = Gtk::manage (new MyFileChooserButton (M("TP_ICM_INPUTDLGLABEL"), Gtk::FILE_CHOOSER_ACTION_OPEN));
     ipDialog->set_tooltip_text (M("TP_ICM_INPUTCUSTOM_TOOLTIP"));
@@ -138,12 +138,6 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
     dcpFrame->set_sensitive(false);
     iVBox->pack_start (*dcpFrame);
 
-    ckbBlendCMSMatrix = Gtk::manage (new Gtk::CheckButton (M("TP_ICM_BLENDCMSMATRIX")));
-    ckbBlendCMSMatrix->set_sensitive (false);
-    ckbBlendCMSMatrix->set_tooltip_text (M("TP_ICM_BLENDCMSMATRIX_TOOLTIP"));
-    // blend cms matrix no longer used
-    //iVBox->pack_start (*ckbBlendCMSMatrix, Gtk::PACK_SHRINK, 2);
-
     saveRef = Gtk::manage (new Gtk::Button (M("TP_ICM_SAVEREFERENCE")));
     saveRef->set_image (*Gtk::manage (new RTImage ("gtk-save-large.png")));
     saveRef->set_alignment (0.5f, 0.5f);
@@ -318,7 +312,6 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
     ltableconn = ckbApplyLookTable->signal_toggled().connect ( sigc::mem_fun(*this, &ICMPanel::applyLookTableChanged));
     beoconn = ckbApplyBaselineExposureOffset->signal_toggled().connect ( sigc::mem_fun(*this, &ICMPanel::applyBaselineExposureOffsetChanged));
     hsmconn = ckbApplyHueSatMap->signal_toggled().connect ( sigc::mem_fun(*this, &ICMPanel::applyHueSatMapChanged));
-    blendcmsconn = ckbBlendCMSMatrix->signal_toggled().connect ( sigc::mem_fun(*this, &ICMPanel::blendCMSMatrixChanged));
 
     icamera->signal_toggled().connect( sigc::mem_fun(*this, &ICMPanel::ipChanged) );
     icameraICC->signal_toggled().connect( sigc::mem_fun(*this, &ICMPanel::ipChanged) );
@@ -494,7 +487,6 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited)
     ConnectionBlocker ltableconn_(ltableconn);
     ConnectionBlocker beoconn_(beoconn);
     ConnectionBlocker hsmconn_(hsmconn);
-    ConnectionBlocker blendcmsconn_(blendcmsconn);
     ConnectionBlocker wnamesconn_(wnamesconn);
     ConnectionBlocker onamesconn_(onamesconn);
     ConnectionBlocker ointentconn_(ointentconn);
@@ -507,50 +499,29 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited)
 
     if (pp->icm.input == "(none)") {
         inone->set_active (true);
-        if (!batchMode) {
-            ckbBlendCMSMatrix->set_sensitive (false);
-        }
         updateDCP(pp->icm.dcpIlluminant, "");
     } else if (pp->icm.input == "(embedded)" || ((pp->icm.input == "(camera)" || pp->icm.input == "") && icamera->get_state() == Gtk::STATE_INSENSITIVE)) {
         iembedded->set_active (true);
-        if (!batchMode) {
-            ckbBlendCMSMatrix->set_sensitive (false);
-        }
         updateDCP(pp->icm.dcpIlluminant, "");
     } else if ((pp->icm.input == "(cameraICC)") && icameraICC->get_state() != Gtk::STATE_INSENSITIVE) {
         icameraICC->set_active (true);
-        if (!batchMode) {
-            ckbBlendCMSMatrix->set_sensitive (true);
-        }
         updateDCP(pp->icm.dcpIlluminant, "(cameraICC)");
     } else if ((pp->icm.input == "(cameraICC)") && icamera->get_state() != Gtk::STATE_INSENSITIVE && icameraICC->get_state() == Gtk::STATE_INSENSITIVE) {
         // this is the case when (cameraICC) is instructed by packaged profiles, but ICC file is not found
         // therefore falling back UI to explicitly reflect the (camera) option
         icamera->set_active (true);
-        if (!batchMode) {
-            ckbBlendCMSMatrix->set_sensitive (false);
-        }
         updateDCP(pp->icm.dcpIlluminant, "");
     } else if ((pp->icm.input == "(cameraICC)") && icamera->get_state() == Gtk::STATE_INSENSITIVE && icameraICC->get_state() == Gtk::STATE_INSENSITIVE) {
         // If neither (camera) nor (cameraICC) are available, as is the case when loading a non-raw, activate (embedded).
         iembedded->set_active (true);
-        if (!batchMode) {
-            ckbBlendCMSMatrix->set_sensitive (false);
-        }
         updateDCP(pp->icm.dcpIlluminant, "(cameraICC)");
     } else if ((pp->icm.input == "(camera)" || pp->icm.input == "") && icamera->get_state() != Gtk::STATE_INSENSITIVE) {
         icamera->set_active (true);
-        if (!batchMode) {
-            ckbBlendCMSMatrix->set_sensitive (false);
-        }
         updateDCP(pp->icm.dcpIlluminant, "");
     } else {
         ifromfile->set_active (true);
         oldip = pp->icm.input.substr(5);  // cut of "file:"
         ipDialog->set_filename (pp->icm.input.substr(5));
-        if (!batchMode) {
-            ckbBlendCMSMatrix->set_sensitive (true);
-        }
         updateDCP(pp->icm.dcpIlluminant, pp->icm.input.substr(5));
     }
 
@@ -578,9 +549,6 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited)
     ckbApplyHueSatMap->set_active (pp->icm.applyHueSatMap);
     lastApplyHueSatMap = pp->icm.applyHueSatMap;
 
-    ckbBlendCMSMatrix->set_active (pp->icm.blendCMSMatrix);
-    lastBlendCMSMatrix = pp->icm.blendCMSMatrix;
-
     freegamma->set_active (pp->icm.freegamma);
     lastgamfree = pp->icm.freegamma;
 
@@ -602,7 +570,6 @@ void ICMPanel::read (const ProcParams* pp, const ParamsEdited* pedited)
         ckbApplyLookTable->set_inconsistent(!pedited->icm.applyLookTable);
         ckbApplyBaselineExposureOffset->set_inconsistent(!pedited->icm.applyBaselineExposureOffset);
         ckbApplyHueSatMap->set_inconsistent(!pedited->icm.applyHueSatMap);
-        ckbBlendCMSMatrix->set_inconsistent(!pedited->icm.blendCMSMatrix);
         freegamma->set_inconsistent (!pedited->icm.freegamma);
 
         if (!pedited->icm.working) {
@@ -677,7 +644,6 @@ void ICMPanel::write (ProcParams* pp, ParamsEdited* pedited)
     pp->icm.applyLookTable = ckbApplyLookTable->get_active ();
     pp->icm.applyBaselineExposureOffset = ckbApplyBaselineExposureOffset->get_active ();
     pp->icm.applyHueSatMap = ckbApplyHueSatMap->get_active ();
-    pp->icm.blendCMSMatrix = ckbBlendCMSMatrix->get_active ();
     pp->icm.gampos = (double) gampos->getValue();
     pp->icm.slpos = (double) slpos->getValue();
     pp->icm.outputBPC = obpc->get_active ();
@@ -693,7 +659,6 @@ void ICMPanel::write (ProcParams* pp, ParamsEdited* pedited)
         pedited->icm.applyLookTable = !ckbApplyLookTable->get_inconsistent ();
         pedited->icm.applyBaselineExposureOffset = !ckbApplyBaselineExposureOffset->get_inconsistent ();
         pedited->icm.applyHueSatMap = !ckbApplyHueSatMap->get_inconsistent ();
-        pedited->icm.blendCMSMatrix = !ckbBlendCMSMatrix->get_inconsistent ();
         pedited->icm.gamma = wgamma->get_active_text() != M("GENERAL_UNCHANGED");
         pedited->icm.freegamma = !freegamma->get_inconsistent();
         pedited->icm.gampos = gampos->getEditedState ();
@@ -871,19 +836,14 @@ void ICMPanel::ipChanged ()
 
     if (inone->get_active()) {
         profname = "(none)";
-        ckbBlendCMSMatrix->set_sensitive(false);
     } else if (iembedded->get_active ()) {
         profname = "(embedded)";
-        ckbBlendCMSMatrix->set_sensitive(false);
     } else if (icamera->get_active ()) {
         profname = "(camera)";
-        ckbBlendCMSMatrix->set_sensitive(false);
     } else if (icameraICC->get_active ()) {
         profname = "(cameraICC)";
-        ckbBlendCMSMatrix->set_sensitive(true);
     } else {
         profname = ipDialog->get_filename ();
-        ckbBlendCMSMatrix->set_sensitive(true);
     }
 
     updateDCP(-1, profname);
@@ -895,32 +855,6 @@ void ICMPanel::ipChanged ()
     oldip = profname;
 }
 
-void ICMPanel::blendCMSMatrixChanged()
-{
-    if (multiImage) {
-        if (ckbBlendCMSMatrix->get_inconsistent()) {
-            ckbBlendCMSMatrix->set_inconsistent (false);
-            blendcmsconn.block (true);
-            ckbBlendCMSMatrix->set_active (false);
-            blendcmsconn.block (false);
-        } else if (lastBlendCMSMatrix) {
-            ckbBlendCMSMatrix->set_inconsistent (true);
-        }
-
-        lastBlendCMSMatrix = ckbBlendCMSMatrix->get_active ();
-    }
-
-    if (listener) {
-        if (ckbBlendCMSMatrix->get_inconsistent()) {
-            listener->panelChanged (EvBlendCMSMatrix, M("GENERAL_UNCHANGED"));
-        } else if (ckbBlendCMSMatrix->get_active()) {
-            listener->panelChanged (EvBlendCMSMatrix, M("GENERAL_ENABLED"));
-        } else {
-            listener->panelChanged (EvBlendCMSMatrix, M("GENERAL_DISABLED"));
-        }
-    }
-}
-
 void ICMPanel::GamChanged()
 {
     if (multiImage) {
diff --git a/rtgui/icmpanel.h b/rtgui/icmpanel.h
index 846129105..0e7deefa9 100644
--- a/rtgui/icmpanel.h
+++ b/rtgui/icmpanel.h
@@ -56,9 +56,7 @@ protected:
     sigc::connection hsmconn;
     bool lastobpc;
     sigc::connection obpcconn;
-    bool lastBlendCMSMatrix;
     bool isBatchMode;
-    sigc::connection blendcmsconn;
 
 private:
     Gtk::VBox       *  iVBox;
@@ -78,7 +76,6 @@ private:
     Gtk::CheckButton*  ckbApplyLookTable;
     Gtk::CheckButton*  ckbApplyBaselineExposureOffset;
     Gtk::CheckButton*  ckbApplyHueSatMap;
-    Gtk::CheckButton*  ckbBlendCMSMatrix;
     MyComboBoxText*    wnames;
     sigc::connection   wnamesconn;
     MyComboBoxText*    wgamma;
@@ -119,7 +116,6 @@ public:
     void gpChanged ();
     void GamChanged ();
     void ipSelectionChanged ();
-    void blendCMSMatrixChanged();
     void dcpIlluminantChanged();
     void toneCurveChanged();
     void applyLookTableChanged();
diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc
index b9a4ab9b7..14da83268 100644
--- a/rtgui/paramsedited.cc
+++ b/rtgui/paramsedited.cc
@@ -348,7 +348,6 @@ void ParamsEdited::set (bool v)
     icm.applyLookTable = v;
     icm.applyBaselineExposureOffset = v;
     icm.applyHueSatMap = v;
-    icm.blendCMSMatrix = v;
     icm.dcpIlluminant = v;
     icm.working      = v;
     icm.output       = v;
@@ -874,7 +873,6 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
         icm.applyLookTable = icm.applyLookTable && p.icm.applyLookTable == other.icm.applyLookTable;
         icm.applyBaselineExposureOffset = icm.applyBaselineExposureOffset && p.icm.applyBaselineExposureOffset == other.icm.applyBaselineExposureOffset;
         icm.applyHueSatMap = icm.applyHueSatMap && p.icm.applyHueSatMap == other.icm.applyHueSatMap;
-        icm.blendCMSMatrix = icm.blendCMSMatrix && p.icm.blendCMSMatrix == other.icm.blendCMSMatrix;
         icm.dcpIlluminant = icm.dcpIlluminant && p.icm.dcpIlluminant == other.icm.dcpIlluminant;
         icm.working = icm.working && p.icm.working == other.icm.working;
         icm.output = icm.output && p.icm.output == other.icm.output;
@@ -2254,10 +2252,6 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
         toEdit.icm.applyHueSatMap = mods.icm.applyHueSatMap;
     }
 
-    if (icm.blendCMSMatrix) {
-        toEdit.icm.blendCMSMatrix = mods.icm.blendCMSMatrix;
-    }
-
     if (icm.dcpIlluminant) {
         toEdit.icm.dcpIlluminant = mods.icm.dcpIlluminant;
     }
diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h
index d8c191975..298384f5b 100644
--- a/rtgui/paramsedited.h
+++ b/rtgui/paramsedited.h
@@ -539,7 +539,6 @@ public:
     bool applyLookTable;
     bool applyBaselineExposureOffset;
     bool applyHueSatMap;
-    bool blendCMSMatrix;
     bool dcpIlluminant;
     bool working;
     bool output;