diff --git a/components/lib/themes/primeone/base/togglebutton/index.js b/components/lib/themes/primeone/base/togglebutton/index.js
index 95e3d327b..7588ccb8b 100644
--- a/components/lib/themes/primeone/base/togglebutton/index.js
+++ b/components/lib/themes/primeone/base/togglebutton/index.js
@@ -38,16 +38,16 @@ export default {
     border-radius: ${dt('rounded.sm')};
 }
 
-.p-togglebutton.p-highlight::before {
+.p-togglebutton.p-togglebutton-checked::before {
     background: ${dt('togglebutton.checked.background')};
     box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.02), 0px 1px 2px 0px rgba(0, 0, 0, 0.04);
 }
 
-.p-togglebutton:not(:disabled):not(.p-highlight):hover {
+.p-togglebutton:not(:disabled):not(.p-togglebutton-checked):hover {
     color: ${dt('togglebutton.hover.color')};
 }
 
-.p-togglebutton.p-highlight {
+.p-togglebutton.p-togglebutton-checked {
     color: ${dt('togglebutton.checked.color')};
 }
 
@@ -72,11 +72,11 @@ export default {
     color: ${dt('togglebutton.icon.color')};
 }
 
-.p-togglebutton:not(:disabled):not(.p-highlight):hover .p-togglebutton-icon {
+.p-togglebutton:not(:disabled):not(.p-togglebutton-checked):hover .p-togglebutton-icon {
     color: ${dt('togglebutton.icon.hover.color')};
 }
 
-.p-togglebutton.p-highlight .p-togglebutton-icon {
+.p-togglebutton.p-togglebutton-checked .p-togglebutton-icon {
     color: ${dt('togglebutton.icon.checked.color')};
 }
 
diff --git a/components/lib/togglebutton/style/ToggleButtonStyle.js b/components/lib/togglebutton/style/ToggleButtonStyle.js
index 961b8d6b9..460b54ebd 100644
--- a/components/lib/togglebutton/style/ToggleButtonStyle.js
+++ b/components/lib/togglebutton/style/ToggleButtonStyle.js
@@ -4,17 +4,11 @@ const classes = {
     root: ({ instance, props }) => [
         'p-togglebutton p-component',
         {
-            'p-highlight': instance.active,
+            'p-togglebutton-checked': instance.active,
             'p-invalid': props.invalid
         }
     ],
-    icon: ({ instance, props }) => [
-        'p-togglebutton-icon',
-        {
-            'p-togglebutton-icon-left': props.iconPos === 'left' && instance.label,
-            'p-togglebutton-icon-right': props.iconPos === 'right' && instance.label
-        }
-    ],
+    icon: 'p-togglebutton-icon',
     label: 'p-togglebutton-label'
 };