diff --git a/apps/showcase/doc/editor/BasicDoc.vue b/apps/showcase/doc/editor/BasicDoc.vue
index 22377d35e2..55787aba79 100644
--- a/apps/showcase/doc/editor/BasicDoc.vue
+++ b/apps/showcase/doc/editor/BasicDoc.vue
@@ -5,7 +5,7 @@
     <div class="card">
         <Editor v-model="value" editorStyle="height: 320px" />
     </div>
-    <DocSectionCode :code="code" :dependencies="{ quill: '2.0.0' }" component="Editor" />
+    <DocSectionCode :code="code" :dependencies="{ quill: '2.0.2' }" component="Editor" />
 </template>
 
 <script>
diff --git a/apps/showcase/doc/editor/CustomToolbarDoc.vue b/apps/showcase/doc/editor/CustomToolbarDoc.vue
new file mode 100644
index 0000000000..5ab4491cc6
--- /dev/null
+++ b/apps/showcase/doc/editor/CustomToolbarDoc.vue
@@ -0,0 +1,70 @@
+<template>
+    <DocSectionText v-bind="$attrs">
+        <p>When <i>modules</i> is present, it's possible to customize the <i>Toolbar</i>.</p>
+    </DocSectionText>
+    <div class="card">
+        <Editor v-model="value" editorStyle="height: 320px" :modules="{toolbar: [
+          ['bold', 'italic', 'underline', 'strike'],
+          [{ list: 'ordered' }, { list: 'bullet' }],
+          ['link', { align: [] }, 'clean'],
+        ]}" />
+    </div>
+    <DocSectionCode :code="code" :dependencies="{ quill: '2.0.2' }" component="Editor" />
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            value: '',
+            code: {
+                basic: `
+<Editor v-model="value" editorStyle="height: 320px" :modules="{toolbar: [
+          ['bold', 'italic', 'underline', 'strike'],
+          [{ list: 'ordered' }, { list: 'bullet' }],
+          ['link', { align: [] }, 'clean'],
+        ]}" />
+`,
+                options: `
+<template>
+    <div class="card">
+        <Editor v-model="value" editorStyle="height: 320px" :modules="{toolbar: [
+          ['bold', 'italic', 'underline', 'strike'],
+          [{ list: 'ordered' }, { list: 'bullet' }],
+          ['link', { align: [] }, 'clean'],
+        ]}" />
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            value: ''
+        }
+    }
+}
+<\/script>
+`,
+                composition: `
+<template>
+    <div class="card">
+        <Editor v-model="value" editorStyle="height: 320px" :modules="{toolbar: [
+          ['bold', 'italic', 'underline', 'strike'],
+          [{ list: 'ordered' }, { list: 'bullet' }],
+          ['link', { align: [] }, 'clean'],
+        ]}" />
+    </div>
+</template>
+
+<script setup>
+import { ref } from "vue";
+
+const value = ref('');
+<\/script>
+`
+            }
+        };
+    }
+};
+</script>
diff --git a/apps/showcase/doc/editor/ReadOnlyDoc.vue b/apps/showcase/doc/editor/ReadOnlyDoc.vue
index 641befeaca..ca7e57da95 100644
--- a/apps/showcase/doc/editor/ReadOnlyDoc.vue
+++ b/apps/showcase/doc/editor/ReadOnlyDoc.vue
@@ -5,7 +5,7 @@
     <div class="card">
         <Editor v-model="value" editorStyle="height: 320px" readonly />
     </div>
-    <DocSectionCode :code="code" :dependencies="{ quill: '2.0.0' }" component="Editor" />
+    <DocSectionCode :code="code" :dependencies="{ quill: '2.0.2' }" component="Editor" />
 </template>
 
 <script>
diff --git a/apps/showcase/doc/editor/TemplateDoc.vue b/apps/showcase/doc/editor/TemplateDoc.vue
index b90999b46c..f6528b0750 100644
--- a/apps/showcase/doc/editor/TemplateDoc.vue
+++ b/apps/showcase/doc/editor/TemplateDoc.vue
@@ -13,7 +13,7 @@
             </template>
         </Editor>
     </div>
-    <DocSectionCode :code="code" :dependencies="{ quill: '2.0.0' }" component="Editor" />
+    <DocSectionCode :code="code" :dependencies="{ quill: '2.0.2' }" component="Editor" />
 </template>
 
 <script>
diff --git a/apps/showcase/package.json b/apps/showcase/package.json
index b32ae30b01..3dbb534007 100644
--- a/apps/showcase/package.json
+++ b/apps/showcase/package.json
@@ -46,7 +46,7 @@
         "postcss": "^8.4.31",
         "prettier": "2.7.1",
         "primeicons": "^7.0.0",
-        "quill": "2.0.0",
+        "quill": "2.0.2",
         "sass": "1.45.0",
         "sass-loader": "8.0.2",
         "tailwindcss": "^3.4.1",
@@ -69,4 +69,4 @@
     "engines": {
         "node": ">=12.11.0"
     }
-}
\ No newline at end of file
+}
diff --git a/apps/showcase/pages/editor/index.vue b/apps/showcase/pages/editor/index.vue
index bcc9a67bb8..a80017a599 100755
--- a/apps/showcase/pages/editor/index.vue
+++ b/apps/showcase/pages/editor/index.vue
@@ -9,6 +9,7 @@ import FormsDoc from '@/doc/editor/FormsDoc.vue';
 import ImportDoc from '@/doc/editor/ImportDoc.vue';
 import QuillDoc from '@/doc/editor/QuillDoc.vue';
 import ReadOnlyDoc from '@/doc/editor/ReadOnlyDoc.vue';
+import CustomToolbarDoc from '@/doc/editor/CustomToolbarDoc.vue';
 import TemplateDoc from '@/doc/editor/TemplateDoc.vue';
 import PTComponent from '@/doc/editor/pt/index.vue';
 import ThemingDoc from '@/doc/editor/theming/index.vue';
@@ -42,6 +43,11 @@ export default {
                     label: 'ReadOnly',
                     component: ReadOnlyDoc
                 },
+                {
+                    id: 'customtoolbar',
+                    label: 'Custom Toolbar',
+                    component: CustomToolbarDoc
+                },
                 {
                     id: 'template',
                     label: 'Template',
diff --git a/packages/primevue/src/editor/Editor.vue b/packages/primevue/src/editor/Editor.vue
index 85e335cb66..11b74c7fcd 100755
--- a/packages/primevue/src/editor/Editor.vue
+++ b/packages/primevue/src/editor/Editor.vue
@@ -1,6 +1,6 @@
 <template>
     <div :class="cx('root')" v-bind="ptmi('root')">
-        <div ref="toolbarElement" :class="cx('toolbar')" v-bind="ptm('toolbar')">
+        <div v-if="!(modules && modules.toolbar)" ref="toolbarElement" class="ql-toolbar" :class="cx('toolbar')" v-bind="ptm('toolbar')">
             <slot name="toolbar">
                 <span class="ql-formats" v-bind="ptm('formats')">
                     <select class="ql-header" defaultValue="0" v-bind="ptm('header')">
@@ -50,6 +50,7 @@
 <script>
 import { isExist } from '@primeuix/utils/dom';
 import BaseEditor from './BaseEditor.vue';
+import 'quill/dist/quill.snow.css';
 
 const QuillJS = (function () {
     try {
@@ -82,6 +83,7 @@ export default {
         }
     },
     mounted() {
+
         const configuration = {
             modules: {
                 toolbar: this.$refs.toolbarElement,
diff --git a/packages/primevue/src/editor/style/EditorStyle.js b/packages/primevue/src/editor/style/EditorStyle.js
index 26f186cfab..c49c033ec8 100644
--- a/packages/primevue/src/editor/style/EditorStyle.js
+++ b/packages/primevue/src/editor/style/EditorStyle.js
@@ -2,893 +2,60 @@ import BaseStyle from '@primevue/core/base/style';
 
 const theme = ({ dt }) => `
 /*!
-* Quill Editor v1.3.3
+* Quill Editor v2.0.2
 * https://quilljs.com/
 * Copyright (c) 2014, Jason Chen
 * Copyright (c) 2013, salesforce.com
 */
-.ql-container {
-    box-sizing: border-box;
-    font-family: Helvetica, Arial, sans-serif;
-    font-size: 13px;
-    height: 100%;
-    margin: 0;
-    position: relative;
-}
-.ql-container.ql-disabled .ql-tooltip {
-    visibility: hidden;
-}
-.ql-container.ql-disabled .ql-editor ul[data-checked] > li::before {
-    pointer-events: none;
-}
-.ql-clipboard {
-    inset-inline-start: -100000px;
-    height: 1px;
-    overflow-y: hidden;
-    position: absolute;
-    top: 50%;
-}
-.ql-clipboard p {
-    margin: 0;
-    padding: 0;
-}
-.ql-editor {
-    box-sizing: border-box;
-    line-height: 1.42;
-    height: 100%;
-    outline: none;
-    overflow-y: auto;
-    padding: 12px 15px;
-    tab-size: 4;
-    -moz-tab-size: 4;
-    text-align: left;
-    white-space: pre-wrap;
-    word-wrap: break-word;
-}
-.ql-editor > * {
-    cursor: text;
-}
-.ql-editor p,
-.ql-editor ol,
-.ql-editor ul,
-.ql-editor pre,
-.ql-editor blockquote,
-.ql-editor h1,
-.ql-editor h2,
-.ql-editor h3,
-.ql-editor h4,
-.ql-editor h5,
-.ql-editor h6 {
-    margin: 0;
-    padding: 0;
-    counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol,
-.ql-editor ul {
-    padding-inline-start: 1.5rem;
-}
-.ql-editor ol > li,
-.ql-editor ul > li {
-    list-style-type: none;
-}
-.ql-editor ul > li::before {
-    content: '\\2022';
-}
-.ql-editor ul[data-checked='true'],
-.ql-editor ul[data-checked='false'] {
-    pointer-events: none;
-}
-.ql-editor ul[data-checked='true'] > li *,
-.ql-editor ul[data-checked='false'] > li * {
-    pointer-events: all;
-}
-.ql-editor ul[data-checked='true'] > li::before,
-.ql-editor ul[data-checked='false'] > li::before {
-    color: #777;
-    cursor: pointer;
-    pointer-events: all;
-}
-.ql-editor ul[data-checked='true'] > li::before {
-    content: '\\2611';
-}
-.ql-editor ul[data-checked='false'] > li::before {
-    content: '\\2610';
-}
-.ql-editor li::before {
-    display: inline-block;
-    white-space: nowrap;
-    width: 1.2rem;
-}
-.ql-editor li:not(.ql-direction-rtl)::before {
-    margin-inline-start: -1.5rem;
-    margin-inline-end: 0.3rem;
-    text-align: right;
-}
-.ql-editor li.ql-direction-rtl::before {
-    margin-inline-start: 0.3rem;
-    margin-inline-end: -1.5rem;
-}
-.ql-editor ol li:not(.ql-direction-rtl),
-.ql-editor ul li:not(.ql-direction-rtl) {
-    padding-inline-start: 1.5rem;
-}
-.ql-editor ol li.ql-direction-rtl,
-.ql-editor ul li.ql-direction-rtl {
-    padding-inline-end: 1.5rem;
-}
-.ql-editor ol li {
-    counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
-    counter-increment: list-0;
-}
-.ql-editor ol li:before {
-    content: counter(list-0, decimal) '. ';
-}
-.ql-editor ol li.ql-indent-1 {
-    counter-increment: list-1;
-}
-.ql-editor ol li.ql-indent-1:before {
-    content: counter(list-1, lower-alpha) '. ';
-}
-.ql-editor ol li.ql-indent-1 {
-    counter-reset: list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-2 {
-    counter-increment: list-2;
-}
-.ql-editor ol li.ql-indent-2:before {
-    content: counter(list-2, lower-roman) '. ';
-}
-.ql-editor ol li.ql-indent-2 {
-    counter-reset: list-3 list-4 list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-3 {
-    counter-increment: list-3;
-}
-.ql-editor ol li.ql-indent-3:before {
-    content: counter(list-3, decimal) '. ';
-}
-.ql-editor ol li.ql-indent-3 {
-    counter-reset: list-4 list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-4 {
-    counter-increment: list-4;
-}
-.ql-editor ol li.ql-indent-4:before {
-    content: counter(list-4, lower-alpha) '. ';
-}
-.ql-editor ol li.ql-indent-4 {
-    counter-reset: list-5 list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-5 {
-    counter-increment: list-5;
-}
-.ql-editor ol li.ql-indent-5:before {
-    content: counter(list-5, lower-roman) '. ';
-}
-.ql-editor ol li.ql-indent-5 {
-    counter-reset: list-6 list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-6 {
-    counter-increment: list-6;
-}
-.ql-editor ol li.ql-indent-6:before {
-    content: counter(list-6, decimal) '. ';
-}
-.ql-editor ol li.ql-indent-6 {
-    counter-reset: list-7 list-8 list-9;
-}
-.ql-editor ol li.ql-indent-7 {
-    counter-increment: list-7;
-}
-.ql-editor ol li.ql-indent-7:before {
-    content: counter(list-7, lower-alpha) '. ';
-}
-.ql-editor ol li.ql-indent-7 {
-    counter-reset: list-8 list-9;
-}
-.ql-editor ol li.ql-indent-8 {
-    counter-increment: list-8;
-}
-.ql-editor ol li.ql-indent-8:before {
-    content: counter(list-8, lower-roman) '. ';
-}
-.ql-editor ol li.ql-indent-8 {
-    counter-reset: list-9;
-}
-.ql-editor ol li.ql-indent-9 {
-    counter-increment: list-9;
-}
-.ql-editor ol li.ql-indent-9:before {
-    content: counter(list-9, decimal) '. ';
-}
-.ql-editor .ql-video {
-    display: block;
-    max-width: 100%;
-}
-.ql-editor .ql-video.ql-align-center {
-    margin: 0 auto;
-}
-.ql-editor .ql-video.ql-align-right {
-    margin: 0 0 0 auto;
-}
-.ql-editor .ql-bg-black {
-    background: #000;
-}
-.ql-editor .ql-bg-red {
-    background: #e60000;
-}
-.ql-editor .ql-bg-orange {
-    background: #f90;
-}
-.ql-editor .ql-bg-yellow {
-    background: #ff0;
-}
-.ql-editor .ql-bg-green {
-    background: #008a00;
-}
-.ql-editor .ql-bg-blue {
-    background: #06c;
-}
-.ql-editor .ql-bg-purple {
-    background: #93f;
-}
-.ql-editor .ql-color-white {
-    color: #fff;
-}
-.ql-editor .ql-color-red {
-    color: #e60000;
-}
-.ql-editor .ql-color-orange {
-    color: #f90;
-}
-.ql-editor .ql-color-yellow {
-    color: #ff0;
-}
-.ql-editor .ql-color-green {
-    color: #008a00;
-}
-.ql-editor .ql-color-blue {
-    color: #06c;
-}
-.ql-editor .ql-color-purple {
-    color: #93f;
-}
-.ql-editor .ql-font-serif {
-    font-family: Georgia, Times New Roman, serif;
-}
-.ql-editor .ql-font-monospace {
-    font-family: Monaco, Courier New, monospace;
-}
-.ql-editor .ql-size-small {
-    font-size: 0.75rem;
-}
-.ql-editor .ql-size-large {
-    font-size: 1.5rem;
-}
-.ql-editor .ql-size-huge {
-    font-size: 2.5rem;
-}
-.ql-editor .ql-direction-rtl {
-    direction: rtl;
-    text-align: inherit;
-}
-.ql-editor .ql-align-center {
-    text-align: center;
-}
-.ql-editor .ql-align-justify {
-    text-align: justify;
-}
-.ql-editor .ql-align-right {
-    text-align: right;
-}
-.ql-editor.ql-blank::before {
-    color: rgba(0, 0, 0, 0.6);
-    content: attr(data-placeholder);
-    font-style: italic;
-    inset-inline-start: 15px;
-    pointer-events: none;
-    position: absolute;
-    inset-inline-end: 15px;
-}
-.ql-snow.ql-toolbar:after,
-.ql-snow .ql-toolbar:after {
-    clear: both;
-    content: '';
-    display: table;
-}
-.ql-snow.ql-toolbar button,
-.ql-snow .ql-toolbar button {
-    background: none;
-    border: none;
-    cursor: pointer;
-    display: inline-block;
-    float: left;
-    height: 24px;
-    padding-block: 3px;
-    padding-inline: 5px;
-    width: 28px;
-}
-.ql-snow.ql-toolbar button svg,
-.ql-snow .ql-toolbar button svg {
-    float: left;
-    height: 100%;
-}
-.ql-snow.ql-toolbar button:active:hover,
-.ql-snow .ql-toolbar button:active:hover {
-    outline: none;
-}
-.ql-snow.ql-toolbar input.ql-image[type='file'],
-.ql-snow .ql-toolbar input.ql-image[type='file'] {
-    display: none;
-}
-.ql-snow.ql-toolbar button:hover,
-.ql-snow .ql-toolbar button:hover,
-.ql-snow.ql-toolbar button:focus,
-.ql-snow .ql-toolbar button:focus,
-.ql-snow.ql-toolbar button.ql-active,
-.ql-snow .ql-toolbar button.ql-active,
-.ql-snow.ql-toolbar .ql-picker-label:hover,
-.ql-snow .ql-toolbar .ql-picker-label:hover,
-.ql-snow.ql-toolbar .ql-picker-label.ql-active,
-.ql-snow .ql-toolbar .ql-picker-label.ql-active,
-.ql-snow.ql-toolbar .ql-picker-item:hover,
-.ql-snow .ql-toolbar .ql-picker-item:hover,
-.ql-snow.ql-toolbar .ql-picker-item.ql-selected,
-.ql-snow .ql-toolbar .ql-picker-item.ql-selected {
-    color: #06c;
-}
-.ql-snow.ql-toolbar button:hover .ql-fill,
-.ql-snow .ql-toolbar button:hover .ql-fill,
-.ql-snow.ql-toolbar button:focus .ql-fill,
-.ql-snow .ql-toolbar button:focus .ql-fill,
-.ql-snow.ql-toolbar button.ql-active .ql-fill,
-.ql-snow .ql-toolbar button.ql-active .ql-fill,
-.ql-snow.ql-toolbar .ql-picker-label:hover .ql-fill,
-.ql-snow .ql-toolbar .ql-picker-label:hover .ql-fill,
-.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-fill,
-.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-fill,
-.ql-snow.ql-toolbar .ql-picker-item:hover .ql-fill,
-.ql-snow .ql-toolbar .ql-picker-item:hover .ql-fill,
-.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-fill,
-.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-fill,
-.ql-snow.ql-toolbar button:hover .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar button:hover .ql-stroke.ql-fill,
-.ql-snow.ql-toolbar button:focus .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar button:focus .ql-stroke.ql-fill,
-.ql-snow.ql-toolbar button.ql-active .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar button.ql-active .ql-stroke.ql-fill,
-.ql-snow.ql-toolbar .ql-picker-label:hover .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar .ql-picker-label:hover .ql-stroke.ql-fill,
-.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-stroke.ql-fill,
-.ql-snow.ql-toolbar .ql-picker-item:hover .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar .ql-picker-item:hover .ql-stroke.ql-fill,
-.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke.ql-fill,
-.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-stroke.ql-fill {
-    fill: #06c;
-}
-.ql-snow.ql-toolbar button:hover .ql-stroke,
-.ql-snow .ql-toolbar button:hover .ql-stroke,
-.ql-snow.ql-toolbar button:focus .ql-stroke,
-.ql-snow .ql-toolbar button:focus .ql-stroke,
-.ql-snow.ql-toolbar button.ql-active .ql-stroke,
-.ql-snow .ql-toolbar button.ql-active .ql-stroke,
-.ql-snow.ql-toolbar .ql-picker-label:hover .ql-stroke,
-.ql-snow .ql-toolbar .ql-picker-label:hover .ql-stroke,
-.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke,
-.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-stroke,
-.ql-snow.ql-toolbar .ql-picker-item:hover .ql-stroke,
-.ql-snow .ql-toolbar .ql-picker-item:hover .ql-stroke,
-.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke,
-.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-stroke,
-.ql-snow.ql-toolbar button:hover .ql-stroke-miter,
-.ql-snow .ql-toolbar button:hover .ql-stroke-miter,
-.ql-snow.ql-toolbar button:focus .ql-stroke-miter,
-.ql-snow .ql-toolbar button:focus .ql-stroke-miter,
-.ql-snow.ql-toolbar button.ql-active .ql-stroke-miter,
-.ql-snow.ql-toolbar button.ql-active .ql-stroke-miter,
-.ql-snow.ql-toolbar .ql-picker-label:hover .ql-stroke-miter,
-.ql-snow .ql-toolbar .ql-picker-label:hover .ql-stroke-miter,
-.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke-miter,
-.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-stroke-miter,
-.ql-snow.ql-toolbar .ql-picker-item:hover .ql-stroke-miter,
-.ql-snow .ql-toolbar .ql-picker-item:hover .ql-stroke-miter,
-.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke-miter,
-.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-stroke-miter {
-    stroke: #06c;
-}
-@media (pointer: coarse) {
-    .ql-snow.ql-toolbar button:hover:not(.ql-active),
-    .ql-snow .ql-toolbar button:hover:not(.ql-active) {
-        color: #444;
-    }
-    .ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-fill,
-    .ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-fill,
-    .ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-stroke.ql-fill,
-    .ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-stroke.ql-fill {
-        fill: #444;
-    }
-    .ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-stroke,
-    .ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-stroke,
-    .ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-stroke-miter,
-    .ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-stroke-miter {
-        stroke: #444;
-    }
-}
-.ql-snow {
-    box-sizing: border-box;
-}
-.ql-snow * {
-    box-sizing: border-box;
-}
-.ql-snow .ql-hidden {
-    display: none;
-}
-.ql-snow .ql-out-bottom,
-.ql-snow .ql-out-top {
-    visibility: hidden;
-}
-.ql-snow .ql-tooltip {
-    position: absolute;
-    transform: translateY(10px);
-}
-.ql-snow .ql-tooltip a {
-    cursor: pointer;
-    text-decoration: none;
-}
-.ql-snow .ql-tooltip.ql-flip {
-    transform: translateY(-10px);
-}
-.ql-snow .ql-formats {
-    display: inline-block;
-    vertical-align: middle;
-}
-.ql-snow .ql-formats:after {
-    clear: both;
-    content: '';
-    display: table;
-}
-.ql-snow .ql-stroke {
-    fill: none;
-    stroke: #444;
-    stroke-linecap: round;
-    stroke-linejoin: round;
-    stroke-width: 2;
-}
-.ql-snow .ql-stroke-miter {
-    fill: none;
-    stroke: #444;
-    stroke-miterlimit: 10;
-    stroke-width: 2;
-}
-.ql-snow .ql-fill,
-.ql-snow .ql-stroke.ql-fill {
-    fill: #444;
-}
-.ql-snow .ql-empty {
-    fill: none;
-}
-.ql-snow .ql-even {
-    fill-rule: evenodd;
-}
-.ql-snow .ql-thin,
-.ql-snow .ql-stroke.ql-thin {
-    stroke-width: 1;
-}
-.ql-snow .ql-transparent {
-    opacity: 0.4;
-}
-.ql-snow .ql-direction svg:last-child {
-    display: none;
-}
-.ql-snow .ql-direction.ql-active svg:last-child {
-    display: inline;
-}
-.ql-snow .ql-direction.ql-active svg:first-child {
-    display: none;
-}
-.ql-snow .ql-editor h1 {
-    font-size: 2rem;
-}
-.ql-snow .ql-editor h2 {
-    font-size: 1.5rem;
-}
-.ql-snow .ql-editor h3 {
-    font-size: 1.17rem;
-}
-.ql-snow .ql-editor h4 {
-    font-size: 1rem;
-}
-.ql-snow .ql-editor h5 {
-    font-size: 0.83rem;
-}
-.ql-snow .ql-editor h6 {
-    font-size: 0.67rem;
-}
-.ql-snow .ql-editor a {
-    text-decoration: underline;
-}
-.ql-snow .ql-editor blockquote {
-    border-inline-start: 4px solid #ccc;
-    margin-block-end: 5px;
-    margin-block-start: 5px;
-    padding-inline-start: 16px;
-}
-.ql-snow .ql-editor code,
-.ql-snow .ql-editor pre {
-    background: #f0f0f0;
-    border-radius: 3px;
-}
-.ql-snow .ql-editor pre {
-    white-space: pre-wrap;
-    margin-block-end: 5px;
-    margin-block-start: 5px;
-    padding: 5px 10px;
-}
-.ql-snow .ql-editor code {
-    font-size: 85%;
-    padding: 2px 4px;
-}
-.ql-snow .ql-editor pre.ql-syntax {
-    background: #23241f;
-    color: #f8f8f2;
-    overflow: visible;
-}
-.ql-snow .ql-editor img {
-    max-width: 100%;
-}
-.ql-snow .ql-picker {
-    color: #444;
-    display: inline-block;
-    float: left;
-    inset-inline-start: 0;
-    font-size: 14px;
-    font-weight: 500;
-    height: 24px;
-    position: relative;
-    vertical-align: middle;
-}
-.ql-snow .ql-picker-label {
-    cursor: pointer;
-    display: inline-block;
-    height: 100%;
-    padding-inline-start: 8px;
-    padding-inline-end: 2px;
-    position: relative;
-    width: 100%;
-}
-.ql-snow .ql-picker-label::before {
-    display: inline-block;
-    line-height: 22px;
-}
-.ql-snow .ql-picker-options {
-    background: #fff;
-    display: none;
-    min-width: 100%;
-    padding: 4px 8px;
-    position: absolute;
-    white-space: nowrap;
-}
-.ql-snow .ql-picker-options .ql-picker-item {
-    cursor: pointer;
-    display: block;
-    padding-block-end: 5px;
-    padding-block-start: 5px;
-}
-.ql-snow .ql-picker.ql-expanded .ql-picker-label {
-    color: #ccc;
-    z-index: 2;
-}
-.ql-snow .ql-picker.ql-expanded .ql-picker-label .ql-fill {
-    fill: #ccc;
-}
-.ql-snow .ql-picker.ql-expanded .ql-picker-label .ql-stroke {
-    stroke: #ccc;
-}
-.ql-snow .ql-picker.ql-expanded .ql-picker-options {
-    display: block;
-    margin-block-start: -1px;
-    top: 100%;
-    z-index: 1;
-}
-.ql-snow .ql-color-picker,
-.ql-snow .ql-icon-picker {
-    width: 28px;
-}
-.ql-snow .ql-color-picker .ql-picker-label,
-.ql-snow .ql-icon-picker .ql-picker-label {
-    padding: 2px 4px;
-}
-.ql-snow .ql-color-picker .ql-picker-label svg,
-.ql-snow .ql-icon-picker .ql-picker-label svg {
-    inset-inline-end: 4px;
-}
-.ql-snow .ql-icon-picker .ql-picker-options {
-    padding: 4px 0;
-}
-.ql-snow .ql-icon-picker .ql-picker-item {
-    height: 24px;
-    width: 24px;
-    padding: 2px 4px;
-}
-.ql-snow .ql-color-picker .ql-picker-options {
-    padding: 3px 5px;
-    width: 152px;
-}
-.ql-snow .ql-color-picker .ql-picker-item {
-    border: 1px solid transparent;
-    float: left;
-    height: 16px;
-    margin: 2px;
-    padding: 0;
-    width: 16px;
-}
-.ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg {
-    position: absolute;
-    margin-block-start: -9px;
-    inset-inline-end: 0;
-    top: 50%;
-    width: 18px;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-label]:not([data-label=''])::before,
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-label]:not([data-label=''])::before,
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-label]:not([data-label=''])::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-label]:not([data-label=''])::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-label]:not([data-label=''])::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-label]:not([data-label=''])::before {
-    content: attr(data-label);
-}
-.ql-snow .ql-picker.ql-header {
-    width: 98px;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item::before {
-    content: 'Normal';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='1']::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='1']::before {
-    content: 'Heading 1';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='2']::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='2']::before {
-    content: 'Heading 2';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='3']::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='3']::before {
-    content: 'Heading 3';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='4']::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='4']::before {
-    content: 'Heading 4';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='5']::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='5']::before {
-    content: 'Heading 5';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value='6']::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='6']::before {
-    content: 'Heading 6';
-}
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='1']::before {
-    font-size: 2rem;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='2']::before {
-    font-size: 1.5rem;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='3']::before {
-    font-size: 1.17rem;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='4']::before {
-    font-size: 1rem;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='5']::before {
-    font-size: 0.83rem;
-}
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value='6']::before {
-    font-size: 0.67rem;
-}
-.ql-snow .ql-picker.ql-font {
-    width: 108px;
-}
-.ql-snow .ql-picker.ql-font .ql-picker-label::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item::before {
-    content: 'Sans Serif';
-}
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='serif']::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='serif']::before {
-    content: 'Serif';
-}
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value='monospace']::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='monospace']::before {
-    content: 'Monospace';
-}
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='serif']::before {
-    font-family: Georgia, Times New Roman, serif;
-}
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value='monospace']::before {
-    font-family: Monaco, Courier New, monospace;
-}
-.ql-snow .ql-picker.ql-size {
-    width: 98px;
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item::before {
-    content: 'Normal';
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='small']::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='small']::before {
-    content: 'Small';
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='large']::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='large']::before {
-    content: 'Large';
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value='huge']::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='huge']::before {
-    content: 'Huge';
-}
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='small']::before {
-    font-size: 10px;
-}
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='large']::before {
-    font-size: 18px;
-}
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value='huge']::before {
-    font-size: 32px;
-}
-.ql-snow .ql-color-picker.ql-background .ql-picker-item {
-    background: #fff;
-}
-.ql-snow .ql-color-picker.ql-color .ql-picker-item {
-    background: #000;
-}
-.ql-toolbar.ql-snow {
-    border: 1px solid #ccc;
-    box-sizing: border-box;
-    font-family: 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
-    padding: 8px;
-}
-.ql-toolbar.ql-snow .ql-formats {
-    margin-inline-end: 15px;
-}
-.ql-toolbar.ql-snow .ql-picker-label {
-    border: 1px solid transparent;
-}
-.ql-toolbar.ql-snow .ql-picker-options {
-    border: 1px solid transparent;
-    box-shadow: rgba(0, 0, 0, 0.2) 0 2px 8px;
-}
-.ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label {
-    border-color: #ccc;
-}
-.ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options {
-    border-color: #ccc;
-}
-.ql-toolbar.ql-snow .ql-color-picker .ql-picker-item.ql-selected,
-.ql-toolbar.ql-snow .ql-color-picker .ql-picker-item:hover {
-    border-color: #000;
-}
-.ql-toolbar.ql-snow + .ql-container.ql-snow {
-    border-block-start: 0;
-}
-.ql-snow .ql-tooltip {
-    background: #fff;
-    border: 1px solid #ccc;
-    box-shadow: 0 0 5px #ddd;
-    color: #444;
-    padding: 5px 12px;
-    white-space: nowrap;
-}
-.ql-snow .ql-tooltip::before {
-    content: 'Visit URL:';
-    line-height: 26px;
-    margin-inline-end: 8px;
-}
-.ql-snow .ql-tooltip input[type='text'] {
-    display: none;
-    border: 1px solid #ccc;
-    font-size: 13px;
-    height: 26px;
-    margin: 0;
-    padding: 3px 5px;
-    width: 170px;
-}
-.ql-snow .ql-tooltip a.ql-preview {
-    display: inline-block;
-    max-width: 200px;
-    overflow-x: hidden;
-    text-overflow: ellipsis;
-    vertical-align: top;
-}
-.ql-snow .ql-tooltip a.ql-action::after {
-    border-inline-end: 1px solid #ccc;
-    content: 'Edit';
-    margin-inline-start: 16px;
-    padding-inline-end: 8px;
-}
-.ql-snow .ql-tooltip a.ql-remove::before {
-    content: 'Remove';
-    margin-inline-start: 8px;
-}
-.ql-snow .ql-tooltip a {
-    line-height: 26px;
-}
-.ql-snow .ql-tooltip.ql-editing a.ql-preview,
-.ql-snow .ql-tooltip.ql-editing a.ql-remove {
-    display: none;
-}
-.ql-snow .ql-tooltip.ql-editing input[type='text'] {
-    display: inline-block;
-}
-.ql-snow .ql-tooltip.ql-editing a.ql-action::after {
-    border-inline-end: 0;
-    content: 'Save';
-    padding-inline-end: 0;
-}
-.ql-snow .ql-tooltip[data-mode='link']::before {
-    content: 'Enter link:';
-}
-.ql-snow .ql-tooltip[data-mode='formula']::before {
-    content: 'Enter formula:';
-}
-.ql-snow .ql-tooltip[data-mode='video']::before {
-    content: 'Enter video:';
-}
-.ql-snow a {
-    color: #06c;
-}
-.ql-container.ql-snow {
-    border: 1px solid #ccc;
-}
 
-.p-editor .p-editor-toolbar {
+.p-editor .ql-toolbar {
     background: ${dt('editor.toolbar.background')};
     border-start-end-radius: ${dt('editor.toolbar.border.radius')};
     border-start-start-radius: ${dt('editor.toolbar.border.radius')};
-}
 
-.p-editor .p-editor-toolbar.ql-snow {
-    border: 1px solid ${dt('editor.toolbar.border.color')};
-}
+    button:hover, button:focus, .ql-picker-label:hover, .ql-picker-item:hover {
+        color: ${dt('editor.toolbar.item.hover.color')};
 
-.p-editor .p-editor-toolbar.ql-snow .ql-stroke {
-    stroke: ${dt('editor.toolbar.item.color')};
-}
+        .ql-fill, .ql-stroke.ql-fill {
+            fill: ${dt('editor.toolbar.item.hover.color')};
+        }
 
-.p-editor .p-editor-toolbar.ql-snow .ql-fill {
-    fill: ${dt('editor.toolbar.item.color')};
-}
+        .ql-stroke, .ql-stroke-miter {
+            stroke: ${dt('editor.toolbar.item.hover.color')};
+        }
+    }
 
-.p-editor .p-editor-toolbar.ql-snow .ql-picker .ql-picker-label {
-    border: 0 none;
-    color: ${dt('editor.toolbar.item.color')};
-}
+    button.ql-active, .ql-picker-label.ql-active, .ql-picker-item.ql-selected {
+        color: ${dt('editor.toolbar.item.active.color')};
 
-.p-editor .p-editor-toolbar.ql-snow .ql-picker .ql-picker-label:hover {
-    color: ${dt('editor.toolbar.item.hover.color')};
-}
+        .ql-fill, .ql-stroke.ql-fill {
+            fill: ${dt('editor.toolbar.item.active.color')};
+        }
 
-.p-editor .p-editor-toolbar.ql-snow .ql-picker .ql-picker-label:hover .ql-stroke {
-    stroke: ${dt('editor.toolbar.item.hover.color')};
+        .ql-stroke, .ql-stroke-miter {
+            stroke: ${dt('editor.toolbar.item.active.color')}
+        }
+    }
 }
 
-.p-editor .p-editor-toolbar.ql-snow .ql-picker .ql-picker-label:hover .ql-fill {
-    fill: ${dt('editor.toolbar.item.hover.color')};
+.p-editor .ql-toolbar.ql-snow {
+    border: 1px solid ${dt('editor.toolbar.border.color')};
 }
 
-.p-editor .p-editor-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label {
-    color: ${dt('editor.toolbar.item.active.color')};
+.p-editor .ql-toolbar.ql-snow .ql-stroke {
+    stroke: ${dt('editor.toolbar.item.color')};
 }
 
-.p-editor .p-editor-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label .ql-stroke {
-    stroke: ${dt('editor.toolbar.item.active.color')};
+.p-editor .ql-toolbar.ql-snow .ql-fill {
+    fill: ${dt('editor.toolbar.item.color')};
 }
 
-.p-editor .p-editor-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label .ql-fill {
-    fill: ${dt('editor.toolbar.item.active.color')};
+.p-editor .ql-toolbar.ql-snow .ql-picker .ql-picker-label {
+    border: 0 none;
+    color: ${dt('editor.toolbar.item.color')};
 }
 
-.p-editor .p-editor-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options {
+.p-editor .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options {
     background: ${dt('editor.overlay.background')};
     border: 1px solid ${dt('editor.overlay.border.color')};
     box-shadow: ${dt('editor.overlay.shadow')};
@@ -896,17 +63,17 @@ const theme = ({ dt }) => `
     padding: ${dt('editor.overlay.padding')};
 }
 
-.p-editor .p-editor-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options .ql-picker-item {
+.p-editor .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options .ql-picker-item {
     color: ${dt('editor.overlay.option.color')};
     border-radius: ${dt('editor.overlay.option.border.radius')};
 }
 
-.p-editor .p-editor-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options .ql-picker-item:hover {
+.p-editor .ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options .ql-picker-item:hover {
     background: ${dt('editor.overlay.option.focus.background')};
     color: ${dt('editor.overlay.option.focus.color')};
 }
 
-.p-editor .p-editor-toolbar.ql-snow .ql-picker.ql-expanded:not(.ql-icon-picker) .ql-picker-item {
+.p-editor .ql-toolbar.ql-snow .ql-picker.ql-expanded:not(.ql-icon-picker) .ql-picker-item {
     padding: ${dt('editor.overlay.option.padding')};
 }
 
@@ -925,45 +92,6 @@ const theme = ({ dt }) => `
     border-end-end-radius: ${dt('editor.content.border.radius')};
     border-end-start-radius: ${dt('editor.content.border.radius')};
 }
-
-.p-editor .ql-snow.ql-toolbar button:hover,
-.p-editor .ql-snow.ql-toolbar button:focus {
-    color: ${dt('editor.toolbar.item.hover.color')};
-}
-
-.p-editor .ql-snow.ql-toolbar button:hover .ql-stroke,
-.p-editor .ql-snow.ql-toolbar button:focus .ql-stroke {
-    stroke: ${dt('editor.toolbar.item.hover.color')};
-}
-
-.p-editor .ql-snow.ql-toolbar button:hover .ql-fill,
-.p-editor .ql-snow.ql-toolbar button:focus .ql-fill {
-    fill: ${dt('editor.toolbar.item.hover.color')};
-}
-
-.p-editor .ql-snow.ql-toolbar button.ql-active,
-.p-editor .ql-snow.ql-toolbar .ql-picker-label.ql-active,
-.p-editor .ql-snow.ql-toolbar .ql-picker-item.ql-selected {
-    color: ${dt('editor.toolbar.item.active.color')};
-}
-
-.p-editor .ql-snow.ql-toolbar button.ql-active .ql-stroke,
-.p-editor .ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke,
-.p-editor .ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke {
-    stroke: ${dt('editor.toolbar.item.active.color')};
-}
-
-.p-editor .ql-snow.ql-toolbar button.ql-active .ql-fill,
-.p-editor .ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-fill,
-.p-editor .ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-fill {
-    fill: ${dt('editor.toolbar.item.active.color')};
-}
-
-.p-editor .ql-snow.ql-toolbar button.ql-active .ql-picker-label,
-.p-editor .ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-picker-label,
-.p-editor .ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-picker-label {
-    color: ${dt('editor.toolbar.item.active.color')};
-}
 `;
 
 const classes = {
diff --git a/packages/themes/src/presets/material/editor/index.js b/packages/themes/src/presets/material/editor/index.js
index 61c1ce28ba..962d647bbe 100644
--- a/packages/themes/src/presets/material/editor/index.js
+++ b/packages/themes/src/presets/material/editor/index.js
@@ -31,7 +31,7 @@ export default {
         borderRadius: '{content.border.radius}'
     },
     css: ({ dt }) => `
-.p-editor .p-editor-toolbar {
+.p-editor .ql-toolbar, .p-editor .p-editor-toolbar {
     padding: 0.75rem
 }
 `
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 98da078f90..4e7022d185 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -118,8 +118,8 @@ importers:
         specifier: workspace:*
         version: link:../../packages/primevue
       quill:
-        specifier: 2.0.0
-        version: 2.0.0
+        specifier: 2.0.2
+        version: 2.0.2
       sass:
         specifier: 1.45.0
         version: 1.45.0
@@ -5370,8 +5370,8 @@ packages:
     resolution: {integrity: sha512-X74oCeRI4/p0ucjb5Ma8adTXd9Scumz367kkMK5V/IatcX6A0vlgLgKbzXWy5nZmCGeNJm2oQX0d2Eqj+ZIlCA==}
     engines: {node: '>= 12.0.0'}
 
-  quill@2.0.0:
-    resolution: {integrity: sha512-rVjwXhUD7svWsHPgzaT/O5D1xbZ5xeJjN2SZ/CxAkX1+WLV1VaALkmBt/elV/OCYNr/VapuXPoEZMYU5e72NPw==}
+  quill@2.0.2:
+    resolution: {integrity: sha512-QfazNrhMakEdRG57IoYFwffUIr04LWJxbS/ZkidRFXYCQt63c1gK6Z7IHUXMx/Vh25WgPBU42oBaNzQ0K1R/xw==}
     engines: {npm: '>=8.2.3'}
 
   radix3@1.1.2:
@@ -12729,7 +12729,7 @@ snapshots:
       lodash.clonedeep: 4.5.0
       lodash.isequal: 4.5.0
 
-  quill@2.0.0:
+  quill@2.0.2:
     dependencies:
       eventemitter3: 5.0.1
       lodash-es: 4.17.21