diff --git a/api-generator/components/autocomplete.js b/api-generator/components/autocomplete.js
index 03fc195fd..1e1720043 100644
--- a/api-generator/components/autocomplete.js
+++ b/api-generator/components/autocomplete.js
@@ -98,7 +98,7 @@ const AutoCompleteProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/calendar.js b/api-generator/components/calendar.js
index ae30c8641..2bd496d91 100644
--- a/api-generator/components/calendar.js
+++ b/api-generator/components/calendar.js
@@ -266,7 +266,7 @@ const CalendarProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/cascadeselect.js b/api-generator/components/cascadeselect.js
index 7e31629bf..4a870edb4 100644
--- a/api-generator/components/cascadeselect.js
+++ b/api-generator/components/cascadeselect.js
@@ -62,7 +62,7 @@ const CascadeSelectProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/checkbox.js b/api-generator/components/checkbox.js
index a3e3137ee..fc05fa217 100644
--- a/api-generator/components/checkbox.js
+++ b/api-generator/components/checkbox.js
@@ -32,7 +32,7 @@ const CheckboxProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/chips.js b/api-generator/components/chips.js
index 48df4a83d..84235776e 100644
--- a/api-generator/components/chips.js
+++ b/api-generator/components/chips.js
@@ -44,7 +44,7 @@ const ChipsProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/dropdown.js b/api-generator/components/dropdown.js
index b90c06c1c..a57c8011d 100644
--- a/api-generator/components/dropdown.js
+++ b/api-generator/components/dropdown.js
@@ -104,7 +104,7 @@ const DropdownProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/inputmask.js b/api-generator/components/inputmask.js
index 320a432fe..2c8087e09 100644
--- a/api-generator/components/inputmask.js
+++ b/api-generator/components/inputmask.js
@@ -38,7 +38,7 @@ const InputMaskProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/inputnumber.js b/api-generator/components/inputnumber.js
index 2c5ad7c84..cab3dffe0 100644
--- a/api-generator/components/inputnumber.js
+++ b/api-generator/components/inputnumber.js
@@ -156,7 +156,7 @@ const InputNumberProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/inputtext.js b/api-generator/components/inputtext.js
index 6e1415113..439213ce3 100644
--- a/api-generator/components/inputtext.js
+++ b/api-generator/components/inputtext.js
@@ -20,7 +20,7 @@ const InputTextProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/multiselect.js b/api-generator/components/multiselect.js
index 7cef2ac67..35ef21230 100644
--- a/api-generator/components/multiselect.js
+++ b/api-generator/components/multiselect.js
@@ -68,7 +68,7 @@ const MultiSelectProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/password.js b/api-generator/components/password.js
index a521013ad..19011e585 100644
--- a/api-generator/components/password.js
+++ b/api-generator/components/password.js
@@ -92,7 +92,7 @@ const PasswordProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/radiobutton.js b/api-generator/components/radiobutton.js
index daf5a2a78..b843d753f 100644
--- a/api-generator/components/radiobutton.js
+++ b/api-generator/components/radiobutton.js
@@ -32,7 +32,7 @@ const RadioButtonProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/textarea.js b/api-generator/components/textarea.js
index 96d460ee2..e8f06aad3 100644
--- a/api-generator/components/textarea.js
+++ b/api-generator/components/textarea.js
@@ -20,7 +20,7 @@ const TextareaProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/treeselect.js b/api-generator/components/treeselect.js
index 155e70a39..5d77a42a7 100644
--- a/api-generator/components/treeselect.js
+++ b/api-generator/components/treeselect.js
@@ -38,7 +38,7 @@ const TreeSelectProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/api-generator/components/tristatecheckbox.js b/api-generator/components/tristatecheckbox.js
index 92e1b39c7..916a3630f 100644
--- a/api-generator/components/tristatecheckbox.js
+++ b/api-generator/components/tristatecheckbox.js
@@ -20,7 +20,7 @@ const TriStateCheckboxProps = [
     {
         name: 'variant',
         type: 'string',
-        default: 'outlined',
+        default: 'null',
         description: 'Specifies the input variant of the component.'
     },
     {
diff --git a/components/lib/colorpicker/style/ColorPickerStyle.js b/components/lib/colorpicker/style/ColorPickerStyle.js
index 7783c107b..bd27d6dc4 100644
--- a/components/lib/colorpicker/style/ColorPickerStyle.js
+++ b/components/lib/colorpicker/style/ColorPickerStyle.js
@@ -20,7 +20,6 @@ const classes = {
         {
             'p-colorpicker-overlay-panel': !props.inline,
             'p-disabled': props.disabled,
-            'p-input-filled': instance.$primevue.config.inputStyle === 'filled',
             'p-ripple-disabled': instance.$primevue.config.ripple === false
         }
     ],
diff --git a/components/lib/confirmpopup/style/ConfirmPopupStyle.js b/components/lib/confirmpopup/style/ConfirmPopupStyle.js
index 8f60a2ae7..915f8cef2 100644
--- a/components/lib/confirmpopup/style/ConfirmPopupStyle.js
+++ b/components/lib/confirmpopup/style/ConfirmPopupStyle.js
@@ -78,7 +78,6 @@ const classes = {
     root: ({ instance }) => [
         'p-confirm-popup p-component',
         {
-            'p-input-filled': instance.$primevue.config.inputStyle === 'filled',
             'p-ripple-disabled': instance.$primevue.config.ripple === false
         }
     ],
diff --git a/components/lib/contextmenu/style/ContextMenuStyle.js b/components/lib/contextmenu/style/ContextMenuStyle.js
index 889867a9b..1c19cf482 100644
--- a/components/lib/contextmenu/style/ContextMenuStyle.js
+++ b/components/lib/contextmenu/style/ContextMenuStyle.js
@@ -50,7 +50,6 @@ const classes = {
     root: ({ instance }) => [
         'p-contextmenu p-component',
         {
-            'p-input-filled': instance.$primevue.config.inputStyle === 'filled',
             'p-ripple-disabled': instance.$primevue.config.ripple === false
         }
     ],
diff --git a/components/lib/datatable/style/DataTableStyle.js b/components/lib/datatable/style/DataTableStyle.js
index d8a7baf91..3dd5eb6ee 100644
--- a/components/lib/datatable/style/DataTableStyle.js
+++ b/components/lib/datatable/style/DataTableStyle.js
@@ -323,7 +323,6 @@ const classes = {
         {
             'p-column-filter-overlay p-component p-fluid': true,
             'p-column-filter-overlay-menu': props.display === 'menu',
-            'p-input-filled': instance.$primevue.config.inputStyle === 'filled',
             'p-ripple-disabled': instance.$primevue.config.ripple === false
         }
     ],
diff --git a/components/lib/dialog/style/DialogStyle.js b/components/lib/dialog/style/DialogStyle.js
index cab2f2c55..29adacd0d 100644
--- a/components/lib/dialog/style/DialogStyle.js
+++ b/components/lib/dialog/style/DialogStyle.js
@@ -171,7 +171,6 @@ const classes = {
         {
             'p-dialog-rtl': props.rtl,
             'p-dialog-maximized': props.maximizable && instance.maximized,
-            'p-input-filled': instance.$primevue.config.inputStyle === 'filled',
             'p-ripple-disabled': instance.$primevue.config.ripple === false
         }
     ],
diff --git a/components/lib/galleria/style/GalleriaStyle.js b/components/lib/galleria/style/GalleriaStyle.js
index 8ac445621..ee6a2f862 100644
--- a/components/lib/galleria/style/GalleriaStyle.js
+++ b/components/lib/galleria/style/GalleriaStyle.js
@@ -292,7 +292,6 @@ const classes = {
     mask: ({ instance }) => [
         'p-galleria-mask p-component-overlay p-component-overlay-enter',
         {
-            'p-input-filled': instance.$primevue.config.inputStyle === 'filled',
             'p-ripple-disabled': instance.$primevue.config.ripple === false
         }
     ],
diff --git a/components/lib/menu/style/MenuStyle.js b/components/lib/menu/style/MenuStyle.js
index 798d5a748..b47cde8e9 100644
--- a/components/lib/menu/style/MenuStyle.js
+++ b/components/lib/menu/style/MenuStyle.js
@@ -28,7 +28,6 @@ const classes = {
         'p-menu p-component',
         {
             'p-menu-overlay': props.popup,
-            'p-input-filled': instance.$primevue.config.inputStyle === 'filled',
             'p-ripple-disabled': instance.$primevue.config.ripple === false
         }
     ],
diff --git a/components/lib/overlaypanel/style/OverlayPanelStyle.js b/components/lib/overlaypanel/style/OverlayPanelStyle.js
index d603d9ea5..8f10c4aee 100644
--- a/components/lib/overlaypanel/style/OverlayPanelStyle.js
+++ b/components/lib/overlaypanel/style/OverlayPanelStyle.js
@@ -78,7 +78,6 @@ const classes = {
     root: ({ instance }) => [
         'p-overlaypanel p-component',
         {
-            'p-input-filled': instance.$primevue.config.inputStyle === 'filled',
             'p-ripple-disabled': instance.$primevue.config.ripple === false
         }
     ],
diff --git a/components/lib/sidebar/style/SidebarStyle.js b/components/lib/sidebar/style/SidebarStyle.js
index 2560593d9..3a8700b05 100644
--- a/components/lib/sidebar/style/SidebarStyle.js
+++ b/components/lib/sidebar/style/SidebarStyle.js
@@ -185,7 +185,6 @@ const classes = {
     root: ({ instance }) => [
         'p-sidebar p-component',
         {
-            'p-input-filled': instance.$primevue.config.inputStyle === 'filled',
             'p-ripple-disabled': instance.$primevue.config.ripple === false,
             'p-sidebar-full': instance.fullScreen
         }
diff --git a/components/lib/tieredmenu/style/TieredMenuStyle.js b/components/lib/tieredmenu/style/TieredMenuStyle.js
index a441de1e1..20ddffba6 100644
--- a/components/lib/tieredmenu/style/TieredMenuStyle.js
+++ b/components/lib/tieredmenu/style/TieredMenuStyle.js
@@ -62,7 +62,6 @@ const classes = {
         'p-tieredmenu p-component',
         {
             'p-tieredmenu-overlay': props.popup,
-            'p-input-filled': instance.$primevue.config.inputStyle === 'filled',
             'p-ripple-disabled': instance.$primevue.config.ripple === false
         }
     ],
diff --git a/components/lib/toast/style/ToastStyle.js b/components/lib/toast/style/ToastStyle.js
index bb090391c..42b335ac1 100644
--- a/components/lib/toast/style/ToastStyle.js
+++ b/components/lib/toast/style/ToastStyle.js
@@ -92,7 +92,6 @@ const classes = {
     root: ({ props, instance }) => [
         'p-toast p-component p-toast-' + props.position,
         {
-            'p-input-filled': instance.$primevue.config.inputStyle === 'filled',
             'p-ripple-disabled': instance.$primevue.config.ripple === false
         }
     ],
diff --git a/components/lib/treeselect/BaseTreeSelect.vue b/components/lib/treeselect/BaseTreeSelect.vue
index a9b125eb6..e6471c369 100644
--- a/components/lib/treeselect/BaseTreeSelect.vue
+++ b/components/lib/treeselect/BaseTreeSelect.vue
@@ -20,6 +20,10 @@ export default {
             type: Boolean,
             default: false
         },
+        variant: {
+            type: String,
+            default: null
+        },
         disabled: {
             type: Boolean,
             default: false
diff --git a/components/lib/treeselect/style/TreeSelectStyle.js b/components/lib/treeselect/style/TreeSelectStyle.js
index 0a2286039..02c9beedf 100644
--- a/components/lib/treeselect/style/TreeSelectStyle.js
+++ b/components/lib/treeselect/style/TreeSelectStyle.js
@@ -67,6 +67,7 @@ const classes = {
             'p-disabled': props.disabled,
             'p-invalid': props.invalid,
             'p-focus': instance.focused,
+            'p-variant-filled': props.variant ? props.variant === 'filled' : instance.$primevue.config.inputStyle === 'filled',
             'p-inputwrapper-filled': !instance.emptyValue,
             'p-inputwrapper-focus': instance.focused || instance.overlayVisible
         }