diff --git a/components/lib/drawer/Drawer.vue b/components/lib/drawer/Drawer.vue
index 8b4269a96..5d1c3629b 100755
--- a/components/lib/drawer/Drawer.vue
+++ b/components/lib/drawer/Drawer.vue
@@ -46,7 +46,6 @@ import Button from 'primevue/button';
 import FocusTrap from 'primevue/focustrap';
 import TimesIcon from 'primevue/icons/times';
 import Portal from 'primevue/portal';
-import Ripple from 'primevue/ripple';
 import { DomHandler, ZIndexUtils } from 'primevue/utils';
 import BaseDrawer from './BaseDrawer.vue';
 
@@ -224,8 +223,7 @@ export default {
         }
     },
     directives: {
-        focustrap: FocusTrap,
-        ripple: Ripple
+        focustrap: FocusTrap
     },
     components: {
         Button,
diff --git a/doc/fieldset/AccessibilityDoc.vue b/doc/fieldset/AccessibilityDoc.vue
index e4ea83515..91dd1c2ee 100644
--- a/doc/fieldset/AccessibilityDoc.vue
+++ b/doc/fieldset/AccessibilityDoc.vue
@@ -2,9 +2,9 @@
     <DocSectionText id="accessibility" label="Accessibility" v-bind="$attrs">
         <h3>Screen Reader</h3>
         <p>
-            Fieldset component uses the semantic <i>fieldset</i> element. When toggleable option is enabled, a clickable element with <i>button</i> role is included inside the <i>legend</i> element, this button has <i>aria-controls</i> to define the
-            id of the content section along with <i>aria-expanded</i> for the visibility state. The value to read the button defaults to the value of the <i>legend</i> property and can be customized by defining an <i>aria-label</i> or
-            <i>aria-labelledby</i> via the <i>toggleButtonProps</i> property.
+            Fieldset component uses the semantic <i>fieldset</i> element. When toggleable option is enabled, a button element is included inside the <i>legend</i> element, this button has <i>aria-controls</i> to define the id of the content section
+            along with <i>aria-expanded</i> for the visibility state. The value to read the button defaults to the value of the <i>legend</i> property and can be customized by defining an <i>aria-label</i> or <i>aria-labelledby</i> via the
+            <i>toggleButtonProps</i> property.
         </p>
         <p>The content uses <i>region</i>, defines an id that matches the <i>aria-controls</i> of the content toggle button and <i>aria-labelledby</i> referring to the id of the header.</p>
 
diff --git a/doc/fieldset/TemplateDoc.vue b/doc/fieldset/TemplateDoc.vue
index 802b5112a..566ab203b 100644
--- a/doc/fieldset/TemplateDoc.vue
+++ b/doc/fieldset/TemplateDoc.vue
@@ -7,7 +7,7 @@
             <template #legend>
                 <div class="flex align-items-center pl-2">
                     <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
-                    <span class="font-bold">Amy Elsner</span>
+                    <span class="font-bold p-2">Amy Elsner</span>
                 </div>
             </template>
             <p class="m-0">
@@ -29,7 +29,7 @@ export default {
     <template #legend>
         <div class="flex align-items-center pl-2">
             <Avatar image="/images/avatar/amyelsner.png" shape="circle" />
-            <span class="font-bold">Amy Elsner</span>
+            <span class="font-bold p-2">Amy Elsner</span>
         </div>
     </template>
     <p class="m-0">
@@ -45,7 +45,7 @@ export default {
             <template #legend>
                 <div class="flex align-items-center pl-2">
                     <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
-                    <span class="font-bold">Amy Elsner</span>
+                    <span class="font-bold p-2">Amy Elsner</span>
                 </div>
             </template>
             <p class="m-0">
@@ -66,7 +66,7 @@ export default {
             <template #legend>
                 <div class="flex align-items-center pl-2">
                     <Avatar image="https://primefaces.org/cdn/primevue/images/avatar/amyelsner.png" shape="circle" />
-                    <span class="font-bold">Amy Elsner</span>
+                    <span class="font-bold p-2">Amy Elsner</span>
                 </div>
             </template>
             <p class="m-0">