diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp
index 29aefa22e..d758a185b 100644
--- a/src/libs/vlayout/vtextmanager.cpp
+++ b/src/libs/vlayout/vtextmanager.cpp
@@ -362,10 +362,18 @@ void PrepareDimensionPlaceholders(const VPieceLabelInfo &info, QMap<QString, QSt
 
     AddPlaceholder(pl_heightLabel,
                    not info.dimensionHeightLabel.isEmpty() ? info.dimensionHeightLabel : info.dimensionHeight);
+    AddPlaceholder(pl_dimensionXLabel,
+                   not info.dimensionHeightLabel.isEmpty() ? info.dimensionHeightLabel : info.dimensionHeight);
     AddPlaceholder(pl_sizeLabel, not info.dimensionSizeLabel.isEmpty() ? info.dimensionSizeLabel : info.dimensionSize);
+    AddPlaceholder(pl_dimensionYLabel,
+                   not info.dimensionSizeLabel.isEmpty() ? info.dimensionSizeLabel : info.dimensionSize);
     AddPlaceholder(pl_hipLabel, not info.dimensionHipLabel.isEmpty() ? info.dimensionHipLabel : info.dimensionHip);
+    AddPlaceholder(pl_dimensionZLabel,
+                   not info.dimensionHipLabel.isEmpty() ? info.dimensionHipLabel : info.dimensionHip);
     AddPlaceholder(pl_waistLabel,
                    not info.dimensionWaistLabel.isEmpty() ? info.dimensionWaistLabel : info.dimensionWaist);
+    AddPlaceholder(pl_dimensionWLabel,
+                   not info.dimensionWaistLabel.isEmpty() ? info.dimensionWaistLabel : info.dimensionWaist);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vtools/dialogs/support/dialogeditlabel.cpp b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp
index 09c31f948..0eeab7c62 100644
--- a/src/libs/vtools/dialogs/support/dialogeditlabel.cpp
+++ b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp
@@ -607,26 +607,26 @@ void DialogEditLabel::InitPlaceholders()
         QString label = VAbstractValApplication::VApp()->GetDimensionHeightLabel();
         m_placeholders.insert(pl_heightLabel,
                               qMakePair(tr("Height label", "dimension"), not label.isEmpty() ? label : heightValue));
-        m_placeholders.insert(
-            pl_dimensionX, qMakePair(tr("Dimension X label", "dimension"), not label.isEmpty() ? label : heightValue));
+        m_placeholders.insert(pl_dimensionXLabel, qMakePair(tr("Dimension X label", "dimension"),
+                                                            not label.isEmpty() ? label : heightValue));
 
         label = VAbstractValApplication::VApp()->GetDimensionSizeLabel();
         m_placeholders.insert(pl_sizeLabel,
                               qMakePair(tr("Size label", "dimension"), not label.isEmpty() ? label : sizeValue));
-        m_placeholders.insert(pl_dimensionY,
+        m_placeholders.insert(pl_dimensionYLabel,
                               qMakePair(tr("Dimension Y label", "dimension"), not label.isEmpty() ? label : sizeValue));
 
         label = VAbstractValApplication::VApp()->GetDimensionHipLabel();
         m_placeholders.insert(pl_hipLabel,
                               qMakePair(tr("Hip label", "dimension"), not label.isEmpty() ? label : hipValue));
-        m_placeholders.insert(pl_dimensionZ,
+        m_placeholders.insert(pl_dimensionZLabel,
                               qMakePair(tr("Dimension Z label", "dimension"), not label.isEmpty() ? label : hipValue));
 
         label = VAbstractValApplication::VApp()->GetDimensionWaistLabel();
         m_placeholders.insert(pl_waistLabel,
                               qMakePair(tr("Waist label", "dimension"), not label.isEmpty() ? label : waistValue));
-        m_placeholders.insert(
-            pl_dimensionW, qMakePair(tr("Dimension W label", "dimension"), not label.isEmpty() ? label : waistValue));
+        m_placeholders.insert(pl_dimensionWLabel, qMakePair(tr("Dimension W label", "dimension"),
+                                                            not label.isEmpty() ? label : waistValue));
     }
 
     m_placeholders.insert(