@syncfusion/blazor-themes 26.1.41 → 26.1.42

package/SCSS-Themes/grids/grid/bds.scss

@@ -1185,7 +1185,7 @@ $grid-checkmark-color: $primary !default;
       .e-headercell.e-fltr-icon .e-headercelldiv .e-sortnumber {
         margin: $grid-rtl-bigger-sortnumber-withfilter-margin;
         @if $grid-skin == 'tailwind' {
-          margin-left: 0;
+          margin-left: 4px;
         }
       }
   
@@ -2525,7 +2525,17 @@ $grid-checkmark-color: $primary !default;
       text-transform: $grid-header-text-transform;
       user-select: none;
     }
-
+    
+    .e-rightalign:not(.e-fltr-icon) .e-headercelldiv {
+      padding: 0 .4em ;
+      @if $grid-skin == 'fabric' {
+        padding: 0 1px 0;
+      }
+      @if $grid-skin == 'highcontrast' {
+        padding: 0;
+      }
+    }
+    
     .e-headercelldiv.e-headerchkcelldiv {
       overflow: visible;
     }
@@ -3027,6 +3037,9 @@ $grid-checkmark-color: $primary !default;
         right: 2px;
       }
     }
+    &.e-rtl .e-sortfilter .e-rightalign .e-headercelldiv {
+      padding: $grid-headercelldiv-right-align-padding;
+    }
 
     .e-sortfilterdiv {
       float: right;
@@ -3073,7 +3086,7 @@ $grid-checkmark-color: $primary !default;
     }
 
     &.e-rtl .e-gridheader .e-sortfilter {
-      .e-centeralign.e-headercell[aria-sort="none"],
+      .e-centeralign.e-headercell[aria-sort="none"]:not(.e-centeralign),
       .e-centeralign.e-headercell:not([aria-sort]) {
         .e-headercelldiv,
         .e-stackedheadercelldiv {
@@ -4426,6 +4439,9 @@ $grid-checkmark-color: $primary !default;
           .e-headercelldiv.e-headerchkcelldiv {
             padding: $grid-rtl-headercelldiv-padding;
             text-align: right;
+            @if $grid-skin == 'highcontrast' {
+              margin: -7px 0;
+            }
 
             & .e-sortnumber {
               @include grid-flot-margin(left, $grid-fltr-rtl-sortnumber-margin);
@@ -4437,6 +4453,9 @@ $grid-checkmark-color: $primary !default;
         .e-headercelldiv.e-headerchkcelldiv {
           padding: $grid-rtl-headercelldiv-padding;
           text-align: right;
+          @if $grid-skin == 'highcontrast' {
+            margin: -7px 0;
+          }
 
           & .e-sortnumber {
             @include grid-flot-margin(left, $grid-rtl-sortnumber-margin);
@@ -4457,9 +4476,6 @@ $grid-checkmark-color: $primary !default;
 
             & .e-sortnumber {
               margin: $grid-rtl-sort-num-left-align-margin;
-              @if $grid-skin == 'bootstrap4' {
-                margin: 4px -2px 0 0;
-              }
             }
           }
 
@@ -4478,7 +4494,7 @@ $grid-checkmark-color: $primary !default;
           }
 
           & .e-headercelldiv {
-            padding: 0 25px 0 .7em;
+            padding: 0 1.6em 0 1.2em;
 
             & .e-sortnumber {
               @include grid-flot-margin(right, $grid-bigger-sort-right-margin);

package/SCSS-Themes/grids/grid/bootstrap-dark.scss

@@ -1174,7 +1174,7 @@ $grid-checkmark-color: $grey-light-font !default;
       .e-headercell.e-fltr-icon .e-headercelldiv .e-sortnumber {
         margin: $grid-rtl-bigger-sortnumber-withfilter-margin;
         @if $grid-skin == 'tailwind' {
-          margin-left: 0;
+          margin-left: 4px;
         }
       }
   
@@ -2514,7 +2514,17 @@ $grid-checkmark-color: $grey-light-font !default;
       text-transform: $grid-header-text-transform;
       user-select: none;
     }
-
+    
+    .e-rightalign:not(.e-fltr-icon) .e-headercelldiv {
+      padding: 0 .4em ;
+      @if $grid-skin == 'fabric' {
+        padding: 0 1px 0;
+      }
+      @if $grid-skin == 'highcontrast' {
+        padding: 0;
+      }
+    }
+    
     .e-headercelldiv.e-headerchkcelldiv {
       overflow: visible;
     }
@@ -3016,6 +3026,9 @@ $grid-checkmark-color: $grey-light-font !default;
         right: 2px;
       }
     }
+    &.e-rtl .e-sortfilter .e-rightalign .e-headercelldiv {
+      padding: $grid-headercelldiv-right-align-padding;
+    }
 
     .e-sortfilterdiv {
       float: right;
@@ -3062,7 +3075,7 @@ $grid-checkmark-color: $grey-light-font !default;
     }
 
     &.e-rtl .e-gridheader .e-sortfilter {
-      .e-centeralign.e-headercell[aria-sort="none"],
+      .e-centeralign.e-headercell[aria-sort="none"]:not(.e-centeralign),
       .e-centeralign.e-headercell:not([aria-sort]) {
         .e-headercelldiv,
         .e-stackedheadercelldiv {
@@ -4415,6 +4428,9 @@ $grid-checkmark-color: $grey-light-font !default;
           .e-headercelldiv.e-headerchkcelldiv {
             padding: $grid-rtl-headercelldiv-padding;
             text-align: right;
+            @if $grid-skin == 'highcontrast' {
+              margin: -7px 0;
+            }
 
             & .e-sortnumber {
               @include grid-flot-margin(left, $grid-fltr-rtl-sortnumber-margin);
@@ -4426,6 +4442,9 @@ $grid-checkmark-color: $grey-light-font !default;
         .e-headercelldiv.e-headerchkcelldiv {
           padding: $grid-rtl-headercelldiv-padding;
           text-align: right;
+          @if $grid-skin == 'highcontrast' {
+            margin: -7px 0;
+          }
 
           & .e-sortnumber {
             @include grid-flot-margin(left, $grid-rtl-sortnumber-margin);
@@ -4446,9 +4465,6 @@ $grid-checkmark-color: $grey-light-font !default;
 
             & .e-sortnumber {
               margin: $grid-rtl-sort-num-left-align-margin;
-              @if $grid-skin == 'bootstrap4' {
-                margin: 4px -2px 0 0;
-              }
             }
           }
 
@@ -4467,7 +4483,7 @@ $grid-checkmark-color: $grey-light-font !default;
           }
 
           & .e-headercelldiv {
-            padding: 0 25px 0 .7em;
+            padding: 0 1.6em 0 1.2em;
 
             & .e-sortnumber {
               @include grid-flot-margin(right, $grid-bigger-sort-right-margin);

package/SCSS-Themes/grids/grid/bootstrap.scss

@@ -266,9 +266,9 @@ $grid-summary-template-row-bg-color: '' !default;
 $grid-summary-row-bg-color: $grey-lighter !default;
 $grid-sortdiv-width: 16px !default;
 $grid-sortdiv-height: 16px !default;
-$grid-sortnumber-margin: 8px 8px 0 2px !default;
+$grid-sortnumber-margin: 8px 10px 0 2px !default;
 $grid-fltr-sortnumber-margin: $grid-sortnumber-margin !default;
-$grid-fltr-sortnumber-rightalign-margin: 8px 0 0 20px !default;
+$grid-fltr-sortnumber-rightalign-margin: 8px 0 0 10px !default;
 $grid-sortnumber-rightalign-margin: $grid-fltr-sortnumber-rightalign-margin !default;
 $grid-sortnumer-line-height: 15px !default;
 $grid-bigger-sortnumer-line-height: $grid-sortnumer-line-height !default;
@@ -340,9 +340,9 @@ $grid-rtl-headercelldiv-padding: 0 .4em 0 1.8em !default;
 $grid-rtl-headercelldiv-chkbox-padding: 0 .35em 0 .3em !default;
 $grid-bigger-rtl-headercelldiv-chkbox-padding: 0 .35em 0 .3em !default;
 $grid-ungroup-rtl-padding-right: -8px !default;
-$grid-headercelldiv-padding: 0 1.8em 0 .4em !default;
+$grid-headercelldiv-padding: 0 .7em 0 .4em !default;
 $grid-headercelldiv-sort-centeralign-padding-right: .4em !default;
-$grid-headercell-div-padding: 0 .4em !default;
+$grid-headercell-div-padding: 0 1.2em 0 .4em !default;
 $grid-group-text-width: auto !default;
 $grid-grouptopleftcell-border-top: 2px solid !default;
 $grid-group-caption-font-size: 14px !default;
@@ -509,10 +509,10 @@ $grid-rowcell-wrap-height: 18px !default;
 $grid-rowcell-autofill-top-height: 16px !default;
 $grid-rowcell-autofill-top-bottom-height: 14px !default;
 $grid-rowcell-wrap-max-height: 36px !default;
-$grid-bigger-fltr-sortnumber-rightalign-margin: 8px 0 0 12px !default;
+$grid-bigger-fltr-sortnumber-rightalign-margin: 8px 2px 0 3px !default;
 $grid-bigger-sortnumber-rightalign-margin: 7px 0 0 20px !default;
 $grid-bigger-columnmenu-bottom: 16px !default;
-$grid-bigger-sortnumber-margin: 7px 0 0 2px !default;
+$grid-bigger-sortnumber-margin: 7px 6px 0 2px !default;
 $grid-bigger-fltr-sortnumber-margin: $grid-bigger-sortnumber-margin !default;
 $grid-rtl-searchclear: 0 !default;
 $grid-column-chosser-searchdiv-top: -46px !default;
@@ -598,7 +598,7 @@ $grid-responsive-apply-btn-top: 3px !default;
 $grid-responsive-column-menu-icon-margin-top: 0 !default;
 $grid-rtl-headercelldiv-left-align-margin: 10px !default;
 $grid-rtl-filtermenudiv-left-align-margin: -5px !default;
-$grid-rtl-sort-num-left-align-margin: 8px -6px 0 0 !default;
+$grid-rtl-sort-num-left-align-margin: 8px -6px 0 2px !default;
 $grid-frozen-mac-scrollbar-background: rgba(0, 0, 0, .5) !default;
 $grid-rowcell-color: rgba($grid-content-font-color, $grid-conent-font-opacity) !default;
 $grid-reorderarrow-margin-top: -6.5px !default;
@@ -1173,7 +1173,7 @@ $grid-checkmark-color: $grey !default;
       .e-headercell.e-fltr-icon .e-headercelldiv .e-sortnumber {
         margin: $grid-rtl-bigger-sortnumber-withfilter-margin;
         @if $grid-skin == 'tailwind' {
-          margin-left: 0;
+          margin-left: 4px;
         }
       }
   
@@ -2513,7 +2513,17 @@ $grid-checkmark-color: $grey !default;
       text-transform: $grid-header-text-transform;
       user-select: none;
     }
-
+    
+    .e-rightalign:not(.e-fltr-icon) .e-headercelldiv {
+      padding: 0 .4em ;
+      @if $grid-skin == 'fabric' {
+        padding: 0 1px 0;
+      }
+      @if $grid-skin == 'highcontrast' {
+        padding: 0;
+      }
+    }
+    
     .e-headercelldiv.e-headerchkcelldiv {
       overflow: visible;
     }
@@ -3015,6 +3025,9 @@ $grid-checkmark-color: $grey !default;
         right: 2px;
       }
     }
+    &.e-rtl .e-sortfilter .e-rightalign .e-headercelldiv {
+      padding: $grid-headercelldiv-right-align-padding;
+    }
 
     .e-sortfilterdiv {
       float: right;
@@ -3061,7 +3074,7 @@ $grid-checkmark-color: $grey !default;
     }
 
     &.e-rtl .e-gridheader .e-sortfilter {
-      .e-centeralign.e-headercell[aria-sort="none"],
+      .e-centeralign.e-headercell[aria-sort="none"]:not(.e-centeralign),
       .e-centeralign.e-headercell:not([aria-sort]) {
         .e-headercelldiv,
         .e-stackedheadercelldiv {
@@ -4414,6 +4427,9 @@ $grid-checkmark-color: $grey !default;
           .e-headercelldiv.e-headerchkcelldiv {
             padding: $grid-rtl-headercelldiv-padding;
             text-align: right;
+            @if $grid-skin == 'highcontrast' {
+              margin: -7px 0;
+            }
 
             & .e-sortnumber {
               @include grid-flot-margin(left, $grid-fltr-rtl-sortnumber-margin);
@@ -4425,6 +4441,9 @@ $grid-checkmark-color: $grey !default;
         .e-headercelldiv.e-headerchkcelldiv {
           padding: $grid-rtl-headercelldiv-padding;
           text-align: right;
+          @if $grid-skin == 'highcontrast' {
+            margin: -7px 0;
+          }
 
           & .e-sortnumber {
             @include grid-flot-margin(left, $grid-rtl-sortnumber-margin);
@@ -4445,9 +4464,6 @@ $grid-checkmark-color: $grey !default;
 
             & .e-sortnumber {
               margin: $grid-rtl-sort-num-left-align-margin;
-              @if $grid-skin == 'bootstrap4' {
-                margin: 4px -2px 0 0;
-              }
             }
           }
 
@@ -4466,7 +4482,7 @@ $grid-checkmark-color: $grey !default;
           }
 
           & .e-headercelldiv {
-            padding: 0 25px 0 .7em;
+            padding: 0 1.6em 0 1.2em;
 
             & .e-sortnumber {
               @include grid-flot-margin(right, $grid-bigger-sort-right-margin);

package/SCSS-Themes/grids/grid/bootstrap4.scss

@@ -268,9 +268,9 @@ $grid-summary-template-row-bg-color: '' !default;
 $grid-summary-row-bg-color: $gray-100 !default;
 $grid-sortdiv-width: 16px !default;
 $grid-sortdiv-height: 16px !default;
-$grid-sortnumber-margin: 2px -6px 0 0 !default;
+$grid-sortnumber-margin: 2px 0 0 0 !default;
 $grid-fltr-sortnumber-margin: $grid-sortnumber-margin !default;
-$grid-fltr-sortnumber-rightalign-margin: 2px 8px 0 8px !default;
+$grid-fltr-sortnumber-rightalign-margin: 2px 8px 0 4px !default;
 $grid-sortnumber-rightalign-margin: $grid-fltr-sortnumber-rightalign-margin !default;
 $grid-sortnumer-line-height: 16px !default;
 $grid-bigger-sortnumer-line-height: $grid-sortnumer-line-height !default;
@@ -342,9 +342,9 @@ $grid-rtl-headercelldiv-padding: 0 .4em 0 1.8em !default;
 $grid-rtl-headercelldiv-chkbox-padding: 0 .35em 0 .3em !default;
 $grid-bigger-rtl-headercelldiv-chkbox-padding: 0 .35em 0 .3em !default;
 $grid-ungroup-rtl-padding-right: -10px !default;
-$grid-headercelldiv-padding: 0 20px 0 5px !default;
+$grid-headercelldiv-padding: 0 10px 0 5px !default;
 $grid-headercelldiv-sort-centeralign-padding-right: 5px !default;
-$grid-headercell-div-padding: 0 .4em !default;
+$grid-headercell-div-padding: 0 1.1em 0 .4em !default;
 $grid-group-text-width: auto !default;
 $grid-grouptopleftcell-border-top: 2px solid !default;
 $grid-group-caption-font-size: 14px !default;
@@ -517,10 +517,10 @@ $grid-rowcell-wrap-height: 21px !default;
 $grid-rowcell-autofill-top-height: 19px !default;
 $grid-rowcell-autofill-top-bottom-height: 17px !default;
 $grid-rowcell-wrap-max-height: 36px !default;
-$grid-bigger-fltr-sortnumber-rightalign-margin: 4px 0 0 10px !default;
+$grid-bigger-fltr-sortnumber-rightalign-margin: 4px 2px 0 4px !default;
 $grid-bigger-sortnumber-rightalign-margin: 4px 0 0 10px !default;
 $grid-bigger-columnmenu-bottom: 13px !default;
-$grid-bigger-sortnumber-margin: 4px 5px 0 2px !default;
+$grid-bigger-sortnumber-margin: 4px 8px 0 2px !default;
 $grid-bigger-fltr-sortnumber-margin: $grid-bigger-sortnumber-margin !default;
 $grid-rtl-searchclear: 0 !default;
 $grid-column-chosser-searchdiv-top: -44px !default;
@@ -605,7 +605,7 @@ $grid-responsive-apply-btn-top: 7px !default;
 $grid-responsive-column-menu-icon-margin-top: 4px !default;
 $grid-rtl-headercelldiv-left-align-margin: 10px !default;
 $grid-rtl-filtermenudiv-left-align-margin: -5px !default;
-$grid-rtl-sort-num-left-align-margin: 2px -2px 0 0 !default;
+$grid-rtl-sort-num-left-align-margin: 2px -2px 0 2px !default;
 $grid-frozen-mac-scrollbar-background: rgba(0, 0, 0, .5) !default;
 $grid-rowcell-color: $grid-content-font-color !default;
 $grid-reorderarrow-margin-top: -7.5px !default;
@@ -1180,7 +1180,7 @@ $grid-checkmark-color: $white !default;
       .e-headercell.e-fltr-icon .e-headercelldiv .e-sortnumber {
         margin: $grid-rtl-bigger-sortnumber-withfilter-margin;
         @if $grid-skin == 'tailwind' {
-          margin-left: 0;
+          margin-left: 4px;
         }
       }
   
@@ -2520,7 +2520,17 @@ $grid-checkmark-color: $white !default;
       text-transform: $grid-header-text-transform;
       user-select: none;
     }
-
+    
+    .e-rightalign:not(.e-fltr-icon) .e-headercelldiv {
+      padding: 0 .4em ;
+      @if $grid-skin == 'fabric' {
+        padding: 0 1px 0;
+      }
+      @if $grid-skin == 'highcontrast' {
+        padding: 0;
+      }
+    }
+    
     .e-headercelldiv.e-headerchkcelldiv {
       overflow: visible;
     }
@@ -3022,6 +3032,9 @@ $grid-checkmark-color: $white !default;
         right: 2px;
       }
     }
+    &.e-rtl .e-sortfilter .e-rightalign .e-headercelldiv {
+      padding: $grid-headercelldiv-right-align-padding;
+    }
 
     .e-sortfilterdiv {
       float: right;
@@ -3068,7 +3081,7 @@ $grid-checkmark-color: $white !default;
     }
 
     &.e-rtl .e-gridheader .e-sortfilter {
-      .e-centeralign.e-headercell[aria-sort="none"],
+      .e-centeralign.e-headercell[aria-sort="none"]:not(.e-centeralign),
       .e-centeralign.e-headercell:not([aria-sort]) {
         .e-headercelldiv,
         .e-stackedheadercelldiv {
@@ -4421,6 +4434,9 @@ $grid-checkmark-color: $white !default;
           .e-headercelldiv.e-headerchkcelldiv {
             padding: $grid-rtl-headercelldiv-padding;
             text-align: right;
+            @if $grid-skin == 'highcontrast' {
+              margin: -7px 0;
+            }
 
             & .e-sortnumber {
               @include grid-flot-margin(left, $grid-fltr-rtl-sortnumber-margin);
@@ -4432,6 +4448,9 @@ $grid-checkmark-color: $white !default;
         .e-headercelldiv.e-headerchkcelldiv {
           padding: $grid-rtl-headercelldiv-padding;
           text-align: right;
+          @if $grid-skin == 'highcontrast' {
+            margin: -7px 0;
+          }
 
           & .e-sortnumber {
             @include grid-flot-margin(left, $grid-rtl-sortnumber-margin);
@@ -4452,9 +4471,6 @@ $grid-checkmark-color: $white !default;
 
             & .e-sortnumber {
               margin: $grid-rtl-sort-num-left-align-margin;
-              @if $grid-skin == 'bootstrap4' {
-                margin: 4px -2px 0 0;
-              }
             }
           }
 
@@ -4473,7 +4489,7 @@ $grid-checkmark-color: $white !default;
           }
 
           & .e-headercelldiv {
-            padding: 0 25px 0 .7em;
+            padding: 0 1.6em 0 1.2em;
 
             & .e-sortnumber {
               @include grid-flot-margin(right, $grid-bigger-sort-right-margin);

package/SCSS-Themes/grids/grid/bootstrap5-dark.scss

@@ -110,7 +110,7 @@ $grid-columnchooser-input-padding-left: 4px !default;
 $grid-columnchooser-ul-margin: 13px 0 !default;
 $grid-column-chooser-dlg-footer-padding: 8px !default;
 $grid-rtl-bigger-sortnumber-margin: 4px 0 0 -20px !default;
-$grid-rtl-bigger-sortnumber-withfilter-margin: 2px 0 0 4px !default;
+$grid-rtl-bigger-sortnumber-withfilter-margin: 2px 0 0 11px !default;
 $grid-rtl-bigger-rightalign-sortnumber-margin: 3px 0 0 8px !default;
 $grid-rtl-group-text-marign-right: 0 !default;
 $grid-rtl-group-text-margin-right: 0 !default;
@@ -266,7 +266,7 @@ $grid-sortdiv-width: 18px !default;
 $grid-sortdiv-height: 18px !default;
 $grid-sortnumber-margin: 2px 10px 1px 8px !default;
 $grid-fltr-sortnumber-margin: 2px 8px 1px 8px !default;
-$grid-fltr-sortnumber-rightalign-margin: 2px 8px 0 10px !default;
+$grid-fltr-sortnumber-rightalign-margin: 2px 8px 0 3px !default;
 $grid-sortnumber-rightalign-margin: 2px 8px 0 10px !default;
 $grid-sortnumer-line-height: 14px !default;
 $grid-bigger-sortnumer-line-height: 16px !default;
@@ -322,9 +322,9 @@ $grid-ungroup-rtl-padding-top: 2px !default;
 $grid-bigger-ungroup-rtl-padding-top: $grid-ungroup-rtl-padding-top !default;
 $grid-rtl-group-headercell-margin-right: 5px !default;
 $grid-rtl-group-headercell-margin-left: 0 !default;
-$grid-fltr-rtl-sortnumber-margin: 1px 0 0 12px !default;
+$grid-fltr-rtl-sortnumber-margin: 1px 0 0 15px !default;
 $grid-rtl-sortnumber-margin: 1px 0 0 -10px !default;
-$grid-fltr-rtl-sortnumber-rightalign-margin: 1px 0 0 12px !default;
+$grid-fltr-rtl-sortnumber-rightalign-margin: 1px 0 0 15px !default;
 $grid-rtl-sortnumber-rightalign-margin: 1px 0 0 10px !default;
 $grid-rtl-sortcelldiv-margin: -10px 8px -12px -2px !default;
 $grid-rtl-sortcelldiv-right-align-margin: -10px 8px -12px -2px !default;
@@ -334,13 +334,13 @@ $grid-rtl-grouped-headercell-padding: 5px 0 !default;
 $grid-rtl-group-text-margin-left: 0 !default;
 $grid-rtl-group-sorticon-margin-right: -7px !default;
 $grid-rtl-headercell-border-width: 0 !default;
-$grid-rtl-headercelldiv-padding: 0 .4em 0 2.8em !default;
+$grid-rtl-headercelldiv-padding: 0 .4em 0 2em !default;
 $grid-rtl-headercelldiv-chkbox-padding: 0 .45em 0 .5em !default;
 $grid-bigger-rtl-headercelldiv-chkbox-padding: 0 .45em 0 .5em !default;
 $grid-ungroup-rtl-padding-right: -9px !default;
-$grid-headercelldiv-padding: 0 20px 0 5px !default;
+$grid-headercelldiv-padding: 0 10px 0 5px !default;
 $grid-headercelldiv-sort-centeralign-padding-right: 5px !default;
-$grid-headercell-div-padding: 0 .4em !default;
+$grid-headercell-div-padding: 0 1.5em 0 .4em !default;
 $grid-group-text-width: auto !default;
 $grid-grouptopleftcell-border-top: 2px solid !default;
 $grid-group-caption-font-size: $text-sm !default;
@@ -504,11 +504,11 @@ $grid-rowcell-wrap-height: 21px !default;
 $grid-rowcell-autofill-top-height: 19px !default;
 $grid-rowcell-autofill-top-bottom-height: 17px !default;
 $grid-rowcell-wrap-max-height: 36px !default;
-$grid-bigger-fltr-sortnumber-rightalign-margin: 2px 4px 0 -6px !default;
+$grid-bigger-fltr-sortnumber-rightalign-margin: 2px 4px 0 -11px !default;
 $grid-bigger-sortnumber-rightalign-margin: 2px 4px 0 6px !default;
 $grid-bigger-columnmenu-bottom: 13px !default;
 $grid-bigger-sortnumber-margin: 2px 4px 0 4px !default;
-$grid-bigger-fltr-sortnumber-margin: 2px 4px 0 -6px !default;
+$grid-bigger-fltr-sortnumber-margin: 2px 4px 0 0 !default;
 $grid-rtl-searchclear: 0 !default;
 $grid-column-chosser-searchdiv-top: -41px !default;
 $grid-reorderarrow-font-size: $text-xxs !default;
@@ -592,7 +592,7 @@ $grid-responsive-apply-btn-top: 4px !default;
 $grid-responsive-column-menu-icon-margin-top: 4px !default;
 $grid-rtl-headercelldiv-left-align-margin: 10px !default;
 $grid-rtl-filtermenudiv-left-align-margin: -2px !default;
-$grid-rtl-sort-num-left-align-margin: 2px 8px 0 0 !default;
+$grid-rtl-sort-num-left-align-margin: 2px 8px 0 2px !default;
 $grid-frozen-mac-scrollbar-background: rgba(0, 0, 0, .5) !default;
 $grid-rowcell-color: $content-text-color !default;
 $grid-header-text-transform: none !default;
@@ -1173,7 +1173,7 @@ $grid-checkmark-color: $primary-text-color !default;
       .e-headercell.e-fltr-icon .e-headercelldiv .e-sortnumber {
         margin: $grid-rtl-bigger-sortnumber-withfilter-margin;
         @if $grid-skin == 'tailwind' {
-          margin-left: 0;
+          margin-left: 4px;
         }
       }
   
@@ -2513,7 +2513,17 @@ $grid-checkmark-color: $primary-text-color !default;
       text-transform: $grid-header-text-transform;
       user-select: none;
     }
-
+    
+    .e-rightalign:not(.e-fltr-icon) .e-headercelldiv {
+      padding: 0 .4em ;
+      @if $grid-skin == 'fabric' {
+        padding: 0 1px 0;
+      }
+      @if $grid-skin == 'highcontrast' {
+        padding: 0;
+      }
+    }
+    
     .e-headercelldiv.e-headerchkcelldiv {
       overflow: visible;
     }
@@ -3015,6 +3025,9 @@ $grid-checkmark-color: $primary-text-color !default;
         right: 2px;
       }
     }
+    &.e-rtl .e-sortfilter .e-rightalign .e-headercelldiv {
+      padding: $grid-headercelldiv-right-align-padding;
+    }
 
     .e-sortfilterdiv {
       float: right;
@@ -3061,7 +3074,7 @@ $grid-checkmark-color: $primary-text-color !default;
     }
 
     &.e-rtl .e-gridheader .e-sortfilter {
-      .e-centeralign.e-headercell[aria-sort="none"],
+      .e-centeralign.e-headercell[aria-sort="none"]:not(.e-centeralign),
       .e-centeralign.e-headercell:not([aria-sort]) {
         .e-headercelldiv,
         .e-stackedheadercelldiv {
@@ -4414,6 +4427,9 @@ $grid-checkmark-color: $primary-text-color !default;
           .e-headercelldiv.e-headerchkcelldiv {
             padding: $grid-rtl-headercelldiv-padding;
             text-align: right;
+            @if $grid-skin == 'highcontrast' {
+              margin: -7px 0;
+            }
 
             & .e-sortnumber {
               @include grid-flot-margin(left, $grid-fltr-rtl-sortnumber-margin);
@@ -4425,6 +4441,9 @@ $grid-checkmark-color: $primary-text-color !default;
         .e-headercelldiv.e-headerchkcelldiv {
           padding: $grid-rtl-headercelldiv-padding;
           text-align: right;
+          @if $grid-skin == 'highcontrast' {
+            margin: -7px 0;
+          }
 
           & .e-sortnumber {
             @include grid-flot-margin(left, $grid-rtl-sortnumber-margin);
@@ -4445,9 +4464,6 @@ $grid-checkmark-color: $primary-text-color !default;
 
             & .e-sortnumber {
               margin: $grid-rtl-sort-num-left-align-margin;
-              @if $grid-skin == 'bootstrap4' {
-                margin: 4px -2px 0 0;
-              }
             }
           }
 
@@ -4466,7 +4482,7 @@ $grid-checkmark-color: $primary-text-color !default;
           }
 
           & .e-headercelldiv {
-            padding: 0 25px 0 .7em;
+            padding: 0 1.6em 0 1.2em;
 
             & .e-sortnumber {
               @include grid-flot-margin(right, $grid-bigger-sort-right-margin);