diff --git a/browser/css/toolbar.css b/browser/css/toolbar.css
index 56a5d5e837271..c347912df14ce 100644
--- a/browser/css/toolbar.css
+++ b/browser/css/toolbar.css
@@ -879,6 +879,30 @@ button.leaflet-control-search-next
 	background-size: 32px 32px !important;
 	width: 32px !important;
 	height: 32px !important; }
+.w2ui-icon.scaleset06 { background: url('images/scale-set-06.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.scaleset07 { background: url('images/scale-set-07.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.scaleset08 { background: url('images/scale-set-08.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.scaleset09 { background: url('images/scale-set-09.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.scaleset10 { background: url('images/scale-set-10.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.scaleset11 { background: url('images/scale-set-11.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
 
 .w2ui-icon.databarset00 { background: url('images/databar-set-00.png') no-repeat;
 	background-size: 32px 32px !important;
@@ -904,6 +928,30 @@ button.leaflet-control-search-next
 	background-size: 32px 32px !important;
 	width: 32px !important;
 	height: 32px !important; }
+.w2ui-icon.databarset06 { background: url('images/databar-set-06.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.databarset07 { background: url('images/databar-set-07.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.databarset08 { background: url('images/databar-set-08.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.databarset09 { background: url('images/databar-set-09.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.databarset10 { background: url('images/databar-set-10.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
+.w2ui-icon.databarset11 { background: url('images/databar-set-11.png') no-repeat;
+	background-size: 32px 32px !important;
+	width: 32px !important;
+	height: 32px !important; }
 
 .w2ui-icon.print{ background: url('images/lc_print.svg') no-repeat center; }
 .w2ui-icon.undo{ background: url('images/lc_undo.svg') no-repeat center; }
diff --git a/browser/images/databar-set-06.png b/browser/images/databar-set-06.png
new file mode 100644
index 0000000000000..8a3ee510f1582
Binary files /dev/null and b/browser/images/databar-set-06.png differ
diff --git a/browser/images/databar-set-07.png b/browser/images/databar-set-07.png
new file mode 100644
index 0000000000000..ef2d212a3a2af
Binary files /dev/null and b/browser/images/databar-set-07.png differ
diff --git a/browser/images/databar-set-08.png b/browser/images/databar-set-08.png
new file mode 100644
index 0000000000000..1cfe43c656b5b
Binary files /dev/null and b/browser/images/databar-set-08.png differ
diff --git a/browser/images/databar-set-09.png b/browser/images/databar-set-09.png
new file mode 100644
index 0000000000000..ddd06c39172ed
Binary files /dev/null and b/browser/images/databar-set-09.png differ
diff --git a/browser/images/databar-set-10.png b/browser/images/databar-set-10.png
new file mode 100644
index 0000000000000..e00d5d28e8124
Binary files /dev/null and b/browser/images/databar-set-10.png differ
diff --git a/browser/images/databar-set-11.png b/browser/images/databar-set-11.png
new file mode 100644
index 0000000000000..6b35e810ea550
Binary files /dev/null and b/browser/images/databar-set-11.png differ
diff --git a/browser/images/scale-set-06.png b/browser/images/scale-set-06.png
new file mode 100644
index 0000000000000..a1091ad8d9482
Binary files /dev/null and b/browser/images/scale-set-06.png differ
diff --git a/browser/images/scale-set-07.png b/browser/images/scale-set-07.png
new file mode 100644
index 0000000000000..99b99646589f5
Binary files /dev/null and b/browser/images/scale-set-07.png differ
diff --git a/browser/images/scale-set-08.png b/browser/images/scale-set-08.png
new file mode 100644
index 0000000000000..560e8df064e12
Binary files /dev/null and b/browser/images/scale-set-08.png differ
diff --git a/browser/images/scale-set-09.png b/browser/images/scale-set-09.png
new file mode 100644
index 0000000000000..9a52e2e5aac06
Binary files /dev/null and b/browser/images/scale-set-09.png differ
diff --git a/browser/images/scale-set-10.png b/browser/images/scale-set-10.png
new file mode 100644
index 0000000000000..6083cdc0f3ab7
Binary files /dev/null and b/browser/images/scale-set-10.png differ
diff --git a/browser/images/scale-set-11.png b/browser/images/scale-set-11.png
new file mode 100644
index 0000000000000..38dc0a8e4c7de
Binary files /dev/null and b/browser/images/scale-set-11.png differ
diff --git a/browser/src/control/Control.Toolbar.js b/browser/src/control/Control.Toolbar.js
index f53179b25ff6b..b6d999733e487 100644
--- a/browser/src/control/Control.Toolbar.js
+++ b/browser/src/control/Control.Toolbar.js
@@ -301,14 +301,14 @@ global.getConditionalFormatMenuHtml = getConditionalFormatMenuHtml;
 
 // for color scale conditional formatting
 function getConditionalColorScaleMenuHtml(more, jsdialogDropdown) {
-	return getConditionalFormatMenuHtmlImpl(more, 'scaleset', 6, '.uno:ColorScaleFormatDialog', jsdialogDropdown);
+	return getConditionalFormatMenuHtmlImpl(more, 'scaleset', 12, '.uno:ColorScaleFormatDialog', jsdialogDropdown);
 }
 
 global.getConditionalColorScaleMenuHtml = getConditionalColorScaleMenuHtml;
 
 // for data bar conditional formatting
 function getConditionalDataBarMenuHtml(more, jsdialogDropdown) {
-	return getConditionalFormatMenuHtmlImpl(more, 'databarset', 6, '.uno:DataBarFormatDialog', jsdialogDropdown);
+	return getConditionalFormatMenuHtmlImpl(more, 'databarset', 12, '.uno:DataBarFormatDialog', jsdialogDropdown);
 }
 
 global.getConditionalDataBarMenuHtml = getConditionalDataBarMenuHtml;