diff --git a/api-generator/components/accordion.js b/api-generator/components/accordion.js
index baa34649c..f19209943 100644
--- a/api-generator/components/accordion.js
+++ b/api-generator/components/accordion.js
@@ -20,13 +20,13 @@ const AccordionProps = [
     {
         name: 'expandIcon',
         type: 'string',
-        default: 'pi-chevron-right',
+        default: 'null',
         description: 'Icon of a collapsed tab.'
     },
     {
         name: 'collapseIcon',
         type: 'string',
-        default: 'pi-chevron-down',
+        default: 'null',
         description: 'Icon of a expanded tab.'
     },
     {
diff --git a/components/lib/accordion/Accordion.d.ts b/components/lib/accordion/Accordion.d.ts
index a539869a3..6d0aa818e 100755
--- a/components/lib/accordion/Accordion.d.ts
+++ b/components/lib/accordion/Accordion.d.ts
@@ -102,12 +102,10 @@ export interface AccordionProps {
     lazy?: boolean | undefined;
     /**
      * Icon of a collapsed tab.
-     * @defaultValue pi pi-chevron-right
      */
     expandIcon?: string | undefined;
     /**
      * Icon of an expanded tab.
-     * @defaultValue pi pi-chevron-down
      */
     collapseIcon?: string | undefined;
     /**
diff --git a/components/lib/accordion/Accordion.vue b/components/lib/accordion/Accordion.vue
index 35d477236..3cde6b2b2 100755
--- a/components/lib/accordion/Accordion.vue
+++ b/components/lib/accordion/Accordion.vue
@@ -15,7 +15,8 @@
                     v-bind="{ ...getTabProp(tab, 'headeractionprops'), ...getTabPT(tab, 'headeraction') }"
                 >
                     <component v-if="tab.children && tab.children.headericon" :is="tab.children.headericon" :isTabActive="isTabActive(i)" :index="i"></component>
-                    <span v-else :class="getTabHeaderIconClass(i)" aria-hidden="true" v-bind="getTabPT(tab, 'headericon')"></span>
+                    <component v-else-if="isTabActive(i)" :is="collapseIcon ? 'span' : 'ChevronDownIcon'" :class="['p-accordion-toggle-icon', collapseIcon]" aria-hidden="true" v-bind="getTabPT(tab, 'headericon')" />
+                    <component v-else :is="expandIcon ? 'span' : 'ChevronRightIcon'" :class="['p-accordion-toggle-icon', expandIcon]" aria-hidden="true" v-bind="getTabPT(tab, 'headericon')" />
                     <span v-if="tab.props && tab.props.header" class="p-accordion-header-text" v-bind="getTabPT(tab, 'headertitle')">{{ tab.props.header }}</span>
                     <component v-if="tab.children && tab.children.header" :is="tab.children.header"></component>
                 </a>
@@ -42,6 +43,8 @@
 
 <script>
 import BaseComponent from 'primevue/basecomponent';
+import ChevronDownIcon from 'primevue/icon/chevrondown';
+import ChevronRightIcon from 'primevue/icon/chevronright';
 import Ripple from 'primevue/ripple';
 import { DomHandler, UniqueComponentId } from 'primevue/utils';
 
@@ -64,11 +67,11 @@ export default {
         },
         expandIcon: {
             type: String,
-            default: 'pi pi-chevron-right'
+            default: undefined
         },
         collapseIcon: {
             type: String,
-            default: 'pi pi-chevron-down'
+            default: undefined
         },
         tabindex: {
             type: Number,
@@ -252,9 +255,6 @@ export default {
                 }
             ];
         },
-        getTabHeaderIconClass(i) {
-            return ['p-accordion-toggle-icon', this.isTabActive(i) ? this.collapseIcon : this.expandIcon];
-        },
         getTabContentClass(tab) {
             return ['p-toggleable-content', this.getTabProp(tab, 'contentClass')];
         }
@@ -276,6 +276,10 @@ export default {
             }, []);
         }
     },
+    components: {
+        ChevronDownIcon,
+        ChevronRightIcon
+    },
     directives: {
         ripple: Ripple
     }