diff --git a/dist/bundle.css b/dist/bundle.css
index b69d50cbae..3044494a1a 100644
--- a/dist/bundle.css
+++ b/dist/bundle.css
@@ -3754,9 +3754,15 @@ ul.ztree.zTreeDragUL {
 .bi-down-list-popup .bi-down-list-item .list-item-text {
   max-width: 203px;
 }
+.bi-dynamic-date-popup .toolbar-button {
+  line-height: 23px;
+}
 .bi-dynamic-date-combo .date-font {
   font-size: 16px;
 }
+.bi-dynamic-date-time-popup .toolbar-button {
+  line-height: 23px;
+}
 
 .bi-excel-table-header-cell {
   font-weight: bold;
@@ -4181,6 +4187,9 @@ ul.ztree.zTreeDragUL {
 .bi-year-popup .year-popup-navigation > .first-element {
   border-left: none;
 }
+.bi-year-popup .toolbar-button {
+  line-height: 23px;
+}
 .bi-theme-dark .bi-year-popup .year-popup-navigation > .center-element {
   border-left: 1px solid #525466;
 }
@@ -4192,12 +4201,18 @@ ul.ztree.zTreeDragUL {
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
+.bi-year-month-popup .toolbar-button {
+  line-height: 23px;
+}
 .bi-year-month-interval.time-error .bi-input {
   color: #ff4949;
 }
 .bi-year-month-interval.time-error .sign-editor-text {
   color: #ff4949;
 }
+.bi-year-month-popup .toolbar-button {
+  line-height: 23px;
+}
 html {
   height: 100%;
   overflow: hidden;
diff --git a/dist/bundle.js b/dist/bundle.js
index b97e2cfd12..53335d38f0 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -81380,7 +81380,7 @@ BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicBu
                 el: {
                     type: "bi.layout",
                     cls: "line-segment-button-line",
-                    height: 3,
+                    height: 2,
                     ref: function () {
                         self.line = this;
                     }
@@ -91272,7 +91272,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -91284,7 +91284,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Multi_Date_Today"),
                         ref: function () {
@@ -91299,7 +91299,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
@@ -92038,7 +92038,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -92050,7 +92050,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Multi_Date_Today"),
                         ref: function () {
@@ -92065,7 +92065,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
@@ -109818,7 +109818,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -109830,7 +109830,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Year"),
                         ref: function () {
@@ -109845,7 +109845,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
@@ -110569,7 +110569,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -110581,7 +110581,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Month"),
                         ref: function () {
@@ -110596,7 +110596,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
@@ -111547,7 +111547,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -111559,7 +111559,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Quarter"),
                         ref: function () {
@@ -111574,7 +111574,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/dist/case.js b/dist/case.js
index ae535fb2f7..09259b305e 100644
--- a/dist/case.js
+++ b/dist/case.js
@@ -8881,7 +8881,7 @@ BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicBu
                 el: {
                     type: "bi.layout",
                     cls: "line-segment-button-line",
-                    height: 3,
+                    height: 2,
                     ref: function () {
                         self.line = this;
                     }
diff --git a/dist/fineui.css b/dist/fineui.css
index a93f4b56c8..7865350204 100644
--- a/dist/fineui.css
+++ b/dist/fineui.css
@@ -3754,9 +3754,15 @@ ul.ztree.zTreeDragUL {
 .bi-down-list-popup .bi-down-list-item .list-item-text {
   max-width: 203px;
 }
+.bi-dynamic-date-popup .toolbar-button {
+  line-height: 23px;
+}
 .bi-dynamic-date-combo .date-font {
   font-size: 16px;
 }
+.bi-dynamic-date-time-popup .toolbar-button {
+  line-height: 23px;
+}
 
 .bi-excel-table-header-cell {
   font-weight: bold;
@@ -4181,6 +4187,9 @@ ul.ztree.zTreeDragUL {
 .bi-year-popup .year-popup-navigation > .first-element {
   border-left: none;
 }
+.bi-year-popup .toolbar-button {
+  line-height: 23px;
+}
 .bi-theme-dark .bi-year-popup .year-popup-navigation > .center-element {
   border-left: 1px solid #525466;
 }
@@ -4192,12 +4201,18 @@ ul.ztree.zTreeDragUL {
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
+.bi-year-month-popup .toolbar-button {
+  line-height: 23px;
+}
 .bi-year-month-interval.time-error .bi-input {
   color: #ff4949;
 }
 .bi-year-month-interval.time-error .sign-editor-text {
   color: #ff4949;
 }
+.bi-year-month-popup .toolbar-button {
+  line-height: 23px;
+}
 html {
   height: 100%;
   overflow: hidden;
diff --git a/dist/fineui.js b/dist/fineui.js
index fd99c34180..f96786d687 100644
--- a/dist/fineui.js
+++ b/dist/fineui.js
@@ -81629,7 +81629,7 @@ BI.shortcut("bi.panel", BI.Panel);BI.LinearSegmentButton = BI.inherit(BI.BasicBu
                 el: {
                     type: "bi.layout",
                     cls: "line-segment-button-line",
-                    height: 3,
+                    height: 2,
                     ref: function () {
                         self.line = this;
                     }
@@ -91521,7 +91521,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -91533,7 +91533,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Multi_Date_Today"),
                         ref: function () {
@@ -91548,7 +91548,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
@@ -92287,7 +92287,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -92299,7 +92299,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Multi_Date_Today"),
                         ref: function () {
@@ -92314,7 +92314,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
@@ -110067,7 +110067,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -110079,7 +110079,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Year"),
                         ref: function () {
@@ -110094,7 +110094,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
@@ -110818,7 +110818,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -110830,7 +110830,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Month"),
                         ref: function () {
@@ -110845,7 +110845,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
@@ -111796,7 +111796,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -111808,7 +111808,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Quarter"),
                         ref: function () {
@@ -111823,7 +111823,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/dist/widget.css b/dist/widget.css
index aef8e72ffd..6a15439112 100644
--- a/dist/widget.css
+++ b/dist/widget.css
@@ -9,9 +9,15 @@
 .bi-down-list-popup .bi-down-list-item .list-item-text {
   max-width: 203px;
 }
+.bi-dynamic-date-popup .toolbar-button {
+  line-height: 23px;
+}
 .bi-dynamic-date-combo .date-font {
   font-size: 16px;
 }
+.bi-dynamic-date-time-popup .toolbar-button {
+  line-height: 23px;
+}
 
 .bi-excel-table-header-cell {
   font-weight: bold;
@@ -436,6 +442,9 @@
 .bi-year-popup .year-popup-navigation > .first-element {
   border-left: none;
 }
+.bi-year-popup .toolbar-button {
+  line-height: 23px;
+}
 .bi-theme-dark .bi-year-popup .year-popup-navigation > .center-element {
   border-left: 1px solid #525466;
 }
@@ -447,9 +456,15 @@
   -moz-border-radius: 2px;
   border-radius: 2px;
 }
+.bi-year-month-popup .toolbar-button {
+  line-height: 23px;
+}
 .bi-year-month-interval.time-error .bi-input {
   color: #ff4949;
 }
 .bi-year-month-interval.time-error .sign-editor-text {
   color: #ff4949;
 }
+.bi-year-month-popup .toolbar-button {
+  line-height: 23px;
+}
diff --git a/dist/widget.js b/dist/widget.js
index 86d554cbd1..a7ab7d20cb 100644
--- a/dist/widget.js
+++ b/dist/widget.js
@@ -3585,7 +3585,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -3597,7 +3597,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Multi_Date_Today"),
                         ref: function () {
@@ -3612,7 +3612,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
@@ -4351,7 +4351,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -4363,7 +4363,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Multi_Date_Today"),
                         ref: function () {
@@ -4378,7 +4378,7 @@ BI.extend(BI.DynamicDateTimeCombo, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
@@ -22131,7 +22131,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -22143,7 +22143,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Year"),
                         ref: function () {
@@ -22158,7 +22158,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
@@ -22882,7 +22882,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -22894,7 +22894,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Month"),
                         ref: function () {
@@ -22909,7 +22909,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
@@ -23860,7 +23860,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -23872,7 +23872,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Quarter"),
                         ref: function () {
@@ -23887,7 +23887,7 @@ BI.extend(BI.DynamicYearQuarterCombo, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/src/case/linearsegment/button.linear.segment.js b/src/case/linearsegment/button.linear.segment.js
index 90ecb579a2..be8403844e 100644
--- a/src/case/linearsegment/button.linear.segment.js
+++ b/src/case/linearsegment/button.linear.segment.js
@@ -26,7 +26,7 @@ BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
                 el: {
                     type: "bi.layout",
                     cls: "line-segment-button-line",
-                    height: 3,
+                    height: 2,
                     ref: function () {
                         self.line = this;
                     }
diff --git a/src/css/widget/dynamicdatecombo/dynamicdatepopup.css b/src/css/widget/dynamicdatecombo/dynamicdatepopup.css
new file mode 100644
index 0000000000..880ad05ba2
--- /dev/null
+++ b/src/css/widget/dynamicdatecombo/dynamicdatepopup.css
@@ -0,0 +1,3 @@
+.bi-dynamic-date-popup .toolbar-button {
+  line-height: 23px;
+}
diff --git a/src/css/widget/dynamicdatecombo/dynamicdatetimepopup.css b/src/css/widget/dynamicdatecombo/dynamicdatetimepopup.css
new file mode 100644
index 0000000000..ed58f22206
--- /dev/null
+++ b/src/css/widget/dynamicdatecombo/dynamicdatetimepopup.css
@@ -0,0 +1,3 @@
+.bi-dynamic-date-time-popup .toolbar-button {
+  line-height: 23px;
+}
diff --git a/src/css/widget/year/popup.css b/src/css/widget/year/popup.css
index 149e601c23..2a3ee0a675 100644
--- a/src/css/widget/year/popup.css
+++ b/src/css/widget/year/popup.css
@@ -7,6 +7,9 @@
 .bi-year-popup .year-popup-navigation > .first-element {
   border-left: none;
 }
+.bi-year-popup .toolbar-button {
+  line-height: 23px;
+}
 .bi-theme-dark .bi-year-popup .year-popup-navigation > .center-element {
   border-left: 1px solid #525466;
 }
diff --git a/src/css/widget/yearmonth/popup.css b/src/css/widget/yearmonth/popup.css
new file mode 100644
index 0000000000..95b214b688
--- /dev/null
+++ b/src/css/widget/yearmonth/popup.css
@@ -0,0 +1,3 @@
+.bi-year-month-popup .toolbar-button {
+  line-height: 23px;
+}
diff --git a/src/css/widget/yearquarter/popup.css b/src/css/widget/yearquarter/popup.css
new file mode 100644
index 0000000000..95b214b688
--- /dev/null
+++ b/src/css/widget/yearquarter/popup.css
@@ -0,0 +1,3 @@
+.bi-year-month-popup .toolbar-button {
+  line-height: 23px;
+}
diff --git a/src/less/widget/dynamicdatecombo/dynamicdatepopup.less b/src/less/widget/dynamicdatecombo/dynamicdatepopup.less
new file mode 100644
index 0000000000..dfb20a0225
--- /dev/null
+++ b/src/less/widget/dynamicdatecombo/dynamicdatepopup.less
@@ -0,0 +1,7 @@
+@import "../../index";
+
+.bi-dynamic-date-popup{
+  & .toolbar-button {
+    line-height: 23px;
+  }
+}
\ No newline at end of file
diff --git a/src/less/widget/dynamicdatecombo/dynamicdatetimepopup.less b/src/less/widget/dynamicdatecombo/dynamicdatetimepopup.less
new file mode 100644
index 0000000000..a8db4ad870
--- /dev/null
+++ b/src/less/widget/dynamicdatecombo/dynamicdatetimepopup.less
@@ -0,0 +1,7 @@
+@import "../../index";
+
+.bi-dynamic-date-time-popup{
+  & .toolbar-button {
+    line-height: 23px;
+  }
+}
\ No newline at end of file
diff --git a/src/less/widget/multidate/multidate.combo.less b/src/less/widget/multidate/multidate.combo.less
deleted file mode 100644
index 75e0474780..0000000000
--- a/src/less/widget/multidate/multidate.combo.less
+++ /dev/null
@@ -1,5 +0,0 @@
-@import "../../index";
-
-.bi-multidate-combo {
-  .border-radius(2px);
-}
\ No newline at end of file
diff --git a/src/less/widget/multidate/multidate.day.less b/src/less/widget/multidate/multidate.day.less
deleted file mode 100644
index f40710c5ce..0000000000
--- a/src/less/widget/multidate/multidate.day.less
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "../../index";
-
-.bi-multidate-daycard{
-  & .bi-multidate-inner-label{
-  }
-}
\ No newline at end of file
diff --git a/src/less/widget/multidate/multidate.month.less b/src/less/widget/multidate/multidate.month.less
deleted file mode 100644
index 717f6c559d..0000000000
--- a/src/less/widget/multidate/multidate.month.less
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "../../index";
-
-.bi-multidate-monthcard{
-  & .bi-multidate-inner-label{
-  }
-}
\ No newline at end of file
diff --git a/src/less/widget/multidate/multidate.popup.less b/src/less/widget/multidate/multidate.popup.less
deleted file mode 100644
index 9042a3d1c0..0000000000
--- a/src/less/widget/multidate/multidate.popup.less
+++ /dev/null
@@ -1,23 +0,0 @@
-@import "../../index";
-
-.bi-multidate-popup{
-
-  & .multidate-popup-label {
-    color:@color-bi-text-highlight;
-    font-size:@font-size-14;
-  }
-  & .multidate-popup-tab {
-  }
-  & .multidate-popup-item{
-    &:active,&.active{
-      background-color: @color-bi-text-highlight;
-      color: @color-bi-background-default;
-      .border-corner-radius(@radius-2,@radius-2,0,0);
-    }
-  }
-
-  & .multidate-popup-button{
-    color:@color-bi-text-highlight;
-    font-size:@font-size-14;
-  }
-}
\ No newline at end of file
diff --git a/src/less/widget/multidate/multidate.quarter.less b/src/less/widget/multidate/multidate.quarter.less
deleted file mode 100644
index 813bb316df..0000000000
--- a/src/less/widget/multidate/multidate.quarter.less
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "../../index";
-
-.bi-multidate-quartercard{
-  & .bi-multidate-inner-label{
-  }
-}
\ No newline at end of file
diff --git a/src/less/widget/multidate/multidate.segment.less b/src/less/widget/multidate/multidate.segment.less
deleted file mode 100644
index 006fd4372f..0000000000
--- a/src/less/widget/multidate/multidate.segment.less
+++ /dev/null
@@ -1,9 +0,0 @@
-@import "../../index";
-
-.bi-multidate-segment{
-  & .bi-multidate-normal-label{
-  }
-  & .bi-multidate-editor{
-    font-size: @font-size-14;
-  }
-}
\ No newline at end of file
diff --git a/src/less/widget/multidate/multidate.week.less b/src/less/widget/multidate/multidate.week.less
deleted file mode 100644
index 0cf4ada17c..0000000000
--- a/src/less/widget/multidate/multidate.week.less
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "../../index";
-
-.bi-multidate-weekcard{
-  & .bi-multidate-inner-label{
-  }
-}
\ No newline at end of file
diff --git a/src/less/widget/multidate/multidate.year.less b/src/less/widget/multidate/multidate.year.less
deleted file mode 100644
index 3c6579138a..0000000000
--- a/src/less/widget/multidate/multidate.year.less
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "../../index";
-
-.bi-multidate-yearcard{
-  & .bi-multidate-inner-label{
-  }
-}
\ No newline at end of file
diff --git a/src/less/widget/year/popup.year.less b/src/less/widget/year/popup.year.less
index 26bdd44517..800f0e1b16 100644
--- a/src/less/widget/year/popup.year.less
+++ b/src/less/widget/year/popup.year.less
@@ -10,6 +10,9 @@
       border-left: none;
     }
   }
+  & .toolbar-button {
+    line-height: 23px;
+  }
 }
 
 .bi-theme-dark {
diff --git a/src/less/widget/yearmonth/popup.yearmonth.less b/src/less/widget/yearmonth/popup.yearmonth.less
new file mode 100644
index 0000000000..6cfc307698
--- /dev/null
+++ b/src/less/widget/yearmonth/popup.yearmonth.less
@@ -0,0 +1,7 @@
+@import "../../index";
+
+.bi-year-month-popup{
+  & .toolbar-button {
+    line-height: 23px;
+  }
+}
\ No newline at end of file
diff --git a/src/less/widget/yearquarter/popup.yearquarter.less b/src/less/widget/yearquarter/popup.yearquarter.less
new file mode 100644
index 0000000000..6cfc307698
--- /dev/null
+++ b/src/less/widget/yearquarter/popup.yearquarter.less
@@ -0,0 +1,7 @@
+@import "../../index";
+
+.bi-year-month-popup{
+  & .toolbar-button {
+    line-height: 23px;
+  }
+}
\ No newline at end of file
diff --git a/src/widget/dynamicdate/dynamicdate.popup.js b/src/widget/dynamicdate/dynamicdate.popup.js
index 9e987ecff9..f877699bb9 100644
--- a/src/widget/dynamicdate/dynamicdate.popup.js
+++ b/src/widget/dynamicdate/dynamicdate.popup.js
@@ -24,7 +24,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -36,7 +36,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Multi_Date_Today"),
                         ref: function () {
@@ -51,7 +51,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/src/widget/dynamicdatetime/dynamicdatetime.popup.js b/src/widget/dynamicdatetime/dynamicdatetime.popup.js
index a92fdc07dd..34c863cba6 100644
--- a/src/widget/dynamicdatetime/dynamicdatetime.popup.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.popup.js
@@ -24,7 +24,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -36,7 +36,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Multi_Date_Today"),
                         ref: function () {
@@ -51,7 +51,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-high-light bi-border-top",
+                        cls: "bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/src/widget/year/popup.year.js b/src/widget/year/popup.year.js
index b5481e571d..42f1a25d1f 100644
--- a/src/widget/year/popup.year.js
+++ b/src/widget/year/popup.year.js
@@ -32,7 +32,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -44,7 +44,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Year"),
                         ref: function () {
@@ -59,7 +59,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/src/widget/yearmonth/popup.yearmonth.js b/src/widget/yearmonth/popup.yearmonth.js
index 950da4218e..7266dc5db5 100644
--- a/src/widget/yearmonth/popup.yearmonth.js
+++ b/src/widget/yearmonth/popup.yearmonth.js
@@ -32,7 +32,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -44,7 +44,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Month"),
                         ref: function () {
@@ -59,7 +59,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/src/widget/yearquarter/popup.yearquarter.js b/src/widget/yearquarter/popup.yearquarter.js
index 43dff52151..39b725994e 100644
--- a/src/widget/yearquarter/popup.yearquarter.js
+++ b/src/widget/yearquarter/popup.yearquarter.js
@@ -25,7 +25,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -37,7 +37,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top",
+                        cls: "bi-border-left bi-border-right bi-high-light bi-border-top toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Quarter"),
                         ref: function () {
@@ -52,7 +52,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         forceCenter: true,
-                        cls: "bi-border-top bi-high-light",
+                        cls: "bi-border-top bi-high-light toolbar-button",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{