@wavemaker/rn-codegen 11.15.1-rc.248 → 11.15.2-rc.249

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/advanced/carousel.less

@@ -5,9 +5,7 @@
 
 .app-carousel-slide{
     width: var(--wm-carousel-slide-width);
-    padding-left: var(--wm-carousel-slide-padding-horizontal);
-    padding-right: var(--wm-carousel-slide-padding-horizontal);
-    padding-horizontal:var(--wm-carousel-slide-padding-horizontal);
+    padding: var(--wm-carousel-slide-padding);
 }
 
 .app-carousel-first-slide {
@@ -17,8 +15,7 @@
 }
 
 .app-carousel-active-slide {
-    padding-left: var(--wm-carousel-slide-padding-horizontal);
-    padding-right: var(--wm-carousel-slide-padding-horizontal);
+    padding: var(--wm-carousel-slide-padding);
 }
 .app-carousel-prev-btn {
 }
@@ -78,8 +75,7 @@
 .app-carousel-dot-wrapper { 
     opacity: var(--wm-carousel-dots-wrapper-opacity);
     background-color: var(--wm-carousel-dots-wrapper-background-color);
-    padding-top: var(--wm-carousel-dots-wrapper-padding-top);
-    padding-bottom: var(--wm-carousel-dots-wrapper-padding-bottom);
+    padding: var(--wm-carousel-dots-wrapper-padding);
 }
 
 .app-carousel-dot { 
@@ -88,8 +84,7 @@
     height: var(--wm-carousel-dots-height);
     border-radius: var(--wm-carousel-dots-border-radius);
     border-color: var(--wm-carousel-dots-border-color);
-    margin-left: var(--wm-carousel-dots-margin-left);
-    margin-right: var(--wm-carousel-dots-margin-right);
+    margin: var(--wm-carousel-dots-margin);
     background-color: var(--wm-carousel-dots-background);
     border-width: var(--wm-carousel-dots-border-width);
 }
@@ -105,14 +100,13 @@
     height: var(--wm-carousel-dots-height);
     border-radius: var(--wm-carousel-dots-border-radius);
     border-color: var(--wm-carousel-dots-border-color);
-    margin-left: var(--wm-carousel-dots-margin-left);
-    margin-right: var(--wm-carousel-dots-margin-right);
+    margin: var(--wm-carousel-dots-margin);
     background-color: var(--wm-carousel-dots-background);
     border-width: var(--wm-carousel-dots-border-width);
 }
 
 .app-carousel-skeleton {
-    width: var(--wm-carousel-skeleton-width);
+
 }
 
 .app-carousel-dot-skeleton {

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/advanced/login.less

@@ -7,8 +7,5 @@
 }
 
 .app-login-form-container {
-    padding-top: var(--wm-login-form-padding-top);
-    padding-right: var(--wm-login-form-padding-right);
-    padding-bottom: var(--wm-login-form-padding-bottom);
-    padding-left: var(--wm-login-form-padding-left);
+    padding: var(--wm-login-form-padding);
 }

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/advanced/webview.less

@@ -1,7 +1,4 @@
 .app-webview {
   background-color: var(--wm-webview-background-color);
-  padding-right: var(--wm-webview-padding-right);
-  padding-left: var(--wm-webview-padding-left);
-  padding-bottom: var(--wm-webview-padding-bottom);
-  padding-top: var(--wm-webview-padding-top);
+  padding: var(--wm-webview-padding);
 }

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/basic/anchor.less

@@ -5,8 +5,7 @@
 
 .app-anchor-text {
     color: var(--wm-anchor-color);
-    padding-left: var(--wm-anchor-text-padding-left);
-    padding-right: var(--wm-anchor-text-padding-right);
+    padding: var(--wm-anchor-text-padding);
     font-size: var(--wm-anchor-font-size);
     font-family: var(--wm-anchor-font-family);
     font-weight: var(--wm-anchor-font-weight);
@@ -14,6 +13,7 @@
     letter-spacing: var(--wm-anchor-letter-spacing);
     text-transform: var(--wm-anchor-text-transform);
     text-decoration: var(--wm-anchor-text-decoration);
+    text-decoration-line: var(--wm-anchor-text-decoration);
 }
 
 .app-anchor-icon-image {

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/basic/bottomsheet.less

@@ -3,22 +3,18 @@
 }
 
 .app-bottomsheet-container {
+    width: var(--wm-bottomsheet-width);
     background-color: var(--wm-bottomsheet-background); 
     border-top-right-radius: var(--wm-bottomsheet-border-radius); 
     border-top-left-radius: var(--wm-bottomsheet-border-radius); 
-    margin-left: var(--wm-bottomsheet-margin-left); 
-    margin-right: var(--wm-bottomsheet-margin-right); 
-    border-top-width: var(--wm-bottomsheet-border-width-top); 
-    border-bottom-width: var(--wm-bottomsheet-border-width-bottom); 
-    border-left-width: var(--wm-bottomsheet-border-width-left); 
-    border-right-width: var(--wm-bottomsheet-border-width-right); 
+    margin: var(--wm-bottomsheet-margin); 
+    border-width: var(--wm-bottomsheet-border-width); 
     border-color: var(--wm-bottomsheet-border-color);
     border-style: var(--wm-bottomsheet-border-style);
 }
 
 .app-bottomsheet-draghandle-container {
-    padding-top: var(--wm-bottomsheet-handle-padding-top); 
-    padding-bottom: var(--wm-bottomsheet-handle-padding-bottom); 
+    padding: var(--wm-bottomsheet-handle-padding); 
     border-bottom-width: var(--wm-bottomsheet-handle-border-width); 
     border-bottom-color: var(--wm-bottomsheet-handle-border-color); 
     background-color: var(--wm-bottomsheet-handle-background); 
@@ -32,8 +28,5 @@
 
 .app-bottomsheet-content {
     background-color: var(--wm-bottomsheet-background); 
-    padding-left: var(--wm-bottomsheet-content-padding-left); 
-    padding-right: var(--wm-bottomsheet-content-padding-right); 
-    padding-top: var(--wm-bottomsheet-content-padding-top); 
-    padding-bottom: var(--wm-bottomsheet-content-padding-bottom); 
+    padding: var(--wm-bottomsheet-content-padding); 
 }

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/basic/button.less

@@ -1,7 +1,4 @@
 .app-button {
-    position: var(--wm-btn-position);
-    bottom: var(--wm-btn-position-bottom);
-    right: var(--wm-btn-position-right);
     background-color: var(--wm-btn-background);
     border-width: var(--wm-btn-border-width);
     border-style: var(--wm-btn-border-style);
@@ -13,10 +10,7 @@
     overflow: hidden;
     min-width: var(--wm-btn-min-width);
     min-height: var(--wm-btn-height);
-    padding-left: var(--wm-btn-padding-left);
-    padding-right: var(--wm-btn-padding-right);
-    padding-bottom: var(--wm-btn-padding-bottom);
-    padding-top: var(--wm-btn-padding-top);
+    padding: var(--wm-btn-padding);
     cursor: var(--wm-btn-cursor);
     color: var(--wm-btn-color);
     opacity: var(--wm-btn-opacity);
@@ -46,14 +40,11 @@
 
 
 .app-button-icon {
-    padding-left: var(--wm-space-0);
-    padding-right: var(--wm-space-0);
-    padding-top: var(--wm-space-0);
-    padding-bottom: var(--wm-space-0);
+    padding: var(--wm-btn-icon-padding);
 }
 
 .app-button-icon .app-icon{
-    color: var(--wm-btn-color);
+    color: var(--wm-btn-icon-color);
 }
 
 .app-button-icon .app-icon-shape {

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/basic/buttongroup.less

@@ -17,19 +17,13 @@
 
 .btn-group-child {
   background-color: var(--wm-btn-background);
-  border-top-width: var(--wm-btn-border-width);
-  border-bottom-width: var(--wm-btn-border-width);
-  border-left-width: var(--wm-btn-border-width);
-  border-right-width: var(--wm-btn-border-width);
+  border-width: var(--wm-btn-border-width);
   border-color: var(--wm-btn-border-color);
 }
 
 .btn-group-first-child {
   background-color: var(--wm-btn-background);
-  border-top-width: var(--wm-btn-border-width);
-  border-bottom-width: var(--wm-btn-border-width);
-  border-left-width: var(--wm-btn-border-width);
-  border-right-width: var(--wm-btn-border-width);
+  border-width: var(--wm-btn-border-width);
   border-color: var(--wm-btn-border-color);
   border-top-left-radius: var(--wm-btn-radius);
   border-bottom-left-radius: var(--wm-btn-radius);
@@ -37,10 +31,7 @@
 
 .btn-group-last-child {
   background-color: var(--wm-btn-background);
-  border-top-width: var(--wm-btn-border-width);
-  border-bottom-width: var(--wm-btn-border-width);
-  border-left-width: var(--wm-btn-border-width);
-  border-right-width: var(--wm-btn-border-width);
+  border-width: var(--wm-btn-border-width);
   border-color: var(--wm-btn-border-color);
   border-top-right-radius: var(--wm-btn-radius);
   border-bottom-right-radius: var(--wm-btn-radius);

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/basic/label.less

@@ -1,8 +1,5 @@
 .app-label {
-    margin-top: var(--wm-label-margin-top);
-    margin-bottom: var(--wm-label-margin-bottom);
-    margin-left: var(--wm-label-margin-left);
-    margin-right: var(--wm-label-margin-right);
+    margin: var(--wm-space-0);
     padding-top: var(--wm-label-padding-top);
     padding-bottom: var(--wm-label-padding-bottom);
     padding-left: var(--wm-label-padding-left);
@@ -48,6 +45,7 @@
     color: var(--wm-label-color);
     line-height: var(--wm-label-line-height);
     letter-spacing: var(--wm-label-letter-spacing);
+    margin: var(--wm-space-0);
 }
 
 .h2.app-label-text {
@@ -57,6 +55,7 @@
     color: var(--wm-label-color);
     line-height: var(--wm-label-line-height);
     letter-spacing: var(--wm-label-letter-spacing);
+    margin: var(--wm-space-0);
 }
 
 .h3.app-label-text {
@@ -66,6 +65,7 @@
     color: var(--wm-label-color);
     line-height: var(--wm-label-line-height);
     letter-spacing: var(--wm-label-letter-spacing);
+    margin: var(--wm-space-0);
 }
 
 .h4.app-label-text {
@@ -75,6 +75,7 @@
     color: var(--wm-label-color);
     line-height: var(--wm-label-line-height);
     letter-spacing: var(--wm-label-letter-spacing);
+    margin: var(--wm-space-0);
 }
 
 .h5.app-label-text {
@@ -84,6 +85,7 @@
     color: var(--wm-label-color);
     line-height: var(--wm-label-line-height);
     letter-spacing: var(--wm-label-letter-spacing);
+    margin: var(--wm-space-0);
 }
 
 .h6.app-label-text {
@@ -93,6 +95,7 @@
     color: var(--wm-label-color);
     line-height: var(--wm-label-line-height);
     letter-spacing: var(--wm-label-letter-spacing);
+    margin: var(--wm-space-0);
 }
 
 .text-primary .app-label {

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/basic/lottie.less

@@ -1,7 +1,10 @@
 .app-lottie {
     background-color: var(--wm-lottie-background-color);
-    padding-right: var(--wm-lottie-padding-right);
-    padding-left: var(--wm-lottie-padding-left);
-    padding-bottom: var(--wm-lottie-padding-bottom);
-    padding-top: var(--wm-lottie-padding-top);
+    padding: var(--wm-lottie-padding);
+}
+
+.app-lottie-content {
+    height: var(--wm-lottie-content-height);
+    width: var(--wm-lottie-content-width);
+    background-color: var(--wm-lottie-content-background-color);
 }

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/basic/message.less

@@ -5,26 +5,23 @@
     background-color:var(--wm-message-container-background);
     border-color:var(--wm-message-container-border-color);
     border-width: var(--wm-message-container-border-width);
-    padding-top: var(--wm-message-container-padding-top);
-    padding-left: var(--wm-message-container-padding-left);
-    padding-right: var(--wm-message-container-padding-right);
-    padding-bottom: var(--wm-message-container-padding-bottom);
+    padding: var(--wm-message-container-padding);
 }
 
 .app-message-text {
     font-size: var(--wm-message-text-size);
-    color:var(--wm-message-color);
+    color:var(--wm-message-text-color);
 }
 
 .app-message-title {
-    color:var(--wm-message-color);
-    padding-bottom: var(--wm-message-title-padding-bottom);
+    color:var(--wm-message-title-color);
+    padding: var(--wm-message-title-padding);
     font-size: var(--wm-message-title-font-size);
     font-weight: var(--wm-message-title-font-weight);
 }
 
 .app-message-text-wrapper {
-    padding-left: var(--wm-message-text-wrapper-padding-left);
+    padding: var(--wm-message-text-wrapper-padding);
 }
 
 .app-message-icon .app-icon{
@@ -47,8 +44,7 @@
 }
 
 .app-message-closebtn .app-button{
-    padding-left: var(--wm-message-close-btn-padding-left);
-    padding-right: var(--wm-message-close-btn-padding-right);
+    padding: var(--wm-message-close-btn-padding);
     border-radius: var(--wm-message-close-btn-border-radius);
     border-color: var(--wm-message-close-btn-border-color);
     background-color: var(--wm-message-close-btn-background-color);

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/basic/picture.less

@@ -5,10 +5,7 @@
         max-width: 100%;
         max-height: 100%;
         border-radius: var(--wm-picture-radius);
-        padding-top: var(--wm-picture-padding-top);
-        padding-bottom: var(--wm-picture-padding-bottom);
-        padding-left: var(--wm-picture-padding-left);
-        padding-right: var(--wm-picture-padding-right);
+        padding: var(--wm-picture-padding);
         background-color: var(--wm-picture-background);
         border-width: var(--wm-picture-border-width);
         border-style:  var(--wm-picture-border-style);
@@ -16,10 +13,7 @@
 }
 .thumbnail-image.app-picture {
         border-radius: var(--wm-picture-radius);
-        padding-top: var(--wm-picture-padding-top);
-        padding-bottom: var(--wm-picture-padding-bottom);
-        padding-left: var(--wm-picture-padding-left);
-        padding-right: var(--wm-picture-padding-right);
+        padding: var(--wm-picture-padding);
         background-color: var(--wm-picture-background);
         border-width: var(--wm-picture-border-width);
         border-style:  var(--wm-picture-border-style);
@@ -30,10 +24,7 @@
 }
 .rounded-image.app-picture {
         border-radius: var(--wm-picture-radius);
-        padding-top: var(--wm-picture-padding-top);
-        padding-bottom: var(--wm-picture-padding-bottom);
-        padding-left: var(--wm-picture-padding-left);
-        padding-right: var(--wm-picture-padding-right);
+        padding: var(--wm-picture-padding);
         background-color: var(--wm-picture-background);
         border-width: var(--wm-picture-border-width);
         border-style:  var(--wm-picture-border-style);
@@ -44,10 +35,7 @@
 }
 .circle-image.app-picture {
         border-radius: var(--wm-picture-radius);
-        padding-top: var(--wm-picture-padding-top);
-        padding-bottom: var(--wm-picture-padding-bottom);
-        padding-left: var(--wm-picture-padding-left);
-        padding-right: var(--wm-picture-padding-right);
+        padding: var(--wm-picture-padding);
         background-color: var(--wm-picture-background);
         border-width: var(--wm-picture-border-width);
         border-style:  var(--wm-picture-border-style);

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/basic/progress-bar.less

@@ -13,7 +13,6 @@
     border-top-right-radius: var(--wm-progress-bar-radius);
     border-bottom-right-radius: var(--wm-progress-bar-radius);
     height: var(--wm-progress-bar-height);
-    margin: var(--wm-progress-bar-margin);
 }
 
 .app-progress-bar-value {

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/basic/search.less

@@ -14,10 +14,7 @@
     font-weight: var(--wm-search-text-font-weight);
     border-top-left-radius: var(--wm-search-border-radius);
     border-bottom-left-radius: var(--wm-search-border-radius);
-    padding-left: var(--wm-search-text-padding-left);
-    padding-right: var(--wm-search-text-padding-right);
-    padding-top: var(--wm-search-text-padding-top);
-    padding-bottom: var(--wm-search-text-padding-bottom);
+    padding: var(--wm-search-text-padding);
     border-width: var(--wm-search-border-width);
     border-right-width: 0;
 }
@@ -30,10 +27,7 @@
 .app-search-clear-btn .app-button {
     border-color: transparent;
     ripple-color: transparent;
-    padding-left: var(--wm-search-clear-btn-padding-left);
-    padding-right: var(--wm-search-clear-btn-padding-right);
-    padding-top: var(--wm-search-clear-btn-padding-top);
-    padding-bottom: var(--wm-search-clear-btn-padding-bottom);
+    padding: var(--wm-search-clear-btn-padding);
     border-radius: var(--wm-search-clear-btn-border-radius);
     background-color: var(--wm-search-clear-btn-background-color);
     width: var(--wm-search-clear-btn-width);
@@ -52,10 +46,7 @@
 }
 
 .app-search-complete-item {
-    padding-right: var(--wm-search-data-complete-padding-right);
-    padding-left: var(--wm-search-data-complete-padding-left);
-    padding-top: var(--wm-search-data-complete-padding-top);
-    padding-bottom: var(--wm-search-data-complete-padding-bottom);
+    padding: var(--wm-search-data-complete-padding);
     background-color: var(--wm-search-data-complete-background);
 }
 
@@ -67,10 +58,7 @@
 }
 
 .app-search-item{
-    padding-right: var(--wm-search-item-padding-right);
-    padding-left: var(--wm-search-item-padding-left);
-    padding-top: var(--wm-search-item-padding-top);
-    padding-bottom: var(--wm-search-item-padding-bottom);
+    padding: var(--wm-search-item-padding);
     margin-bottom: var(--wm-search-item-margin-bottom);
     border-bottom-color: var(--wm-search-item-separator-color);
     border-bottom-width: var(--wm-search-item-separator-width);
@@ -110,10 +98,7 @@
     border-width: var(--wm-search-border-width);
     border-style: solid;
     border-left-width: 0;
-    padding-left: var(--wm-search-btn-padding-left);
-    padding-right: var(--wm-search-btn-padding-right);
-    padding-top: var(--wm-search-btn-padding-top);
-    padding-bottom: var(--wm-search-btn-padding-bottom);
+    padding: var(--wm-search-btn-padding);
     width: var(--wm-search-btn-width);
 
 }

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/basic/spinner.less

@@ -11,7 +11,7 @@
 
 .app-spinner-text {
     font-size: var(--wm-spinner-text-font-size);
-    padding-left: var(--wm-spinner-text-padding-left);
+    padding: var(--wm-spinner-text-padding);
     color: var(--wm-spinner-text-color);
 }
 

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/container/accordion/accordionpane.less

@@ -1,3 +1,9 @@
 
 .app-accordionpane {
+    background-color: var(--wm-accordion-pane-content-background-color);
+    padding: var(--wm-accordion-pane-content-padding);
+    border-radius: var(--wm-accordion-pane-content-border-radius);
+    border-style: var(--wm-accordion-pane-content-border-style);
+    border-width: var(--wm-accordion-pane-content-border-width);
+    border-color: var(--wm-accordion-pane-content-border-color);
 }

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/container/accordion.less

@@ -1,3 +1,5 @@
+@import (optional) url('../variables/accordion.variant.less');
+
 .app-accordion {
     width: var(--wm-accordion-width);
     border-width: var(--wm-accordion-border-width);
@@ -5,9 +7,15 @@
     border-color: var(--wm-accordion-border-color);
     border-radius: var(--wm-accordion-border-radius);
     background-color: var(--wm-accordion-background-color);
+    gap: var(--wm-accordion-gap);
 }
 
 .app-accordion-text {
+    align-self: flex-start;
+    border-radius: var(--wm-accordion-text-border-radius);
+    border-width: var(--wm-accordion-text-border-width);
+    border-color: var(--wm-accordion-text-border-color);
+    background-color: var(--wm-accordion-text-background-color);
     color: var(--wm-accordion-text-color);
     font-size: var(--wm-accordion-text-font-size);
 }
@@ -15,7 +23,7 @@
 .app-accordion-header {
     background-color: var(--wm-accordion-header-background-color);
     padding: var(--wm-accordion-header-padding);
-    border-bottom-width: var(--wm-accordion-header-border-bottom-width);
+    border-width: var(--wm-accordion-header-border-width);
     border-color: var(--wm-accordion-header-border-color);
     border-top-left-radius: var(--wm-accordion-border-radius);
     border-top-right-radius: var(--wm-accordion-border-radius);
@@ -25,7 +33,7 @@
 .app-accordion-active-header {
     background-color: var(--wm-accordion-header-background-color);
     padding: var(--wm-accordion-header-padding);
-    border-bottom-width: var(--wm-accordion-header-border-bottom-width);
+    border-width: var(--wm-accordion-header-border-width);
     border-color: var(--wm-accordion-header-border-color);
     border-top-left-radius: var(--wm-accordion-border-radius);
     border-top-right-radius: var(--wm-accordion-border-radius);
@@ -33,6 +41,11 @@
 }
 
 .app-accordion-active-header-title {
+    align-self: flex-start;
+    border-radius: var(--wm-accordion-text-border-radius);
+    border-width: var(--wm-accordion-text-border-width);
+    border-color: var(--wm-accordion-text-border-color);
+    background-color: var(--wm-accordion-text-background-color);
     color: var(--wm-accordion-text-color);
     font-size: var(--wm-accordion-text-font-size);
 }
@@ -92,6 +105,13 @@
     align-self: stretch;
 }
 
+.app-accordion-pane{
+    border-style: var(--wm-accordion-pane-border-style);
+    border-width: var(--wm-accordion-pane-border-width);
+    border-color: var(--wm-accordion-pane-border-color);
+    border-radius: var(--wm-accordion-pane-border-radius);
+}
+
 .app-accordion-header-danger-badge {
     background-color: var(--wm-color-error);
 }
@@ -115,4 +135,16 @@
 .app-accordion-header-default-badge{
     background-color: var(--wm-accordion-badge-background-color);
 }
-@import (optional) url('../variables/accordion.variant.less');
+
+.app-accordion-title-wrapper {
+    flex: 1;
+    flex-direction: row;
+    align-items: flex-start;
+    width: var(--wm-accordion-title-wrapper-width);
+    padding: var(--wm-accordion-title-wrapper-padding);
+    border-width: var(--wm-accordion-title-wrapper-border-width);
+    border-radius: var(--wm-accordion-title-wrapper-border-radius);
+    border-style: var(--wm-accordion-title-wrapper-border-style);
+    background-color: var(--wm-accordion-title-wrapper-background-color);
+
+}

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/container/panel.less

@@ -38,11 +38,6 @@
     color: var(--wm-panel-description-color);
 }
 
-.app-panel-content {
-    padding: var(--wm-panel-content-padding);
-}
-
-
 //TODO: Remove below styles once rn style override issue is fixed
 .panel-default.app-panel-header {
     background-color: var(--wm-panel-heading-background);

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/container/tabs/tab-header.less

@@ -9,23 +9,33 @@
 }
 
 .app-tabheader-item {
-    padding-top: var(--wm-tabs-item-heading-padding);
-    padding-bottom: var(--wm-tabs-item-heading-padding);
+    padding: var(--wm-tabs-item-heading-padding);
+    border-width: var(--wm-tabs-item-heading-border-width);
+    border-style: var(--wm-tabs-item-heading-border-style);
+    border-color: var(--wm-tabs-item-heading-border-color);
+    border-radius: var(--wm-tabs-item-heading-border-radius);
     background-color: var(--wm-tabs-item-heading-background);
 }
 
 .app-tabheader-active-item {
-   background-color: var(--wm-tabs-item-heading-background);
+    padding: var(--wm-tabs-item-heading-padding);
+    border-width: var(--wm-tabs-item-heading-border-width);
+    border-style: var(--wm-tabs-item-heading-border-style);
+    border-color: var(--wm-tabs-item-heading-border-color);
+    border-radius: var(--wm-tabs-item-heading-border-radius);
+    background-color: var(--wm-tabs-item-heading-background);
 }
 .app-tabheader-item-text {
     font-size: var(--wm-tabs-item-heading-font-size);
     font-weight: var(--wm-tabs-item-heading-font-weight);
+    font-family: var(--wm-tabs-item-heading-font-family);
     line-height: var(--wm-tabs-item-heading-line-height);
     color: var(--wm-tabs-item-heading-text-color);
 }
 .app-tabheader-active-item-text {
     font-size: var(--wm-tabs-item-heading-font-size);
     font-weight: var(--wm-tabs-item-heading-font-weight);
+    font-family: var(--wm-tabs-item-heading-font-family);
     line-height: var(--wm-tabs-item-heading-line-height);
     color: var(--wm-tabs-item-heading-text-color);
 }
@@ -46,6 +56,7 @@
 }
 
 .app-tabheader-active-indicator{
+    margin: var(--wm-tabs-item-heading-indicator-margin);
     background-color: var(--wm-tabs-item-heading-indicator-background);
     height: var(--wm-tabs-item-heading-indicator-height);
 }

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/container/tile.less

@@ -5,10 +5,7 @@
   border-radius: var(--wm-tile-border-radius);
   border-width: var(--wm-tile-border-width);
   border-color: var(--wm-tile-border-color);
-  padding-top: var(--wm-tile-padding-top);
-  padding-bottom: var(--wm-tile-padding-bottom);
-  padding-left: var(--wm-tile-padding-left);
-  padding-right: var(--wm-tile-padding-right);
+  padding: var(--wm-tile-padding);
   color: var(--wm-tile-color);
   border-style: solid;
 }

package/src/templates/foundation-theme/build/android/wavemaker/design-tokens/container/wizard.less

@@ -3,20 +3,14 @@
   background-color: var(--wm-wizard-background-color);
   border-radius: var(--wm-wizard-border-radius);
   box-shadow: var(--wm-wizard-box-shadow);
-  padding-top: var(--wm-wizard-padding-top);
-  padding-bottom: var(--wm-wizard-padding-bottom);
-  padding-left: var(--wm-wizard-padding-left);
-  padding-right: var(--wm-wizard-padding-right);
+  padding: var(--wm-wizard-padding);
   gap: var(--wm-wizard-gap);
 }
 
 .app-wizard-header {
   background-color: var(--wm-wizard-heading-background-color);
   border-radius: var(--wm-wizard-heading-radius);
-  padding-top: var(--wm-wizard-heading-padding-top);
-  padding-bottom: var(--wm-wizard-heading-padding-bottom);
-  padding-left: var(--wm-wizard-heading-padding-left);
-  padding-right: var(--wm-wizard-heading-padding-right);
+  padding: var(--wm-wizard-heading-padding);
 }
 
 .app-wizard-done-step {
@@ -37,7 +31,7 @@
 
 .app-wizard-body {
   height: var(--wm-wizard-body-height);
-  padding-top: var(--wm-wizard-body-padding-top);
+  padding: var(--wm-wizard-body-padding);
 }
 
 .app-wizard-step-title {