diff --git a/src/components/togglebutton/ToggleButton.d.ts b/src/components/togglebutton/ToggleButton.d.ts
index d6fc34851..c840231ce 100755
--- a/src/components/togglebutton/ToggleButton.d.ts
+++ b/src/components/togglebutton/ToggleButton.d.ts
@@ -6,14 +6,7 @@ export declare class ToggleButton extends Vue {
     offIcon?: string;
     onLabel?: string;
     offLabel?: string;
-    inputId?: string;
-    name?: string;
     iconPos?: string;
-    disabled?: boolean;
     ariaLabelledBy?: string;
-    $emit(eventName: 'click', event: Event): this;
-    $emit(eventName: 'input', value: any): this;
-    $emit(eventName: 'change', event: Event): this;
-    $emit(eventName: 'focus', event: Event): this;
-    $emit(eventName: 'blur', event: Event): this;
+    $emit(eventName: string, event: Event): this;
 }
\ No newline at end of file
diff --git a/src/components/togglebutton/ToggleButton.vue b/src/components/togglebutton/ToggleButton.vue
index 6f055e2f7..701d55748 100755
--- a/src/components/togglebutton/ToggleButton.vue
+++ b/src/components/togglebutton/ToggleButton.vue
@@ -1,9 +1,5 @@
 <template>
-    <div :class="buttonClass" @click="onClick($event)">
-        <div class="p-hidden-accessible">
-            <input ref="input" type="checkbox" :id="inputId" :name="name" :checked="value" :disabled="disabled"
-                @focus="onFocus($event)" @blur="onBlur($event)" @keydown.enter.prevent="onClick($event)" role="button" :aria-pressed="value" :aria-labelledby="ariaLabelledBy">
-        </div>
+    <div :class="buttonClass" @click="onClick($event)" role="checkbox" :aria-labelledby="ariaLabelledBy" :aria-checked="value" :tabindex="$attrs.disabled ? null : '0'">
         <span v-if="hasIcon" :class="iconClass"></span>
         <span class="p-button-text p-unselectable-text p-c">{{label}}</span>
     </div>
@@ -17,36 +13,19 @@ export default {
 		offIcon: String,
         onLabel: String,
         offLabel: String,
-        inputId: String,
-        name: String,
         iconPos: {
             type: String,
             default: 'left'
         },
-        disabled: Boolean,
         ariaLabelledBy: String
     },
-    data() {
-        return {
-            focused: false
-        }
-    },
     methods: {
         onClick(event) {
-            if (!this.disabled) {
+            if (!this.$attrs.disabled) {
                 this.$emit('click', event);
                 this.$emit('input', !this.value);
                 this.$emit('change', event);
-                this.$refs.input.focus();
             }
-        },
-        onFocus(event) {
-            this.focused = true;
-            this.$emit('focus', event);
-        },
-        onBlur() {
-            this.focused = false;
-            this.$emit('blur', event);
         }
     },
     computed: {
@@ -54,8 +33,7 @@ export default {
             return {
                 'p-button p-togglebutton p-component': true,
                 'p-button-icon-only': this.hasIcon && !this.hasLabel,
-                'p-disabled': this.disabled,
-                'p-focus': this.focused,
+                'p-disabled': this.$attrs.disabled,
                 'p-highlight': this.value === true
             }
         },
diff --git a/src/views/togglebutton/ToggleButtonDoc.vue b/src/views/togglebutton/ToggleButtonDoc.vue
index dfca5a348..ff5ab5344 100755
--- a/src/views/togglebutton/ToggleButtonDoc.vue
+++ b/src/views/togglebutton/ToggleButtonDoc.vue
@@ -73,30 +73,12 @@ export default {
                                 <td>no</td>
                                 <td>Label for the off state.</td>
                             </tr>
-                            <tr>
-                                <td>inputId</td>
-                                <td>string</td>
-                                <td>null</td>
-                                <td>Identifier of the input element.</td>
-                            </tr>
-                            <tr>
-                                <td>name</td>
-                                <td>string</td>
-                                <td>null</td>
-                                <td>Name of the input element.</td>
-                            </tr>
                             <tr>
                                 <td>iconPos</td>
                                 <td>string</td>
                                 <td>left</td>
                                 <td>Position of the icon, valid values are "left" and "right".</td>
                             </tr>
-                            <tr>
-                                <td>disabled</td>
-                                <td>boolean</td>
-                                <td>null</td>
-                                <td>When present, it specifies that the element should be disabled.</td>
-                            </tr>
                             <tr>
                                 <td>ariaLabelledBy</td>
                                 <td>string</td>