diff --git a/build-meta.js b/build-meta.js
index 697602815..14486010e 100644
--- a/build-meta.js
+++ b/build-meta.js
@@ -14,7 +14,7 @@ function copyDependencies(inFolder, outFolder) {
 }
 
 copyDependencies('./components/lib/', 'dist/');
-copyDependencies('./components/lib/icon/', 'dist/icon/');
+copyDependencies('./components/lib/icons/', 'dist/icons/');
 
 fs.copySync(path.resolve(__dirname, './components/lib/ts-helpers.d.ts'), 'dist/ts-helpers.d.ts');
 fs.copySync(path.resolve(__dirname, './package-build.json'), 'dist/package.json');
diff --git a/components/lib/accordion/Accordion.vue b/components/lib/accordion/Accordion.vue
index 3cde6b2b2..201a54b55 100755
--- a/components/lib/accordion/Accordion.vue
+++ b/components/lib/accordion/Accordion.vue
@@ -43,8 +43,8 @@
 
 <script>
 import BaseComponent from 'primevue/basecomponent';
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import ChevronRightIcon from 'primevue/icon/chevronright';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import ChevronRightIcon from 'primevue/icons/chevronright';
 import Ripple from 'primevue/ripple';
 import { DomHandler, UniqueComponentId } from 'primevue/utils';
 
diff --git a/components/lib/autocomplete/AutoComplete.vue b/components/lib/autocomplete/AutoComplete.vue
index 137e77a60..6259bab9f 100755
--- a/components/lib/autocomplete/AutoComplete.vue
+++ b/components/lib/autocomplete/AutoComplete.vue
@@ -151,9 +151,9 @@
 
 <script>
 import Button from 'primevue/button';
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import SpinnerIcon from 'primevue/icon/spinner';
-import TimesCircleIcon from 'primevue/icon/timescircle';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import SpinnerIcon from 'primevue/icons/spinner';
+import TimesCircleIcon from 'primevue/icons/timescircle';
 import OverlayEventBus from 'primevue/overlayeventbus';
 import Portal from 'primevue/portal';
 import Ripple from 'primevue/ripple';
diff --git a/components/lib/breadcrumb/Breadcrumb.vue b/components/lib/breadcrumb/Breadcrumb.vue
index d242a2538..01793bcc4 100755
--- a/components/lib/breadcrumb/Breadcrumb.vue
+++ b/components/lib/breadcrumb/Breadcrumb.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import ChevronRightIcon from 'primevue/icon/chevronright';
+import ChevronRightIcon from 'primevue/icons/chevronright';
 import BreadcrumbItem from './BreadcrumbItem.vue';
 
 export default {
diff --git a/components/lib/button/Button.vue b/components/lib/button/Button.vue
index bb9f1a180..027b91ab0 100755
--- a/components/lib/button/Button.vue
+++ b/components/lib/button/Button.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import SpinnerIcon from 'primevue/icon/spinner';
+import SpinnerIcon from 'primevue/icons/spinner';
 import Ripple from 'primevue/ripple';
 
 export default {
diff --git a/components/lib/calendar/Calendar.vue b/components/lib/calendar/Calendar.vue
index 9c236f100..fd2b6ce87 100755
--- a/components/lib/calendar/Calendar.vue
+++ b/components/lib/calendar/Calendar.vue
@@ -353,11 +353,11 @@
 
 <script>
 import Button from 'primevue/button';
-import CalendarIcon from 'primevue/icon/calendar';
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import ChevronLeftIcon from 'primevue/icon/chevronleft';
-import ChevronRightIcon from 'primevue/icon/chevronright';
-import ChevronUpIcon from 'primevue/icon/chevronup';
+import CalendarIcon from 'primevue/icons/calendar';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import ChevronLeftIcon from 'primevue/icons/chevronleft';
+import ChevronRightIcon from 'primevue/icons/chevronright';
+import ChevronUpIcon from 'primevue/icons/chevronup';
 import OverlayEventBus from 'primevue/overlayeventbus';
 import Portal from 'primevue/portal';
 import Ripple from 'primevue/ripple';
diff --git a/components/lib/carousel/Carousel.vue b/components/lib/carousel/Carousel.vue
index 8e8079b25..e67bd5118 100755
--- a/components/lib/carousel/Carousel.vue
+++ b/components/lib/carousel/Carousel.vue
@@ -85,10 +85,10 @@
 </template>
 
 <script>
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import ChevronLeftIcon from 'primevue/icon/chevronleft';
-import ChevronRightIcon from 'primevue/icon/chevronright';
-import ChevronUpIcon from 'primevue/icon/chevronup';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import ChevronLeftIcon from 'primevue/icons/chevronleft';
+import ChevronRightIcon from 'primevue/icons/chevronright';
+import ChevronUpIcon from 'primevue/icons/chevronup';
 import Ripple from 'primevue/ripple';
 import { DomHandler, UniqueComponentId } from 'primevue/utils';
 
diff --git a/components/lib/cascadeselect/CascadeSelect.vue b/components/lib/cascadeselect/CascadeSelect.vue
index fcbee62c4..a214584fe 100644
--- a/components/lib/cascadeselect/CascadeSelect.vue
+++ b/components/lib/cascadeselect/CascadeSelect.vue
@@ -75,9 +75,9 @@
 </template>
 
 <script>
-import AngleRightIcon from 'primevue/icon/angleright';
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import SpinnerIcon from 'primevue/icon/spinner';
+import AngleRightIcon from 'primevue/icons/angleright';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import SpinnerIcon from 'primevue/icons/spinner';
 import OverlayEventBus from 'primevue/overlayeventbus';
 import Portal from 'primevue/portal';
 import { ConnectedOverlayScrollHandler, DomHandler, ObjectUtils, UniqueComponentId, ZIndexUtils } from 'primevue/utils';
diff --git a/components/lib/cascadeselect/CascadeSelectSub.vue b/components/lib/cascadeselect/CascadeSelectSub.vue
index 525e2c2d5..29ae461f2 100644
--- a/components/lib/cascadeselect/CascadeSelectSub.vue
+++ b/components/lib/cascadeselect/CascadeSelectSub.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import AngleRightIcon from 'primevue/icon/angleright';
+import AngleRightIcon from 'primevue/icons/angleright';
 import Ripple from 'primevue/ripple';
 import { DomHandler, ObjectUtils } from 'primevue/utils';
 
diff --git a/components/lib/checkbox/Checkbox.vue b/components/lib/checkbox/Checkbox.vue
index 52cfa66d8..6917e992b 100755
--- a/components/lib/checkbox/Checkbox.vue
+++ b/components/lib/checkbox/Checkbox.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import CheckIcon from 'primevue/icon/check';
+import CheckIcon from 'primevue/icons/check';
 import { ObjectUtils } from 'primevue/utils';
 
 export default {
diff --git a/components/lib/chip/Chip.vue b/components/lib/chip/Chip.vue
index bd306ec58..e16447da4 100644
--- a/components/lib/chip/Chip.vue
+++ b/components/lib/chip/Chip.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import TimesCircleIcon from 'primevue/icon/timescircle';
+import TimesCircleIcon from 'primevue/icons/timescircle';
 
 export default {
     name: 'Chip',
diff --git a/components/lib/chips/Chips.vue b/components/lib/chips/Chips.vue
index 9eae6daa7..7a3cbc435 100755
--- a/components/lib/chips/Chips.vue
+++ b/components/lib/chips/Chips.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import TimesCircleIcon from 'primevue/icon/timescircle';
+import TimesCircleIcon from 'primevue/icons/timescircle';
 import { UniqueComponentId } from 'primevue/utils';
 
 export default {
diff --git a/components/lib/contextmenu/ContextMenuSub.vue b/components/lib/contextmenu/ContextMenuSub.vue
index 06a08ccdc..a6999ff02 100755
--- a/components/lib/contextmenu/ContextMenuSub.vue
+++ b/components/lib/contextmenu/ContextMenuSub.vue
@@ -61,7 +61,7 @@
 </template>
 
 <script>
-import AngleRightIcon from 'primevue/icon/angleright';
+import AngleRightIcon from 'primevue/icons/angleright';
 import Ripple from 'primevue/ripple';
 import { DomHandler, ObjectUtils } from 'primevue/utils';
 
diff --git a/components/lib/datatable/BodyCell.vue b/components/lib/datatable/BodyCell.vue
index 4c942dbea..3cfb83d1e 100755
--- a/components/lib/datatable/BodyCell.vue
+++ b/components/lib/datatable/BodyCell.vue
@@ -58,12 +58,12 @@
 </template>
 
 <script>
-import BarsIcon from 'primevue/icon/bars';
-import CheckIcon from 'primevue/icon/check';
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import ChevronRightIcon from 'primevue/icon/chevronright';
-import PencilIcon from 'primevue/icon/pencil';
-import TimesIcon from 'primevue/icon/times';
+import BarsIcon from 'primevue/icons/bars';
+import CheckIcon from 'primevue/icons/check';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import ChevronRightIcon from 'primevue/icons/chevronright';
+import PencilIcon from 'primevue/icons/pencil';
+import TimesIcon from 'primevue/icons/times';
 import OverlayEventBus from 'primevue/overlayeventbus';
 import Ripple from 'primevue/ripple';
 import { DomHandler, ObjectUtils } from 'primevue/utils';
diff --git a/components/lib/datatable/ColumnFilter.vue b/components/lib/datatable/ColumnFilter.vue
index 58cfbeb9d..eba50d5ca 100644
--- a/components/lib/datatable/ColumnFilter.vue
+++ b/components/lib/datatable/ColumnFilter.vue
@@ -116,10 +116,10 @@ import { FilterOperator } from 'primevue/api';
 import Button from 'primevue/button';
 import Dropdown from 'primevue/dropdown';
 import FocusTrap from 'primevue/focustrap';
-import FilterIcon from 'primevue/icon/filter';
-import FilterSlashIcon from 'primevue/icon/filterslash';
-import PlusIcon from 'primevue/icon/plus';
-import TrashIcon from 'primevue/icon/trash';
+import FilterIcon from 'primevue/icons/filter';
+import FilterSlashIcon from 'primevue/icons/filterslash';
+import PlusIcon from 'primevue/icons/plus';
+import TrashIcon from 'primevue/icons/trash';
 import OverlayEventBus from 'primevue/overlayeventbus';
 import Portal from 'primevue/portal';
 import { ConnectedOverlayScrollHandler, DomHandler, UniqueComponentId, ZIndexUtils } from 'primevue/utils';
diff --git a/components/lib/datatable/DataTable.vue b/components/lib/datatable/DataTable.vue
index 64db4e77f..04b8a937a 100755
--- a/components/lib/datatable/DataTable.vue
+++ b/components/lib/datatable/DataTable.vue
@@ -255,9 +255,9 @@
 
 <script>
 import { FilterMatchMode, FilterOperator, FilterService } from 'primevue/api';
-import ArrowDownIcon from 'primevue/icon/arrowdown';
-import ArrowUpIcon from 'primevue/icon/arrowup';
-import SpinnerIcon from 'primevue/icon/spinner';
+import ArrowDownIcon from 'primevue/icons/arrowdown';
+import ArrowUpIcon from 'primevue/icons/arrowup';
+import SpinnerIcon from 'primevue/icons/spinner';
 import Paginator from 'primevue/paginator';
 import { DomHandler, ObjectUtils, UniqueComponentId } from 'primevue/utils';
 import VirtualScroller from 'primevue/virtualscroller';
diff --git a/components/lib/datatable/HeaderCell.vue b/components/lib/datatable/HeaderCell.vue
index 268a6dce5..b1132c626 100644
--- a/components/lib/datatable/HeaderCell.vue
+++ b/components/lib/datatable/HeaderCell.vue
@@ -64,9 +64,9 @@
 </template>
 
 <script>
-import SortAltIcon from 'primevue/icon/sortalt';
-import SortAmountDownIcon from 'primevue/icon/sortamountdown';
-import SortAmountUpAltIcon from 'primevue/icon/sortamountupalt';
+import SortAltIcon from 'primevue/icons/sortalt';
+import SortAmountDownIcon from 'primevue/icons/sortamountdown';
+import SortAmountUpAltIcon from 'primevue/icons/sortamountupalt';
 import { DomHandler, ObjectUtils } from 'primevue/utils';
 import ColumnFilter from './ColumnFilter.vue';
 import HeaderCheckbox from './HeaderCheckbox.vue';
diff --git a/components/lib/datatable/HeaderCheckbox.vue b/components/lib/datatable/HeaderCheckbox.vue
index 2e0994f0d..5014861d0 100755
--- a/components/lib/datatable/HeaderCheckbox.vue
+++ b/components/lib/datatable/HeaderCheckbox.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import CheckIcon from 'primevue/icon/check';
+import CheckIcon from 'primevue/icons/check';
 import { DomHandler } from 'primevue/utils';
 
 export default {
diff --git a/components/lib/datatable/RowCheckbox.vue b/components/lib/datatable/RowCheckbox.vue
index 67077b76b..6bbc5e15b 100755
--- a/components/lib/datatable/RowCheckbox.vue
+++ b/components/lib/datatable/RowCheckbox.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import CheckIcon from 'primevue/icon/check';
+import CheckIcon from 'primevue/icons/check';
 import { DomHandler } from 'primevue/utils';
 
 export default {
diff --git a/components/lib/datatable/TableBody.vue b/components/lib/datatable/TableBody.vue
index 5a3bf5f47..17b47f774 100755
--- a/components/lib/datatable/TableBody.vue
+++ b/components/lib/datatable/TableBody.vue
@@ -97,8 +97,8 @@
 </template>
 
 <script>
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import ChevronRightIcon from 'primevue/icon/chevronright';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import ChevronRightIcon from 'primevue/icons/chevronright';
 import { DomHandler, ObjectUtils, UniqueComponentId } from 'primevue/utils';
 import BodyCell from './BodyCell.vue';
 
diff --git a/components/lib/dataviewlayoutoptions/DataViewLayoutOptions.vue b/components/lib/dataviewlayoutoptions/DataViewLayoutOptions.vue
index 0b6ff0337..ba7ff80bf 100755
--- a/components/lib/dataviewlayoutoptions/DataViewLayoutOptions.vue
+++ b/components/lib/dataviewlayoutoptions/DataViewLayoutOptions.vue
@@ -14,8 +14,8 @@
 </template>
 
 <script>
-import BarsIcon from 'primevue/icon/bars';
-import ThLargeIcon from 'primevue/icon/thlarge';
+import BarsIcon from 'primevue/icons/bars';
+import ThLargeIcon from 'primevue/icons/thlarge';
 
 export default {
     name: 'DataViewLayoutOptions',
diff --git a/components/lib/dialog/Dialog.vue b/components/lib/dialog/Dialog.vue
index 305137f97..5137a5de8 100755
--- a/components/lib/dialog/Dialog.vue
+++ b/components/lib/dialog/Dialog.vue
@@ -44,9 +44,9 @@
 
 <script>
 import FocusTrap from 'primevue/focustrap';
-import TimesIcon from 'primevue/icon/times';
-import WindowMaximizeIcon from 'primevue/icon/windowmaximize';
-import WindowMinimizeIcon from 'primevue/icon/windowminimize';
+import TimesIcon from 'primevue/icons/times';
+import WindowMaximizeIcon from 'primevue/icons/windowmaximize';
+import WindowMinimizeIcon from 'primevue/icons/windowminimize';
 import Portal from 'primevue/portal';
 import Ripple from 'primevue/ripple';
 import { DomHandler, UniqueComponentId, ZIndexUtils } from 'primevue/utils';
diff --git a/components/lib/dropdown/Dropdown.vue b/components/lib/dropdown/Dropdown.vue
index 142bd4c4e..4d1b4db6a 100755
--- a/components/lib/dropdown/Dropdown.vue
+++ b/components/lib/dropdown/Dropdown.vue
@@ -145,10 +145,10 @@
 
 <script>
 import { FilterService } from 'primevue/api';
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import FilterIcon from 'primevue/icon/filter';
-import SpinnerIcon from 'primevue/icon/spinner';
-import TimesIcon from 'primevue/icon/times';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import FilterIcon from 'primevue/icons/filter';
+import SpinnerIcon from 'primevue/icons/spinner';
+import TimesIcon from 'primevue/icons/times';
 import OverlayEventBus from 'primevue/overlayeventbus';
 import Portal from 'primevue/portal';
 import Ripple from 'primevue/ripple';
diff --git a/components/lib/fieldset/Fieldset.vue b/components/lib/fieldset/Fieldset.vue
index 8ac66d4e9..d4c34a14e 100755
--- a/components/lib/fieldset/Fieldset.vue
+++ b/components/lib/fieldset/Fieldset.vue
@@ -37,8 +37,8 @@
 
 <script>
 import BaseComponent from 'primevue/basecomponent';
-import MinusIcon from 'primevue/icon/minus';
-import PlusIcon from 'primevue/icon/plus';
+import MinusIcon from 'primevue/icons/minus';
+import PlusIcon from 'primevue/icons/plus';
 import Ripple from 'primevue/ripple';
 import { UniqueComponentId } from 'primevue/utils';
 
diff --git a/components/lib/fileupload/FileContent.vue b/components/lib/fileupload/FileContent.vue
index ae82e92fd..70d1b56ca 100644
--- a/components/lib/fileupload/FileContent.vue
+++ b/components/lib/fileupload/FileContent.vue
@@ -20,7 +20,7 @@
 <script>
 import Badge from 'primevue/badge';
 import Button from 'primevue/button';
-import TimesIcon from 'primevue/icon/times';
+import TimesIcon from 'primevue/icons/times';
 
 export default {
     emits: ['remove'],
diff --git a/components/lib/fileupload/FileUpload.vue b/components/lib/fileupload/FileUpload.vue
index 57405b732..fe51ee9a4 100755
--- a/components/lib/fileupload/FileUpload.vue
+++ b/components/lib/fileupload/FileUpload.vue
@@ -54,9 +54,9 @@
 
 <script>
 import Button from 'primevue/button';
-import PlusIcon from 'primevue/icon/plus';
-import TimesIcon from 'primevue/icon/times';
-import UploadIcon from 'primevue/icon/upload';
+import PlusIcon from 'primevue/icons/plus';
+import TimesIcon from 'primevue/icons/times';
+import UploadIcon from 'primevue/icons/upload';
 import Message from 'primevue/message';
 import ProgressBar from 'primevue/progressbar';
 import Ripple from 'primevue/ripple';
diff --git a/components/lib/galleria/GalleriaContent.vue b/components/lib/galleria/GalleriaContent.vue
index 83bee1e08..fb8bd5b17 100755
--- a/components/lib/galleria/GalleriaContent.vue
+++ b/components/lib/galleria/GalleriaContent.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import TimesIcon from 'primevue/icon/times';
+import TimesIcon from 'primevue/icons/times';
 import Ripple from 'primevue/ripple';
 import { UniqueComponentId } from 'primevue/utils';
 import GalleriaItem from './GalleriaItem.vue';
diff --git a/components/lib/galleria/GalleriaItem.vue b/components/lib/galleria/GalleriaItem.vue
index de7a41b06..68a78d018 100755
--- a/components/lib/galleria/GalleriaItem.vue
+++ b/components/lib/galleria/GalleriaItem.vue
@@ -35,8 +35,8 @@
 </template>
 
 <script>
-import ChevronLeftIcon from 'primevue/icon/chevronleft';
-import ChevronRightIcon from 'primevue/icon/chevronright';
+import ChevronLeftIcon from 'primevue/icons/chevronleft';
+import ChevronRightIcon from 'primevue/icons/chevronright';
 import Ripple from 'primevue/ripple';
 
 export default {
diff --git a/components/lib/galleria/GalleriaThumbnails.vue b/components/lib/galleria/GalleriaThumbnails.vue
index 5b1d7c33a..c61cf4ed6 100755
--- a/components/lib/galleria/GalleriaThumbnails.vue
+++ b/components/lib/galleria/GalleriaThumbnails.vue
@@ -37,10 +37,10 @@
 </template>
 
 <script>
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import ChevronLeftIcon from 'primevue/icon/chevronleft';
-import ChevronRightIcon from 'primevue/icon/chevronright';
-import ChevronUpIcon from 'primevue/icon/chevronup';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import ChevronLeftIcon from 'primevue/icons/chevronleft';
+import ChevronRightIcon from 'primevue/icons/chevronright';
+import ChevronUpIcon from 'primevue/icons/chevronup';
 import Ripple from 'primevue/ripple';
 import { DomHandler } from 'primevue/utils';
 
diff --git a/components/lib/icon/angledoubledown/index.d.ts b/components/lib/icons/angledoubledown/index.d.ts
similarity index 100%
rename from components/lib/icon/angledoubledown/index.d.ts
rename to components/lib/icons/angledoubledown/index.d.ts
diff --git a/components/lib/icon/angledoubledown/index.vue b/components/lib/icons/angledoubledown/index.vue
similarity index 100%
rename from components/lib/icon/angledoubledown/index.vue
rename to components/lib/icons/angledoubledown/index.vue
diff --git a/components/lib/icon/angledoubledown/package.json b/components/lib/icons/angledoubledown/package.json
similarity index 100%
rename from components/lib/icon/angledoubledown/package.json
rename to components/lib/icons/angledoubledown/package.json
diff --git a/components/lib/icon/angledoubleleft/index.d.ts b/components/lib/icons/angledoubleleft/index.d.ts
similarity index 88%
rename from components/lib/icon/angledoubleleft/index.d.ts
rename to components/lib/icons/angledoubleleft/index.d.ts
index fa7ada598..b81bd406a 100644
--- a/components/lib/icon/angledoubleleft/index.d.ts
+++ b/components/lib/icons/angledoubleleft/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class AngleDoubleLeftIcon extends Icon {}
 
diff --git a/components/lib/icon/angledoubleleft/index.vue b/components/lib/icons/angledoubleleft/index.vue
similarity index 100%
rename from components/lib/icon/angledoubleleft/index.vue
rename to components/lib/icons/angledoubleleft/index.vue
diff --git a/components/lib/icon/angledoubleleft/package.json b/components/lib/icons/angledoubleleft/package.json
similarity index 100%
rename from components/lib/icon/angledoubleleft/package.json
rename to components/lib/icons/angledoubleleft/package.json
diff --git a/components/lib/icon/angledoubleright/index.d.ts b/components/lib/icons/angledoubleright/index.d.ts
similarity index 88%
rename from components/lib/icon/angledoubleright/index.d.ts
rename to components/lib/icons/angledoubleright/index.d.ts
index 21f84bb4d..20a97ac20 100644
--- a/components/lib/icon/angledoubleright/index.d.ts
+++ b/components/lib/icons/angledoubleright/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class AngleDoubleRightIcon extends Icon {}
 
diff --git a/components/lib/icon/angledoubleright/index.vue b/components/lib/icons/angledoubleright/index.vue
similarity index 100%
rename from components/lib/icon/angledoubleright/index.vue
rename to components/lib/icons/angledoubleright/index.vue
diff --git a/components/lib/icon/angledoubleright/package.json b/components/lib/icons/angledoubleright/package.json
similarity index 100%
rename from components/lib/icon/angledoubleright/package.json
rename to components/lib/icons/angledoubleright/package.json
diff --git a/components/lib/icon/angledoubleup/index.d.ts b/components/lib/icons/angledoubleup/index.d.ts
similarity index 87%
rename from components/lib/icon/angledoubleup/index.d.ts
rename to components/lib/icons/angledoubleup/index.d.ts
index 04b5ea03d..642614d5f 100644
--- a/components/lib/icon/angledoubleup/index.d.ts
+++ b/components/lib/icons/angledoubleup/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class AngleDoubleUpIcon extends Icon {}
 
diff --git a/components/lib/icon/angledoubleup/index.vue b/components/lib/icons/angledoubleup/index.vue
similarity index 100%
rename from components/lib/icon/angledoubleup/index.vue
rename to components/lib/icons/angledoubleup/index.vue
diff --git a/components/lib/icon/angledoubleup/package.json b/components/lib/icons/angledoubleup/package.json
similarity index 100%
rename from components/lib/icon/angledoubleup/package.json
rename to components/lib/icons/angledoubleup/package.json
diff --git a/components/lib/icon/angledown/index.d.ts b/components/lib/icons/angledown/index.d.ts
similarity index 87%
rename from components/lib/icon/angledown/index.d.ts
rename to components/lib/icons/angledown/index.d.ts
index 6c20d7300..079531d54 100644
--- a/components/lib/icon/angledown/index.d.ts
+++ b/components/lib/icons/angledown/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class AngleDownIcon extends Icon {}
 
diff --git a/components/lib/icon/angledown/index.vue b/components/lib/icons/angledown/index.vue
similarity index 100%
rename from components/lib/icon/angledown/index.vue
rename to components/lib/icons/angledown/index.vue
diff --git a/components/lib/icon/angledown/package.json b/components/lib/icons/angledown/package.json
similarity index 100%
rename from components/lib/icon/angledown/package.json
rename to components/lib/icons/angledown/package.json
diff --git a/components/lib/icon/angleleft/index.d.ts b/components/lib/icons/angleleft/index.d.ts
similarity index 87%
rename from components/lib/icon/angleleft/index.d.ts
rename to components/lib/icons/angleleft/index.d.ts
index 412e1beab..6ddb1164d 100644
--- a/components/lib/icon/angleleft/index.d.ts
+++ b/components/lib/icons/angleleft/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class AngleLeftIcon extends Icon {}
 
diff --git a/components/lib/icon/angleleft/index.vue b/components/lib/icons/angleleft/index.vue
similarity index 100%
rename from components/lib/icon/angleleft/index.vue
rename to components/lib/icons/angleleft/index.vue
diff --git a/components/lib/icon/angleleft/package.json b/components/lib/icons/angleleft/package.json
similarity index 100%
rename from components/lib/icon/angleleft/package.json
rename to components/lib/icons/angleleft/package.json
diff --git a/components/lib/icon/angleright/index.d.ts b/components/lib/icons/angleright/index.d.ts
similarity index 87%
rename from components/lib/icon/angleright/index.d.ts
rename to components/lib/icons/angleright/index.d.ts
index a69e3196d..78aafbaa0 100644
--- a/components/lib/icon/angleright/index.d.ts
+++ b/components/lib/icons/angleright/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class AngleRightIcon extends Icon {}
 
diff --git a/components/lib/icon/angleright/index.vue b/components/lib/icons/angleright/index.vue
similarity index 100%
rename from components/lib/icon/angleright/index.vue
rename to components/lib/icons/angleright/index.vue
diff --git a/components/lib/icon/angleright/package.json b/components/lib/icons/angleright/package.json
similarity index 100%
rename from components/lib/icon/angleright/package.json
rename to components/lib/icons/angleright/package.json
diff --git a/components/lib/icon/angleup/index.d.ts b/components/lib/icons/angleup/index.d.ts
similarity index 86%
rename from components/lib/icon/angleup/index.d.ts
rename to components/lib/icons/angleup/index.d.ts
index a9f2a7875..3e04985c5 100644
--- a/components/lib/icon/angleup/index.d.ts
+++ b/components/lib/icons/angleup/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class AngleUpIcon extends Icon {}
 
diff --git a/components/lib/icon/angleup/index.vue b/components/lib/icons/angleup/index.vue
similarity index 100%
rename from components/lib/icon/angleup/index.vue
rename to components/lib/icons/angleup/index.vue
diff --git a/components/lib/icon/angleup/package.json b/components/lib/icons/angleup/package.json
similarity index 100%
rename from components/lib/icon/angleup/package.json
rename to components/lib/icons/angleup/package.json
diff --git a/components/lib/icon/arrowdown/index.d.ts b/components/lib/icons/arrowdown/index.d.ts
similarity index 87%
rename from components/lib/icon/arrowdown/index.d.ts
rename to components/lib/icons/arrowdown/index.d.ts
index 11ee3c17a..3770b6f5e 100644
--- a/components/lib/icon/arrowdown/index.d.ts
+++ b/components/lib/icons/arrowdown/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class ArrowDownIcon extends Icon {}
 
diff --git a/components/lib/icon/arrowdown/index.vue b/components/lib/icons/arrowdown/index.vue
similarity index 100%
rename from components/lib/icon/arrowdown/index.vue
rename to components/lib/icons/arrowdown/index.vue
diff --git a/components/lib/icon/arrowdown/package.json b/components/lib/icons/arrowdown/package.json
similarity index 100%
rename from components/lib/icon/arrowdown/package.json
rename to components/lib/icons/arrowdown/package.json
diff --git a/components/lib/icon/arrowup/index.d.ts b/components/lib/icons/arrowup/index.d.ts
similarity index 86%
rename from components/lib/icon/arrowup/index.d.ts
rename to components/lib/icons/arrowup/index.d.ts
index 75ec5c4e5..c68801d43 100644
--- a/components/lib/icon/arrowup/index.d.ts
+++ b/components/lib/icons/arrowup/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class ArrowUpIcon extends Icon {}
 
diff --git a/components/lib/icon/arrowup/index.vue b/components/lib/icons/arrowup/index.vue
similarity index 100%
rename from components/lib/icon/arrowup/index.vue
rename to components/lib/icons/arrowup/index.vue
diff --git a/components/lib/icon/arrowup/package.json b/components/lib/icons/arrowup/package.json
similarity index 100%
rename from components/lib/icon/arrowup/package.json
rename to components/lib/icons/arrowup/package.json
diff --git a/components/lib/icon/ban/index.d.ts b/components/lib/icons/ban/index.d.ts
similarity index 86%
rename from components/lib/icon/ban/index.d.ts
rename to components/lib/icons/ban/index.d.ts
index b145fbeba..cb0da1937 100644
--- a/components/lib/icon/ban/index.d.ts
+++ b/components/lib/icons/ban/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class BanIcon extends Icon {}
 
diff --git a/components/lib/icon/ban/index.vue b/components/lib/icons/ban/index.vue
similarity index 100%
rename from components/lib/icon/ban/index.vue
rename to components/lib/icons/ban/index.vue
diff --git a/components/lib/icon/ban/package.json b/components/lib/icons/ban/package.json
similarity index 100%
rename from components/lib/icon/ban/package.json
rename to components/lib/icons/ban/package.json
diff --git a/components/lib/icon/bars/index.d.ts b/components/lib/icons/bars/index.d.ts
similarity index 86%
rename from components/lib/icon/bars/index.d.ts
rename to components/lib/icons/bars/index.d.ts
index 3ed26b10d..dcbb5f9e7 100644
--- a/components/lib/icon/bars/index.d.ts
+++ b/components/lib/icons/bars/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class BarsIcon extends Icon {}
 
diff --git a/components/lib/icon/bars/index.vue b/components/lib/icons/bars/index.vue
similarity index 100%
rename from components/lib/icon/bars/index.vue
rename to components/lib/icons/bars/index.vue
diff --git a/components/lib/icon/bars/package.json b/components/lib/icons/bars/package.json
similarity index 100%
rename from components/lib/icon/bars/package.json
rename to components/lib/icons/bars/package.json
diff --git a/components/lib/icon/calendar/index.d.ts b/components/lib/icons/calendar/index.d.ts
similarity index 86%
rename from components/lib/icon/calendar/index.d.ts
rename to components/lib/icons/calendar/index.d.ts
index d8c13db8b..f58f9aabd 100644
--- a/components/lib/icon/calendar/index.d.ts
+++ b/components/lib/icons/calendar/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class CalendarIcon extends Icon {}
 
diff --git a/components/lib/icon/calendar/index.vue b/components/lib/icons/calendar/index.vue
similarity index 100%
rename from components/lib/icon/calendar/index.vue
rename to components/lib/icons/calendar/index.vue
diff --git a/components/lib/icon/calendar/package.json b/components/lib/icons/calendar/package.json
similarity index 100%
rename from components/lib/icon/calendar/package.json
rename to components/lib/icons/calendar/package.json
diff --git a/components/lib/icon/check/index.d.ts b/components/lib/icons/check/index.d.ts
similarity index 86%
rename from components/lib/icon/check/index.d.ts
rename to components/lib/icons/check/index.d.ts
index 87d690d22..1aa5ef9c6 100644
--- a/components/lib/icon/check/index.d.ts
+++ b/components/lib/icons/check/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class CheckIcon extends Icon {}
 
diff --git a/components/lib/icon/check/index.vue b/components/lib/icons/check/index.vue
similarity index 100%
rename from components/lib/icon/check/index.vue
rename to components/lib/icons/check/index.vue
diff --git a/components/lib/icon/check/package.json b/components/lib/icons/check/package.json
similarity index 100%
rename from components/lib/icon/check/package.json
rename to components/lib/icons/check/package.json
diff --git a/components/lib/icon/chevrondown/index.d.ts b/components/lib/icons/chevrondown/index.d.ts
similarity index 87%
rename from components/lib/icon/chevrondown/index.d.ts
rename to components/lib/icons/chevrondown/index.d.ts
index 5c4d5626f..4b3abd83b 100644
--- a/components/lib/icon/chevrondown/index.d.ts
+++ b/components/lib/icons/chevrondown/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class ChevronDownIcon extends Icon {}
 
diff --git a/components/lib/icon/chevrondown/index.vue b/components/lib/icons/chevrondown/index.vue
similarity index 100%
rename from components/lib/icon/chevrondown/index.vue
rename to components/lib/icons/chevrondown/index.vue
diff --git a/components/lib/icon/chevrondown/package.json b/components/lib/icons/chevrondown/package.json
similarity index 100%
rename from components/lib/icon/chevrondown/package.json
rename to components/lib/icons/chevrondown/package.json
diff --git a/components/lib/icon/chevronleft/index.d.ts b/components/lib/icons/chevronleft/index.d.ts
similarity index 87%
rename from components/lib/icon/chevronleft/index.d.ts
rename to components/lib/icons/chevronleft/index.d.ts
index dfc4e66f9..d53b77e74 100644
--- a/components/lib/icon/chevronleft/index.d.ts
+++ b/components/lib/icons/chevronleft/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class ChevronLeftIcon extends Icon {}
 
diff --git a/components/lib/icon/chevronleft/index.vue b/components/lib/icons/chevronleft/index.vue
similarity index 100%
rename from components/lib/icon/chevronleft/index.vue
rename to components/lib/icons/chevronleft/index.vue
diff --git a/components/lib/icon/chevronleft/package.json b/components/lib/icons/chevronleft/package.json
similarity index 100%
rename from components/lib/icon/chevronleft/package.json
rename to components/lib/icons/chevronleft/package.json
diff --git a/components/lib/icon/chevronright/index.d.ts b/components/lib/icons/chevronright/index.d.ts
similarity index 87%
rename from components/lib/icon/chevronright/index.d.ts
rename to components/lib/icons/chevronright/index.d.ts
index 2465554da..86a349334 100644
--- a/components/lib/icon/chevronright/index.d.ts
+++ b/components/lib/icons/chevronright/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class ChevronRightIcon extends Icon {}
 
diff --git a/components/lib/icon/chevronright/index.vue b/components/lib/icons/chevronright/index.vue
similarity index 100%
rename from components/lib/icon/chevronright/index.vue
rename to components/lib/icons/chevronright/index.vue
diff --git a/components/lib/icon/chevronright/package.json b/components/lib/icons/chevronright/package.json
similarity index 100%
rename from components/lib/icon/chevronright/package.json
rename to components/lib/icons/chevronright/package.json
diff --git a/components/lib/icon/chevronup/index.d.ts b/components/lib/icons/chevronup/index.d.ts
similarity index 87%
rename from components/lib/icon/chevronup/index.d.ts
rename to components/lib/icons/chevronup/index.d.ts
index f242f660b..7ea2eb703 100644
--- a/components/lib/icon/chevronup/index.d.ts
+++ b/components/lib/icons/chevronup/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class ChevronUpIcon extends Icon {}
 
diff --git a/components/lib/icon/chevronup/index.vue b/components/lib/icons/chevronup/index.vue
similarity index 100%
rename from components/lib/icon/chevronup/index.vue
rename to components/lib/icons/chevronup/index.vue
diff --git a/components/lib/icon/chevronup/package.json b/components/lib/icons/chevronup/package.json
similarity index 100%
rename from components/lib/icon/chevronup/package.json
rename to components/lib/icons/chevronup/package.json
diff --git a/components/lib/icon/exclamationtriangle/index.d.ts b/components/lib/icons/exclamationtriangle/index.d.ts
similarity index 88%
rename from components/lib/icon/exclamationtriangle/index.d.ts
rename to components/lib/icons/exclamationtriangle/index.d.ts
index 3a39a1f02..c10a36919 100644
--- a/components/lib/icon/exclamationtriangle/index.d.ts
+++ b/components/lib/icons/exclamationtriangle/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class ExclamationTriangleIcon extends Icon {}
 
diff --git a/components/lib/icon/exclamationtriangle/index.vue b/components/lib/icons/exclamationtriangle/index.vue
similarity index 100%
rename from components/lib/icon/exclamationtriangle/index.vue
rename to components/lib/icons/exclamationtriangle/index.vue
diff --git a/components/lib/icon/exclamationtriangle/package.json b/components/lib/icons/exclamationtriangle/package.json
similarity index 100%
rename from components/lib/icon/exclamationtriangle/package.json
rename to components/lib/icons/exclamationtriangle/package.json
diff --git a/components/lib/icon/eye/index.d.ts b/components/lib/icons/eye/index.d.ts
similarity index 86%
rename from components/lib/icon/eye/index.d.ts
rename to components/lib/icons/eye/index.d.ts
index 84dc057d2..911a2df16 100644
--- a/components/lib/icon/eye/index.d.ts
+++ b/components/lib/icons/eye/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class EyeIcon extends Icon {}
 
diff --git a/components/lib/icon/eye/index.vue b/components/lib/icons/eye/index.vue
similarity index 100%
rename from components/lib/icon/eye/index.vue
rename to components/lib/icons/eye/index.vue
diff --git a/components/lib/icon/eye/package.json b/components/lib/icons/eye/package.json
similarity index 100%
rename from components/lib/icon/eye/package.json
rename to components/lib/icons/eye/package.json
diff --git a/components/lib/icon/eyeslash/index.d.ts b/components/lib/icons/eyeslash/index.d.ts
similarity index 86%
rename from components/lib/icon/eyeslash/index.d.ts
rename to components/lib/icons/eyeslash/index.d.ts
index 00212b06e..f69989ea7 100644
--- a/components/lib/icon/eyeslash/index.d.ts
+++ b/components/lib/icons/eyeslash/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class EyeSlashIcon extends Icon {}
 
diff --git a/components/lib/icon/eyeslash/index.vue b/components/lib/icons/eyeslash/index.vue
similarity index 100%
rename from components/lib/icon/eyeslash/index.vue
rename to components/lib/icons/eyeslash/index.vue
diff --git a/components/lib/icon/eyeslash/package.json b/components/lib/icons/eyeslash/package.json
similarity index 100%
rename from components/lib/icon/eyeslash/package.json
rename to components/lib/icons/eyeslash/package.json
diff --git a/components/lib/icon/filter/index.d.ts b/components/lib/icons/filter/index.d.ts
similarity index 86%
rename from components/lib/icon/filter/index.d.ts
rename to components/lib/icons/filter/index.d.ts
index 491b0deb8..c1dd50cc9 100644
--- a/components/lib/icon/filter/index.d.ts
+++ b/components/lib/icons/filter/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class FilterIcon extends Icon {}
 
diff --git a/components/lib/icon/filter/index.vue b/components/lib/icons/filter/index.vue
similarity index 100%
rename from components/lib/icon/filter/index.vue
rename to components/lib/icons/filter/index.vue
diff --git a/components/lib/icon/filter/package.json b/components/lib/icons/filter/package.json
similarity index 100%
rename from components/lib/icon/filter/package.json
rename to components/lib/icons/filter/package.json
diff --git a/components/lib/icon/filterslash/index.d.ts b/components/lib/icons/filterslash/index.d.ts
similarity index 87%
rename from components/lib/icon/filterslash/index.d.ts
rename to components/lib/icons/filterslash/index.d.ts
index ec55358a6..562f4fddd 100644
--- a/components/lib/icon/filterslash/index.d.ts
+++ b/components/lib/icons/filterslash/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class FilterSlashIcon extends Icon {}
 
diff --git a/components/lib/icon/filterslash/index.vue b/components/lib/icons/filterslash/index.vue
similarity index 100%
rename from components/lib/icon/filterslash/index.vue
rename to components/lib/icons/filterslash/index.vue
diff --git a/components/lib/icon/filterslash/package.json b/components/lib/icons/filterslash/package.json
similarity index 100%
rename from components/lib/icon/filterslash/package.json
rename to components/lib/icons/filterslash/package.json
diff --git a/components/lib/icon/index.d.ts b/components/lib/icons/index.d.ts
similarity index 100%
rename from components/lib/icon/index.d.ts
rename to components/lib/icons/index.d.ts
diff --git a/components/lib/icon/infocircle/index.d.ts b/components/lib/icons/infocircle/index.d.ts
similarity index 87%
rename from components/lib/icon/infocircle/index.d.ts
rename to components/lib/icons/infocircle/index.d.ts
index c3ebebdb3..246fc46f2 100644
--- a/components/lib/icon/infocircle/index.d.ts
+++ b/components/lib/icons/infocircle/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class InfoCircleIcon extends Icon {}
 
diff --git a/components/lib/icon/infocircle/index.vue b/components/lib/icons/infocircle/index.vue
similarity index 100%
rename from components/lib/icon/infocircle/index.vue
rename to components/lib/icons/infocircle/index.vue
diff --git a/components/lib/icon/infocircle/package.json b/components/lib/icons/infocircle/package.json
similarity index 100%
rename from components/lib/icon/infocircle/package.json
rename to components/lib/icons/infocircle/package.json
diff --git a/components/lib/icon/minus/index.d.ts b/components/lib/icons/minus/index.d.ts
similarity index 86%
rename from components/lib/icon/minus/index.d.ts
rename to components/lib/icons/minus/index.d.ts
index 97a20b829..72e4b222e 100644
--- a/components/lib/icon/minus/index.d.ts
+++ b/components/lib/icons/minus/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class MinusIcon extends Icon {}
 
diff --git a/components/lib/icon/minus/index.vue b/components/lib/icons/minus/index.vue
similarity index 100%
rename from components/lib/icon/minus/index.vue
rename to components/lib/icons/minus/index.vue
diff --git a/components/lib/icon/minus/package.json b/components/lib/icons/minus/package.json
similarity index 100%
rename from components/lib/icon/minus/package.json
rename to components/lib/icons/minus/package.json
diff --git a/components/lib/icon/pencil/index.d.ts b/components/lib/icons/pencil/index.d.ts
similarity index 86%
rename from components/lib/icon/pencil/index.d.ts
rename to components/lib/icons/pencil/index.d.ts
index 8dc3f0810..7d7a9b619 100644
--- a/components/lib/icon/pencil/index.d.ts
+++ b/components/lib/icons/pencil/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class PencilIcon extends Icon {}
 
diff --git a/components/lib/icon/pencil/index.vue b/components/lib/icons/pencil/index.vue
similarity index 100%
rename from components/lib/icon/pencil/index.vue
rename to components/lib/icons/pencil/index.vue
diff --git a/components/lib/icon/pencil/package.json b/components/lib/icons/pencil/package.json
similarity index 100%
rename from components/lib/icon/pencil/package.json
rename to components/lib/icons/pencil/package.json
diff --git a/components/lib/icon/plus/index.d.ts b/components/lib/icons/plus/index.d.ts
similarity index 86%
rename from components/lib/icon/plus/index.d.ts
rename to components/lib/icons/plus/index.d.ts
index baa896372..110c55c35 100644
--- a/components/lib/icon/plus/index.d.ts
+++ b/components/lib/icons/plus/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class PlusIcon extends Icon {}
 
diff --git a/components/lib/icon/plus/index.vue b/components/lib/icons/plus/index.vue
similarity index 100%
rename from components/lib/icon/plus/index.vue
rename to components/lib/icons/plus/index.vue
diff --git a/components/lib/icon/plus/package.json b/components/lib/icons/plus/package.json
similarity index 100%
rename from components/lib/icon/plus/package.json
rename to components/lib/icons/plus/package.json
diff --git a/components/lib/icon/refresh/index.d.ts b/components/lib/icons/refresh/index.d.ts
similarity index 86%
rename from components/lib/icon/refresh/index.d.ts
rename to components/lib/icons/refresh/index.d.ts
index 9df208233..af35799cb 100644
--- a/components/lib/icon/refresh/index.d.ts
+++ b/components/lib/icons/refresh/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class RefreshIcon extends Icon {}
 
diff --git a/components/lib/icon/refresh/index.vue b/components/lib/icons/refresh/index.vue
similarity index 100%
rename from components/lib/icon/refresh/index.vue
rename to components/lib/icons/refresh/index.vue
diff --git a/components/lib/icon/refresh/package.json b/components/lib/icons/refresh/package.json
similarity index 100%
rename from components/lib/icon/refresh/package.json
rename to components/lib/icons/refresh/package.json
diff --git a/components/lib/icon/search/index.d.ts b/components/lib/icons/search/index.d.ts
similarity index 86%
rename from components/lib/icon/search/index.d.ts
rename to components/lib/icons/search/index.d.ts
index 8244fae44..2016f7df6 100644
--- a/components/lib/icon/search/index.d.ts
+++ b/components/lib/icons/search/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class SearchIcon extends Icon {}
 
diff --git a/components/lib/icon/search/index.vue b/components/lib/icons/search/index.vue
similarity index 100%
rename from components/lib/icon/search/index.vue
rename to components/lib/icons/search/index.vue
diff --git a/components/lib/icon/search/package.json b/components/lib/icons/search/package.json
similarity index 100%
rename from components/lib/icon/search/package.json
rename to components/lib/icons/search/package.json
diff --git a/components/lib/icon/searchminus/index.d.ts b/components/lib/icons/searchminus/index.d.ts
similarity index 87%
rename from components/lib/icon/searchminus/index.d.ts
rename to components/lib/icons/searchminus/index.d.ts
index fdc82ecaf..1fb951b16 100644
--- a/components/lib/icon/searchminus/index.d.ts
+++ b/components/lib/icons/searchminus/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class SearchMinusIcon extends Icon {}
 
diff --git a/components/lib/icon/searchminus/index.vue b/components/lib/icons/searchminus/index.vue
similarity index 100%
rename from components/lib/icon/searchminus/index.vue
rename to components/lib/icons/searchminus/index.vue
diff --git a/components/lib/icon/searchminus/package.json b/components/lib/icons/searchminus/package.json
similarity index 100%
rename from components/lib/icon/searchminus/package.json
rename to components/lib/icons/searchminus/package.json
diff --git a/components/lib/icon/searchplus/index.d.ts b/components/lib/icons/searchplus/index.d.ts
similarity index 87%
rename from components/lib/icon/searchplus/index.d.ts
rename to components/lib/icons/searchplus/index.d.ts
index 45bb28097..27f241f06 100644
--- a/components/lib/icon/searchplus/index.d.ts
+++ b/components/lib/icons/searchplus/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class SearchPlusIcon extends Icon {}
 
diff --git a/components/lib/icon/searchplus/index.vue b/components/lib/icons/searchplus/index.vue
similarity index 100%
rename from components/lib/icon/searchplus/index.vue
rename to components/lib/icons/searchplus/index.vue
diff --git a/components/lib/icon/searchplus/package.json b/components/lib/icons/searchplus/package.json
similarity index 100%
rename from components/lib/icon/searchplus/package.json
rename to components/lib/icons/searchplus/package.json
diff --git a/components/lib/icon/sortalt/index.d.ts b/components/lib/icons/sortalt/index.d.ts
similarity index 86%
rename from components/lib/icon/sortalt/index.d.ts
rename to components/lib/icons/sortalt/index.d.ts
index 25741a5b2..46c24b5c3 100644
--- a/components/lib/icon/sortalt/index.d.ts
+++ b/components/lib/icons/sortalt/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class SortAltIcon extends Icon {}
 
diff --git a/components/lib/icon/sortalt/index.vue b/components/lib/icons/sortalt/index.vue
similarity index 100%
rename from components/lib/icon/sortalt/index.vue
rename to components/lib/icons/sortalt/index.vue
diff --git a/components/lib/icon/sortalt/package.json b/components/lib/icons/sortalt/package.json
similarity index 100%
rename from components/lib/icon/sortalt/package.json
rename to components/lib/icons/sortalt/package.json
diff --git a/components/lib/icon/sortamountdown/index.d.ts b/components/lib/icons/sortamountdown/index.d.ts
similarity index 87%
rename from components/lib/icon/sortamountdown/index.d.ts
rename to components/lib/icons/sortamountdown/index.d.ts
index 9843149d7..60ff8dc95 100644
--- a/components/lib/icon/sortamountdown/index.d.ts
+++ b/components/lib/icons/sortamountdown/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class SortAmountDownIcon extends Icon {}
 
diff --git a/components/lib/icon/sortamountdown/index.vue b/components/lib/icons/sortamountdown/index.vue
similarity index 100%
rename from components/lib/icon/sortamountdown/index.vue
rename to components/lib/icons/sortamountdown/index.vue
diff --git a/components/lib/icon/sortamountdown/package.json b/components/lib/icons/sortamountdown/package.json
similarity index 100%
rename from components/lib/icon/sortamountdown/package.json
rename to components/lib/icons/sortamountdown/package.json
diff --git a/components/lib/icon/sortamountupalt/index.d.ts b/components/lib/icons/sortamountupalt/index.d.ts
similarity index 88%
rename from components/lib/icon/sortamountupalt/index.d.ts
rename to components/lib/icons/sortamountupalt/index.d.ts
index 7b6e00136..d1747f4b9 100644
--- a/components/lib/icon/sortamountupalt/index.d.ts
+++ b/components/lib/icons/sortamountupalt/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class SortAmountUpAltIcon extends Icon {}
 
diff --git a/components/lib/icon/sortamountupalt/index.vue b/components/lib/icons/sortamountupalt/index.vue
similarity index 100%
rename from components/lib/icon/sortamountupalt/index.vue
rename to components/lib/icons/sortamountupalt/index.vue
diff --git a/components/lib/icon/sortamountupalt/package.json b/components/lib/icons/sortamountupalt/package.json
similarity index 100%
rename from components/lib/icon/sortamountupalt/package.json
rename to components/lib/icons/sortamountupalt/package.json
diff --git a/components/lib/icon/spinner/index.d.ts b/components/lib/icons/spinner/index.d.ts
similarity index 86%
rename from components/lib/icon/spinner/index.d.ts
rename to components/lib/icons/spinner/index.d.ts
index 92a4bcab9..d1b0d8ee7 100644
--- a/components/lib/icon/spinner/index.d.ts
+++ b/components/lib/icons/spinner/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class SpinnerIcon extends Icon {}
 
diff --git a/components/lib/icon/spinner/index.vue b/components/lib/icons/spinner/index.vue
similarity index 100%
rename from components/lib/icon/spinner/index.vue
rename to components/lib/icons/spinner/index.vue
diff --git a/components/lib/icon/spinner/package.json b/components/lib/icons/spinner/package.json
similarity index 100%
rename from components/lib/icon/spinner/package.json
rename to components/lib/icons/spinner/package.json
diff --git a/components/lib/icon/star/index.d.ts b/components/lib/icons/star/index.d.ts
similarity index 86%
rename from components/lib/icon/star/index.d.ts
rename to components/lib/icons/star/index.d.ts
index 228057026..ea8832dc8 100644
--- a/components/lib/icon/star/index.d.ts
+++ b/components/lib/icons/star/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class StarIcon extends Icon {}
 
diff --git a/components/lib/icon/star/index.vue b/components/lib/icons/star/index.vue
similarity index 100%
rename from components/lib/icon/star/index.vue
rename to components/lib/icons/star/index.vue
diff --git a/components/lib/icon/star/package.json b/components/lib/icons/star/package.json
similarity index 100%
rename from components/lib/icon/star/package.json
rename to components/lib/icons/star/package.json
diff --git a/components/lib/icon/starfill/index.d.ts b/components/lib/icons/starfill/index.d.ts
similarity index 86%
rename from components/lib/icon/starfill/index.d.ts
rename to components/lib/icons/starfill/index.d.ts
index 15d181f38..d9a309e8b 100644
--- a/components/lib/icon/starfill/index.d.ts
+++ b/components/lib/icons/starfill/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class StarFillIcon extends Icon {}
 
diff --git a/components/lib/icon/starfill/index.vue b/components/lib/icons/starfill/index.vue
similarity index 100%
rename from components/lib/icon/starfill/index.vue
rename to components/lib/icons/starfill/index.vue
diff --git a/components/lib/icon/starfill/package.json b/components/lib/icons/starfill/package.json
similarity index 100%
rename from components/lib/icon/starfill/package.json
rename to components/lib/icons/starfill/package.json
diff --git a/components/lib/icon/thlarge/index.d.ts b/components/lib/icons/thlarge/index.d.ts
similarity index 86%
rename from components/lib/icon/thlarge/index.d.ts
rename to components/lib/icons/thlarge/index.d.ts
index 1e4eb7541..f736f5b69 100644
--- a/components/lib/icon/thlarge/index.d.ts
+++ b/components/lib/icons/thlarge/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class ThLargeIcon extends Icon {}
 
diff --git a/components/lib/icon/thlarge/index.vue b/components/lib/icons/thlarge/index.vue
similarity index 100%
rename from components/lib/icon/thlarge/index.vue
rename to components/lib/icons/thlarge/index.vue
diff --git a/components/lib/icon/thlarge/package.json b/components/lib/icons/thlarge/package.json
similarity index 100%
rename from components/lib/icon/thlarge/package.json
rename to components/lib/icons/thlarge/package.json
diff --git a/components/lib/icon/times/index.d.ts b/components/lib/icons/times/index.d.ts
similarity index 86%
rename from components/lib/icon/times/index.d.ts
rename to components/lib/icons/times/index.d.ts
index d3c2162f2..8df622b65 100644
--- a/components/lib/icon/times/index.d.ts
+++ b/components/lib/icons/times/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class TimesIcon extends Icon {}
 
diff --git a/components/lib/icon/times/index.vue b/components/lib/icons/times/index.vue
similarity index 100%
rename from components/lib/icon/times/index.vue
rename to components/lib/icons/times/index.vue
diff --git a/components/lib/icon/times/package.json b/components/lib/icons/times/package.json
similarity index 100%
rename from components/lib/icon/times/package.json
rename to components/lib/icons/times/package.json
diff --git a/components/lib/icon/timescircle/index.d.ts b/components/lib/icons/timescircle/index.d.ts
similarity index 87%
rename from components/lib/icon/timescircle/index.d.ts
rename to components/lib/icons/timescircle/index.d.ts
index 36ff42c86..ecab9b280 100644
--- a/components/lib/icon/timescircle/index.d.ts
+++ b/components/lib/icons/timescircle/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class TimesCircleIcon extends Icon {}
 
diff --git a/components/lib/icon/timescircle/index.vue b/components/lib/icons/timescircle/index.vue
similarity index 100%
rename from components/lib/icon/timescircle/index.vue
rename to components/lib/icons/timescircle/index.vue
diff --git a/components/lib/icon/timescircle/package.json b/components/lib/icons/timescircle/package.json
similarity index 100%
rename from components/lib/icon/timescircle/package.json
rename to components/lib/icons/timescircle/package.json
diff --git a/components/lib/icon/trash/index.d.ts b/components/lib/icons/trash/index.d.ts
similarity index 86%
rename from components/lib/icon/trash/index.d.ts
rename to components/lib/icons/trash/index.d.ts
index defc7356a..3b9622fa3 100644
--- a/components/lib/icon/trash/index.d.ts
+++ b/components/lib/icons/trash/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class TrashIcon extends Icon {}
 
diff --git a/components/lib/icon/trash/index.vue b/components/lib/icons/trash/index.vue
similarity index 100%
rename from components/lib/icon/trash/index.vue
rename to components/lib/icons/trash/index.vue
diff --git a/components/lib/icon/trash/package.json b/components/lib/icons/trash/package.json
similarity index 100%
rename from components/lib/icon/trash/package.json
rename to components/lib/icons/trash/package.json
diff --git a/components/lib/icon/undo/index.d.ts b/components/lib/icons/undo/index.d.ts
similarity index 86%
rename from components/lib/icon/undo/index.d.ts
rename to components/lib/icons/undo/index.d.ts
index 379362021..30c20238e 100644
--- a/components/lib/icon/undo/index.d.ts
+++ b/components/lib/icons/undo/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class UndoIcon extends Icon {}
 
diff --git a/components/lib/icon/undo/index.vue b/components/lib/icons/undo/index.vue
similarity index 100%
rename from components/lib/icon/undo/index.vue
rename to components/lib/icons/undo/index.vue
diff --git a/components/lib/icon/undo/package.json b/components/lib/icons/undo/package.json
similarity index 100%
rename from components/lib/icon/undo/package.json
rename to components/lib/icons/undo/package.json
diff --git a/components/lib/icon/upload/index.d.ts b/components/lib/icons/upload/index.d.ts
similarity index 86%
rename from components/lib/icon/upload/index.d.ts
rename to components/lib/icons/upload/index.d.ts
index e1057669f..c1bf1b27f 100644
--- a/components/lib/icon/upload/index.d.ts
+++ b/components/lib/icons/upload/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class UploadIcon extends Icon {}
 
diff --git a/components/lib/icon/upload/index.vue b/components/lib/icons/upload/index.vue
similarity index 100%
rename from components/lib/icon/upload/index.vue
rename to components/lib/icons/upload/index.vue
diff --git a/components/lib/icon/upload/package.json b/components/lib/icons/upload/package.json
similarity index 100%
rename from components/lib/icon/upload/package.json
rename to components/lib/icons/upload/package.json
diff --git a/components/lib/icon/windowmaximize/index.d.ts b/components/lib/icons/windowmaximize/index.d.ts
similarity index 87%
rename from components/lib/icon/windowmaximize/index.d.ts
rename to components/lib/icons/windowmaximize/index.d.ts
index ac22b3937..0ff26b742 100644
--- a/components/lib/icon/windowmaximize/index.d.ts
+++ b/components/lib/icons/windowmaximize/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class WindowMaximizeIcon extends Icon {}
 
diff --git a/components/lib/icon/windowmaximize/index.vue b/components/lib/icons/windowmaximize/index.vue
similarity index 100%
rename from components/lib/icon/windowmaximize/index.vue
rename to components/lib/icons/windowmaximize/index.vue
diff --git a/components/lib/icon/windowmaximize/package.json b/components/lib/icons/windowmaximize/package.json
similarity index 100%
rename from components/lib/icon/windowmaximize/package.json
rename to components/lib/icons/windowmaximize/package.json
diff --git a/components/lib/icon/windowminimize/index.d.ts b/components/lib/icons/windowminimize/index.d.ts
similarity index 87%
rename from components/lib/icon/windowminimize/index.d.ts
rename to components/lib/icons/windowminimize/index.d.ts
index 5704adfe7..9eafc0be2 100644
--- a/components/lib/icon/windowminimize/index.d.ts
+++ b/components/lib/icons/windowminimize/index.d.ts
@@ -1,5 +1,5 @@
+import { Icon } from '../../icons/index';
 import { GlobalComponentConstructor } from '../../ts-helpers';
-import { Icon } from '../index';
 
 declare class WindowMinimizeIcon extends Icon {}
 
diff --git a/components/lib/icon/windowminimize/index.vue b/components/lib/icons/windowminimize/index.vue
similarity index 100%
rename from components/lib/icon/windowminimize/index.vue
rename to components/lib/icons/windowminimize/index.vue
diff --git a/components/lib/icon/windowminimize/package.json b/components/lib/icons/windowminimize/package.json
similarity index 100%
rename from components/lib/icon/windowminimize/package.json
rename to components/lib/icons/windowminimize/package.json
diff --git a/components/lib/image/Image.vue b/components/lib/image/Image.vue
index d59965ea6..a5562d497 100644
--- a/components/lib/image/Image.vue
+++ b/components/lib/image/Image.vue
@@ -51,12 +51,12 @@
 
 <script>
 import FocusTrap from 'primevue/focustrap';
-import EyeIcon from 'primevue/icon/eye';
-import RefreshIcon from 'primevue/icon/refresh';
-import SearchMinusIcon from 'primevue/icon/searchminus';
-import SearchPlusIcon from 'primevue/icon/searchplus';
-import TimesIcon from 'primevue/icon/times';
-import UndoIcon from 'primevue/icon/undo';
+import EyeIcon from 'primevue/icons/eye';
+import RefreshIcon from 'primevue/icons/refresh';
+import SearchMinusIcon from 'primevue/icons/searchminus';
+import SearchPlusIcon from 'primevue/icons/searchplus';
+import TimesIcon from 'primevue/icons/times';
+import UndoIcon from 'primevue/icons/undo';
 import Portal from 'primevue/portal';
 import { DomHandler, ZIndexUtils } from 'primevue/utils';
 
diff --git a/components/lib/inlinemessage/InlineMessage.vue b/components/lib/inlinemessage/InlineMessage.vue
index b4a839d0e..03a9abf1e 100755
--- a/components/lib/inlinemessage/InlineMessage.vue
+++ b/components/lib/inlinemessage/InlineMessage.vue
@@ -8,10 +8,10 @@
 </template>
 
 <script>
-import CheckIcon from 'primevue/icon/check';
-import ExclamationTriangleIcon from 'primevue/icon/exclamationtriangle';
-import InfoCircleIcon from 'primevue/icon/infocircle';
-import TimesCircleIcon from 'primevue/icon/timescircle';
+import CheckIcon from 'primevue/icons/check';
+import ExclamationTriangleIcon from 'primevue/icons/exclamationtriangle';
+import InfoCircleIcon from 'primevue/icons/infocircle';
+import TimesCircleIcon from 'primevue/icons/timescircle';
 
 export default {
     name: 'InlineMessage',
diff --git a/components/lib/inplace/Inplace.vue b/components/lib/inplace/Inplace.vue
index f433da704..d6a131421 100755
--- a/components/lib/inplace/Inplace.vue
+++ b/components/lib/inplace/Inplace.vue
@@ -19,7 +19,7 @@
 <script>
 import Button from 'primevue/button';
 import FocusTrap from 'primevue/focustrap';
-import TimesIcon from 'primevue/icon/times';
+import TimesIcon from 'primevue/icons/times';
 
 export default {
     name: 'Inplace',
diff --git a/components/lib/inputnumber/InputNumber.vue b/components/lib/inputnumber/InputNumber.vue
index 0e72c7924..444f9db87 100755
--- a/components/lib/inputnumber/InputNumber.vue
+++ b/components/lib/inputnumber/InputNumber.vue
@@ -60,8 +60,8 @@
 
 <script>
 import Button from 'primevue/button';
-import AngleDownIcon from 'primevue/icon/angledown';
-import AngleUpIcon from 'primevue/icon/angleup';
+import AngleDownIcon from 'primevue/icons/angledown';
+import AngleUpIcon from 'primevue/icons/angleup';
 import InputText from 'primevue/inputtext';
 import { DomHandler } from 'primevue/utils';
 
diff --git a/components/lib/listbox/Listbox.vue b/components/lib/listbox/Listbox.vue
index fb5be9f79..e95df14e7 100755
--- a/components/lib/listbox/Listbox.vue
+++ b/components/lib/listbox/Listbox.vue
@@ -98,7 +98,7 @@
 
 <script>
 import { FilterService } from 'primevue/api';
-import SearchIcon from 'primevue/icon/search';
+import SearchIcon from 'primevue/icons/search';
 import Ripple from 'primevue/ripple';
 import { DomHandler, ObjectUtils, UniqueComponentId } from 'primevue/utils';
 import VirtualScroller from 'primevue/virtualscroller';
diff --git a/components/lib/megamenu/MegaMenuSub.vue b/components/lib/megamenu/MegaMenuSub.vue
index 143b0a571..f7038cd22 100644
--- a/components/lib/megamenu/MegaMenuSub.vue
+++ b/components/lib/megamenu/MegaMenuSub.vue
@@ -66,8 +66,8 @@
 </template>
 
 <script>
-import AngleDownIcon from 'primevue/icon/angledown';
-import AngleRightIcon from 'primevue/icon/angleright';
+import AngleDownIcon from 'primevue/icons/angledown';
+import AngleRightIcon from 'primevue/icons/angleright';
 import Ripple from 'primevue/ripple';
 import { ObjectUtils } from 'primevue/utils';
 
diff --git a/components/lib/menubar/Menubar.vue b/components/lib/menubar/Menubar.vue
index 09466c067..e3507774d 100755
--- a/components/lib/menubar/Menubar.vue
+++ b/components/lib/menubar/Menubar.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import BarsIcon from 'primevue/icon/bars';
+import BarsIcon from 'primevue/icons/bars';
 import { DomHandler, ObjectUtils, UniqueComponentId, ZIndexUtils } from 'primevue/utils';
 import MenubarSub from './MenubarSub.vue';
 
diff --git a/components/lib/menubar/MenubarSub.vue b/components/lib/menubar/MenubarSub.vue
index 451e14469..cdee7fb42 100755
--- a/components/lib/menubar/MenubarSub.vue
+++ b/components/lib/menubar/MenubarSub.vue
@@ -58,8 +58,8 @@
 </template>
 
 <script>
-import AngleDownIcon from 'primevue/icon/angledown';
-import AngleRightIcon from 'primevue/icon/angleright';
+import AngleDownIcon from 'primevue/icons/angledown';
+import AngleRightIcon from 'primevue/icons/angleright';
 import Ripple from 'primevue/ripple';
 import { ObjectUtils } from 'primevue/utils';
 
diff --git a/components/lib/message/Message.vue b/components/lib/message/Message.vue
index ed1e77338..6083c6c9f 100755
--- a/components/lib/message/Message.vue
+++ b/components/lib/message/Message.vue
@@ -20,11 +20,11 @@
 </template>
 
 <script>
-import CheckIcon from 'primevue/icon/check';
-import ExclamationTriangleIcon from 'primevue/icon/exclamationtriangle';
-import InfoCircleIcon from 'primevue/icon/infocircle';
-import TimesIcon from 'primevue/icon/times';
-import TimesCircleIcon from 'primevue/icon/timescircle';
+import CheckIcon from 'primevue/icons/check';
+import ExclamationTriangleIcon from 'primevue/icons/exclamationtriangle';
+import InfoCircleIcon from 'primevue/icons/infocircle';
+import TimesIcon from 'primevue/icons/times';
+import TimesCircleIcon from 'primevue/icons/timescircle';
 import Ripple from 'primevue/ripple';
 
 export default {
diff --git a/components/lib/multiselect/MultiSelect.vue b/components/lib/multiselect/MultiSelect.vue
index b761b9649..aa88656f7 100755
--- a/components/lib/multiselect/MultiSelect.vue
+++ b/components/lib/multiselect/MultiSelect.vue
@@ -162,12 +162,12 @@
 
 <script>
 import { FilterService } from 'primevue/api';
-import CheckIcon from 'primevue/icon/check';
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import SearchIcon from 'primevue/icon/search';
-import SpinnerIcon from 'primevue/icon/spinner';
-import TimesIcon from 'primevue/icon/times';
-import TimesCircleIcon from 'primevue/icon/timescircle';
+import CheckIcon from 'primevue/icons/check';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import SearchIcon from 'primevue/icons/search';
+import SpinnerIcon from 'primevue/icons/spinner';
+import TimesIcon from 'primevue/icons/times';
+import TimesCircleIcon from 'primevue/icons/timescircle';
 import OverlayEventBus from 'primevue/overlayeventbus';
 import Portal from 'primevue/portal';
 import Ripple from 'primevue/ripple';
diff --git a/components/lib/orderlist/OrderList.vue b/components/lib/orderlist/OrderList.vue
index 55cdd92db..ecd109db5 100755
--- a/components/lib/orderlist/OrderList.vue
+++ b/components/lib/orderlist/OrderList.vue
@@ -66,10 +66,10 @@
 
 <script>
 import Button from 'primevue/button';
-import AngleDoubleDownIcon from 'primevue/icon/angledoubledown';
-import AngleDoubleUpIcon from 'primevue/icon/angledoubleup';
-import AngleDownIcon from 'primevue/icon/angledown';
-import AngleUpIcon from 'primevue/icon/angleup';
+import AngleDoubleDownIcon from 'primevue/icons/angledoubledown';
+import AngleDoubleUpIcon from 'primevue/icons/angledoubleup';
+import AngleDownIcon from 'primevue/icons/angledown';
+import AngleUpIcon from 'primevue/icons/angleup';
 import Ripple from 'primevue/ripple';
 import { DomHandler, ObjectUtils, UniqueComponentId } from 'primevue/utils';
 
diff --git a/components/lib/organizationchart/OrganizationChartNode.vue b/components/lib/organizationchart/OrganizationChartNode.vue
index b7b1ef0ff..0f092bd70 100755
--- a/components/lib/organizationchart/OrganizationChartNode.vue
+++ b/components/lib/organizationchart/OrganizationChartNode.vue
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import ChevronUpIcon from 'primevue/icon/chevronup';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import ChevronUpIcon from 'primevue/icons/chevronup';
 import { DomHandler } from 'primevue/utils';
 
 export default {
diff --git a/components/lib/overlaypanel/OverlayPanel.vue b/components/lib/overlaypanel/OverlayPanel.vue
index 7112a3366..12cd78cf7 100755
--- a/components/lib/overlaypanel/OverlayPanel.vue
+++ b/components/lib/overlaypanel/OverlayPanel.vue
@@ -17,7 +17,7 @@
 
 <script>
 import FocusTrap from 'primevue/focustrap';
-import TimesIcon from 'primevue/icon/times';
+import TimesIcon from 'primevue/icons/times';
 import OverlayEventBus from 'primevue/overlayeventbus';
 import Portal from 'primevue/portal';
 import Ripple from 'primevue/ripple';
diff --git a/components/lib/paginator/FirstPageLink.vue b/components/lib/paginator/FirstPageLink.vue
index 3616fc185..5b681b902 100755
--- a/components/lib/paginator/FirstPageLink.vue
+++ b/components/lib/paginator/FirstPageLink.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import AngleDoubleLeftIcon from 'primevue/icon/angledoubleleft';
+import AngleDoubleLeftIcon from 'primevue/icons/angledoubleleft';
 import Ripple from 'primevue/ripple';
 
 export default {
diff --git a/components/lib/paginator/LastPageLink.vue b/components/lib/paginator/LastPageLink.vue
index 72ae25317..befc00ce7 100755
--- a/components/lib/paginator/LastPageLink.vue
+++ b/components/lib/paginator/LastPageLink.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import AngleDoubleRightIcon from 'primevue/icon/angledoubleright';
+import AngleDoubleRightIcon from 'primevue/icons/angledoubleright';
 import Ripple from 'primevue/ripple';
 
 export default {
diff --git a/components/lib/paginator/NextPageLink.vue b/components/lib/paginator/NextPageLink.vue
index c260f9fda..f5cfc2d8e 100755
--- a/components/lib/paginator/NextPageLink.vue
+++ b/components/lib/paginator/NextPageLink.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import AngleRightIcon from 'primevue/icon/angleright';
+import AngleRightIcon from 'primevue/icons/angleright';
 import Ripple from 'primevue/ripple';
 
 export default {
diff --git a/components/lib/paginator/PrevPageLink.vue b/components/lib/paginator/PrevPageLink.vue
index 86d101abf..61f4ac3b3 100755
--- a/components/lib/paginator/PrevPageLink.vue
+++ b/components/lib/paginator/PrevPageLink.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import AngleLeftIcon from 'primevue/icon/angleleft';
+import AngleLeftIcon from 'primevue/icons/angleleft';
 import Ripple from 'primevue/ripple';
 
 export default {
diff --git a/components/lib/panel/Panel.vue b/components/lib/panel/Panel.vue
index b73f4050a..0e7bd2a5f 100755
--- a/components/lib/panel/Panel.vue
+++ b/components/lib/panel/Panel.vue
@@ -41,8 +41,8 @@
 
 <script>
 import BaseComponent from 'primevue/basecomponent';
-import MinusIcon from 'primevue/icon/minus';
-import PlusIcon from 'primevue/icon/plus';
+import MinusIcon from 'primevue/icons/minus';
+import PlusIcon from 'primevue/icons/plus';
 import Ripple from 'primevue/ripple';
 import { UniqueComponentId } from 'primevue/utils';
 
diff --git a/components/lib/panelmenu/PanelMenu.vue b/components/lib/panelmenu/PanelMenu.vue
index 615fb8ee9..63e913660 100644
--- a/components/lib/panelmenu/PanelMenu.vue
+++ b/components/lib/panelmenu/PanelMenu.vue
@@ -48,8 +48,8 @@
 </template>
 
 <script>
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import ChevronRightIcon from 'primevue/icon/chevronright';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import ChevronRightIcon from 'primevue/icons/chevronright';
 import { DomHandler, ObjectUtils, UniqueComponentId } from 'primevue/utils';
 import PanelMenuList from './PanelMenuList.vue';
 
diff --git a/components/lib/panelmenu/PanelMenuSub.vue b/components/lib/panelmenu/PanelMenuSub.vue
index 3c84b2bbc..d843a4010 100755
--- a/components/lib/panelmenu/PanelMenuSub.vue
+++ b/components/lib/panelmenu/PanelMenuSub.vue
@@ -58,8 +58,8 @@
 </template>
 
 <script>
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import ChevronRightIcon from 'primevue/icon/chevronright';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import ChevronRightIcon from 'primevue/icons/chevronright';
 import Ripple from 'primevue/ripple';
 import { ObjectUtils } from 'primevue/utils';
 
diff --git a/components/lib/password/Password.vue b/components/lib/password/Password.vue
index bdf0ee63d..fa06792fc 100755
--- a/components/lib/password/Password.vue
+++ b/components/lib/password/Password.vue
@@ -48,8 +48,8 @@
 </template>
 
 <script>
-import EyeIcon from 'primevue/icon/eye';
-import EyeSlashIcon from 'primevue/icon/eyeslash';
+import EyeIcon from 'primevue/icons/eye';
+import EyeSlashIcon from 'primevue/icons/eyeslash';
 import InputText from 'primevue/inputtext';
 import OverlayEventBus from 'primevue/overlayeventbus';
 import Portal from 'primevue/portal';
diff --git a/components/lib/picklist/PickList.vue b/components/lib/picklist/PickList.vue
index b9670f86f..1a81b3727 100755
--- a/components/lib/picklist/PickList.vue
+++ b/components/lib/picklist/PickList.vue
@@ -176,14 +176,14 @@
 
 <script>
 import Button from 'primevue/button';
-import AngleDoubleDownIcon from 'primevue/icon/angledoubledown';
-import AngleDoubleLeftIcon from 'primevue/icon/angledoubleleft';
-import AngleDoubleRightIcon from 'primevue/icon/angledoubleright';
-import AngleDoubleUpIcon from 'primevue/icon/angledoubleup';
-import AngleDownIcon from 'primevue/icon/angledown';
-import AngleLeftIcon from 'primevue/icon/angleleft';
-import AngleRightIcon from 'primevue/icon/angleright';
-import AngleUpIcon from 'primevue/icon/angleup';
+import AngleDoubleDownIcon from 'primevue/icons/angledoubledown';
+import AngleDoubleLeftIcon from 'primevue/icons/angledoubleleft';
+import AngleDoubleRightIcon from 'primevue/icons/angledoubleright';
+import AngleDoubleUpIcon from 'primevue/icons/angledoubleup';
+import AngleDownIcon from 'primevue/icons/angledown';
+import AngleLeftIcon from 'primevue/icons/angleleft';
+import AngleRightIcon from 'primevue/icons/angleright';
+import AngleUpIcon from 'primevue/icons/angleup';
 import Ripple from 'primevue/ripple';
 import { DomHandler, ObjectUtils, UniqueComponentId } from 'primevue/utils';
 
diff --git a/components/lib/rating/Rating.vue b/components/lib/rating/Rating.vue
index d9ba5034a..87260d0f1 100755
--- a/components/lib/rating/Rating.vue
+++ b/components/lib/rating/Rating.vue
@@ -36,9 +36,9 @@
 </template>
 
 <script>
-import BanIcon from 'primevue/icon/ban';
-import StarIcon from 'primevue/icon/star';
-import StarFillIcon from 'primevue/icon/starfill';
+import BanIcon from 'primevue/icons/ban';
+import StarIcon from 'primevue/icons/star';
+import StarFillIcon from 'primevue/icons/starfill';
 import { DomHandler, UniqueComponentId } from 'primevue/utils';
 
 export default {
diff --git a/components/lib/scrolltop/ScrollTop.vue b/components/lib/scrolltop/ScrollTop.vue
index 63a150771..b4aae9c96 100644
--- a/components/lib/scrolltop/ScrollTop.vue
+++ b/components/lib/scrolltop/ScrollTop.vue
@@ -9,8 +9,8 @@
 </template>
 
 <script>
+import ChevronUpIcon from 'primevue/icons/chevronup';
 import { DomHandler, ZIndexUtils } from 'primevue/utils';
-import ChevronUpIcon from 'primevue/icon/chevronup';
 export default {
     name: 'ScrollTop',
     scrollListener: null,
diff --git a/components/lib/sidebar/Sidebar.vue b/components/lib/sidebar/Sidebar.vue
index 046f71e2d..117ca7708 100755
--- a/components/lib/sidebar/Sidebar.vue
+++ b/components/lib/sidebar/Sidebar.vue
@@ -24,7 +24,7 @@
 
 <script>
 import FocusTrap from 'primevue/focustrap';
-import TimesIcon from 'primevue/icon/times';
+import TimesIcon from 'primevue/icons/times';
 import Portal from 'primevue/portal';
 import Ripple from 'primevue/ripple';
 import { DomHandler, ZIndexUtils } from 'primevue/utils';
diff --git a/components/lib/speeddial/SpeedDial.vue b/components/lib/speeddial/SpeedDial.vue
index 8de4d2c1d..3e65dfb93 100644
--- a/components/lib/speeddial/SpeedDial.vue
+++ b/components/lib/speeddial/SpeedDial.vue
@@ -51,7 +51,7 @@
 
 <script>
 import Button from 'primevue/button';
-import PlusIcon from 'primevue/icon/plus';
+import PlusIcon from 'primevue/icons/plus';
 import Ripple from 'primevue/ripple';
 import Tooltip from 'primevue/tooltip';
 import { DomHandler, UniqueComponentId } from 'primevue/utils';
diff --git a/components/lib/splitbutton/SplitButton.vue b/components/lib/splitbutton/SplitButton.vue
index e01248055..662094d66 100755
--- a/components/lib/splitbutton/SplitButton.vue
+++ b/components/lib/splitbutton/SplitButton.vue
@@ -33,7 +33,7 @@
 
 <script>
 import Button from 'primevue/button';
-import ChevronDownIcon from 'primevue/icon/chevrondown';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
 import TieredMenu from 'primevue/tieredmenu';
 import { UniqueComponentId } from 'primevue/utils';
 
diff --git a/components/lib/tabview/TabView.vue b/components/lib/tabview/TabView.vue
index cd8e154e7..eeb3cb0e8 100755
--- a/components/lib/tabview/TabView.vue
+++ b/components/lib/tabview/TabView.vue
@@ -83,8 +83,8 @@
 
 <script>
 import BaseComponent from 'primevue/basecomponent';
-import ChevronLeftIcon from 'primevue/icon/chevronleft';
-import ChevronRightIcon from 'primevue/icon/chevronright';
+import ChevronLeftIcon from 'primevue/icons/chevronleft';
+import ChevronRightIcon from 'primevue/icons/chevronright';
 import Ripple from 'primevue/ripple';
 import { DomHandler, UniqueComponentId } from 'primevue/utils';
 
diff --git a/components/lib/tieredmenu/TieredMenuSub.vue b/components/lib/tieredmenu/TieredMenuSub.vue
index 8d51ef64a..991fe1c0b 100755
--- a/components/lib/tieredmenu/TieredMenuSub.vue
+++ b/components/lib/tieredmenu/TieredMenuSub.vue
@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import AngleRightIcon from 'primevue/icon/angleright';
+import AngleRightIcon from 'primevue/icons/angleright';
 import Ripple from 'primevue/ripple';
 import { ObjectUtils } from 'primevue/utils';
 
diff --git a/components/lib/toast/ToastMessage.vue b/components/lib/toast/ToastMessage.vue
index 8bf373891..e494a2381 100755
--- a/components/lib/toast/ToastMessage.vue
+++ b/components/lib/toast/ToastMessage.vue
@@ -19,11 +19,11 @@
 </template>
 
 <script>
-import CheckIcon from 'primevue/icon/check';
-import ExclamationTriangleIcon from 'primevue/icon/exclamationtriangle';
-import InfoCircleIcon from 'primevue/icon/infocircle';
-import TimesIcon from 'primevue/icon/times';
-import TimesCircleIcon from 'primevue/icon/timescircle';
+import CheckIcon from 'primevue/icons/check';
+import ExclamationTriangleIcon from 'primevue/icons/exclamationtriangle';
+import InfoCircleIcon from 'primevue/icons/infocircle';
+import TimesIcon from 'primevue/icons/times';
+import TimesCircleIcon from 'primevue/icons/timescircle';
 import Ripple from 'primevue/ripple';
 
 export default {
diff --git a/components/lib/tree/Tree.vue b/components/lib/tree/Tree.vue
index 5b350a9bb..3ffebfb9c 100755
--- a/components/lib/tree/Tree.vue
+++ b/components/lib/tree/Tree.vue
@@ -36,8 +36,8 @@
 </template>
 
 <script>
-import SearchIcon from 'primevue/icon/search';
-import SpinnerIcon from 'primevue/icon/spinner';
+import SearchIcon from 'primevue/icons/search';
+import SpinnerIcon from 'primevue/icons/spinner';
 import { ObjectUtils } from 'primevue/utils';
 import TreeNode from './TreeNode.vue';
 
diff --git a/components/lib/tree/TreeNode.vue b/components/lib/tree/TreeNode.vue
index cc3cf81fc..5ae415eb5 100755
--- a/components/lib/tree/TreeNode.vue
+++ b/components/lib/tree/TreeNode.vue
@@ -50,10 +50,10 @@
 </template>
 
 <script>
-import CheckIcon from 'primevue/icon/check';
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import ChevronRightIcon from 'primevue/icon/chevronright';
-import MinusIcon from 'primevue/icon/minus';
+import CheckIcon from 'primevue/icons/check';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import ChevronRightIcon from 'primevue/icons/chevronright';
+import MinusIcon from 'primevue/icons/minus';
 import Ripple from 'primevue/ripple';
 import { DomHandler } from 'primevue/utils';
 
diff --git a/components/lib/treeselect/TreeSelect.vue b/components/lib/treeselect/TreeSelect.vue
index 260fab955..8e0ed80f2 100644
--- a/components/lib/treeselect/TreeSelect.vue
+++ b/components/lib/treeselect/TreeSelect.vue
@@ -82,7 +82,7 @@
 </template>
 
 <script>
-import ChevronDownIcon from 'primevue/icon/chevrondown';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
 import OverlayEventBus from 'primevue/overlayeventbus';
 import Portal from 'primevue/portal';
 import Ripple from 'primevue/ripple';
diff --git a/components/lib/treetable/BodyCell.vue b/components/lib/treetable/BodyCell.vue
index 37292c518..d4aacdd23 100644
--- a/components/lib/treetable/BodyCell.vue
+++ b/components/lib/treetable/BodyCell.vue
@@ -22,10 +22,10 @@
 </template>
 
 <script>
-import CheckIcon from 'primevue/icon/check';
-import ChevronDownIcon from 'primevue/icon/chevrondown';
-import ChevronRightIcon from 'primevue/icon/chevronright';
-import MinusIcon from 'primevue/icon/minus';
+import CheckIcon from 'primevue/icons/check';
+import ChevronDownIcon from 'primevue/icons/chevrondown';
+import ChevronRightIcon from 'primevue/icons/chevronright';
+import MinusIcon from 'primevue/icons/minus';
 import Ripple from 'primevue/ripple';
 import { DomHandler, ObjectUtils } from 'primevue/utils';
 
diff --git a/components/lib/treetable/HeaderCell.vue b/components/lib/treetable/HeaderCell.vue
index cb9b2d084..b64e3372d 100644
--- a/components/lib/treetable/HeaderCell.vue
+++ b/components/lib/treetable/HeaderCell.vue
@@ -11,9 +11,9 @@
 </template>
 
 <script>
-import SortAltIcon from 'primevue/icon/sortalt';
-import SortAmountDownIcon from 'primevue/icon/sortamountdown';
-import SortAmountUpAltIcon from 'primevue/icon/sortamountupalt';
+import SortAltIcon from 'primevue/icons/sortalt';
+import SortAmountDownIcon from 'primevue/icons/sortamountdown';
+import SortAmountUpAltIcon from 'primevue/icons/sortamountupalt';
 import { DomHandler, ObjectUtils } from 'primevue/utils';
 
 export default {
diff --git a/components/lib/treetable/TreeTable.vue b/components/lib/treetable/TreeTable.vue
index 6f39ed22d..36d8fea4b 100755
--- a/components/lib/treetable/TreeTable.vue
+++ b/components/lib/treetable/TreeTable.vue
@@ -145,7 +145,7 @@
 
 <script>
 import { FilterService } from 'primevue/api';
-import SpinnerIcon from 'primevue/icon/spinner';
+import SpinnerIcon from 'primevue/icons/spinner';
 import Paginator from 'primevue/paginator';
 import { DomHandler, ObjectUtils } from 'primevue/utils';
 import FooterCell from './FooterCell.vue';
diff --git a/components/lib/tristatecheckbox/TriStateCheckbox.vue b/components/lib/tristatecheckbox/TriStateCheckbox.vue
index cc99e5bb8..dbf49ee06 100755
--- a/components/lib/tristatecheckbox/TriStateCheckbox.vue
+++ b/components/lib/tristatecheckbox/TriStateCheckbox.vue
@@ -32,8 +32,8 @@
 </template>
 
 <script>
-import CheckIcon from 'primevue/icon/check';
-import TimesIcon from 'primevue/icon/times';
+import CheckIcon from 'primevue/icons/check';
+import TimesIcon from 'primevue/icons/times';
 
 export default {
     name: 'TriStateCheckbox',
diff --git a/components/lib/virtualscroller/VirtualScroller.vue b/components/lib/virtualscroller/VirtualScroller.vue
index 259d45927..0052631ba 100644
--- a/components/lib/virtualscroller/VirtualScroller.vue
+++ b/components/lib/virtualscroller/VirtualScroller.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-import SpinnerIcon from 'primevue/icon/spinner';
+import SpinnerIcon from 'primevue/icons/spinner';
 import { DomHandler } from 'primevue/utils';
 
 export default {
diff --git a/rollup.config.js b/rollup.config.js
index bf319c227..12fee63ad 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -11,51 +11,51 @@ let core = {};
 
 let coreIconDependencies = {
     'primevue/baseicon': 'primevue.baseicon',
-    'primevue/icon/angledoubledown': 'primevue.icon.angledoubledown',
-    'primevue/icon/angledoubleleft': 'primevue.icon.angledoubleleft',
-    'primevue/icon/angledoubleright': 'primevue.icon.angledoubleright',
-    'primevue/icon/angledoubleup': 'primevue.icon.angledoubleup',
-    'primevue/icon/angledown': 'primevue.icon.angledown',
-    'primevue/icon/angleleft': 'primevue.icon.angleleft',
-    'primevue/icon/angleright': 'primevue.icon.angleright',
-    'primevue/icon/angleup': 'primevue.icon.angleup',
-    'primevue/icon/arrowdown': 'primevue.icon.arrowdown',
-    'primevue/icon/arrowup': 'primevue.icon.arrowup',
-    'primevue/icon/ban': 'primevue.icon.ban',
-    'primevue/icon/bars': 'primevue.icon.bars',
-    'primevue/icon/calendar': 'primevue.icon.calendar',
-    'primevue/icon/check': 'primevue.icon.check',
-    'primevue/icon/chevrondown': 'primevue.icon.chevrondown',
-    'primevue/icon/chevronleft': 'primevue.icon.chevronleft',
-    'primevue/icon/chevronright': 'primevue.icon.chevronright',
-    'primevue/icon/chevronup': 'primevue.icon.chevronup',
-    'primevue/icon/exclamationtriangle': 'primevue.icon.exclamationtriangle',
-    'primevue/icon/eye': 'primevue.icon.eye',
-    'primevue/icon/eyeslash': 'primevue.icon.eyeslash',
-    'primevue/icon/filter': 'primevue.icon.filter',
-    'primevue/icon/filterslash': 'primevue.icon.filterslash',
-    'primevue/icon/infocircle': 'primevue.icon.infocircle',
-    'primevue/icon/minus': 'primevue.icon.minus',
-    'primevue/icon/pencil': 'primevue.icon.pencil',
-    'primevue/icon/plus': 'primevue.icon.plus',
-    'primevue/icon/refresh': 'primevue.icon.refresh',
-    'primevue/icon/search': 'primevue.icon.search',
-    'primevue/icon/searchminus': 'primevue.icon.searchminus',
-    'primevue/icon/searchplus': 'primevue.icon.searchplus',
-    'primevue/icon/sortalt': 'primevue.icon.sortalt',
-    'primevue/icon/sortamountdown': 'primevue.icon.sortamountdown',
-    'primevue/icon/sortamountupalt': 'primevue.icon.sortamountupalt',
-    'primevue/icon/spinner': 'primevue.icon.spinner',
-    'primevue/icon/star': 'primevue.icon.star',
-    'primevue/icon/starfill': 'primevue.icon.starfill',
-    'primevue/icon/thlarge': 'primevue.icon.thlarge',
-    'primevue/icon/times': 'primevue.icon.times',
-    'primevue/icon/timescircle': 'primevue.icon.timescircle',
-    'primevue/icon/trash': 'primevue.icon.trash',
-    'primevue/icon/undo': 'primevue.icon.undo',
-    'primevue/icon/upload': 'primevue.icon.upload',
-    'primevue/icon/windowmaximize': 'primevue.icon.windowmaximize',
-    'primevue/icon/windowminimize': 'primevue.icon.windowminimize'
+    'primevue/icons/angledoubledown': 'primevue.icons.angledoubledown',
+    'primevue/icons/angledoubleleft': 'primevue.icons.angledoubleleft',
+    'primevue/icons/angledoubleright': 'primevue.icons.angledoubleright',
+    'primevue/icons/angledoubleup': 'primevue.icons.angledoubleup',
+    'primevue/icons/angledown': 'primevue.icons.angledown',
+    'primevue/icons/angleleft': 'primevue.icons.angleleft',
+    'primevue/icons/angleright': 'primevue.icons.angleright',
+    'primevue/icons/angleup': 'primevue.icons.angleup',
+    'primevue/icons/arrowdown': 'primevue.icons.arrowdown',
+    'primevue/icons/arrowup': 'primevue.icons.arrowup',
+    'primevue/icons/ban': 'primevue.icons.ban',
+    'primevue/icons/bars': 'primevue.icons.bars',
+    'primevue/icons/calendar': 'primevue.icons.calendar',
+    'primevue/icons/check': 'primevue.icons.check',
+    'primevue/icons/chevrondown': 'primevue.icons.chevrondown',
+    'primevue/icons/chevronleft': 'primevue.icons.chevronleft',
+    'primevue/icons/chevronright': 'primevue.icons.chevronright',
+    'primevue/icons/chevronup': 'primevue.icons.chevronup',
+    'primevue/icons/exclamationtriangle': 'primevue.icons.exclamationtriangle',
+    'primevue/icons/eye': 'primevue.icons.eye',
+    'primevue/icons/eyeslash': 'primevue.icons.eyeslash',
+    'primevue/icons/filter': 'primevue.icons.filter',
+    'primevue/icons/filterslash': 'primevue.icons.filterslash',
+    'primevue/icons/infocircle': 'primevue.icons.infocircle',
+    'primevue/icons/minus': 'primevue.icons.minus',
+    'primevue/icons/pencil': 'primevue.icons.pencil',
+    'primevue/icons/plus': 'primevue.icons.plus',
+    'primevue/icons/refresh': 'primevue.icons.refresh',
+    'primevue/icons/search': 'primevue.icons.search',
+    'primevue/icons/searchminus': 'primevue.icons.searchminus',
+    'primevue/icons/searchplus': 'primevue.icons.searchplus',
+    'primevue/icons/sortalt': 'primevue.icons.sortalt',
+    'primevue/icons/sortamountdown': 'primevue.icons.sortamountdown',
+    'primevue/icons/sortamountupalt': 'primevue.icons.sortamountupalt',
+    'primevue/icons/spinner': 'primevue.icons.spinner',
+    'primevue/icons/star': 'primevue.icons.star',
+    'primevue/icons/starfill': 'primevue.icons.starfill',
+    'primevue/icons/thlarge': 'primevue.icons.thlarge',
+    'primevue/icons/times': 'primevue.icons.times',
+    'primevue/icons/timescircle': 'primevue.icons.timescircle',
+    'primevue/icons/trash': 'primevue.icons.trash',
+    'primevue/icons/undo': 'primevue.icons.undo',
+    'primevue/icons/upload': 'primevue.icons.upload',
+    'primevue/icons/windowmaximize': 'primevue.icons.windowmaximize',
+    'primevue/icons/windowminimize': 'primevue.icons.windowminimize'
 };
 
 let coreDependencies = {
@@ -205,10 +205,10 @@ function addSFC() {
 }
 
 function addIcon() {
-    fs.readdirSync(path.resolve(__dirname, './components/lib/icon'), { withFileTypes: true })
+    fs.readdirSync(path.resolve(__dirname, './components/lib/icons'), { withFileTypes: true })
         .filter((dir) => dir.isDirectory())
         .forEach(({ name: folderName }) => {
-            fs.readdirSync(path.resolve(__dirname, './components/lib/icon/' + folderName)).forEach((file) => {
+            fs.readdirSync(path.resolve(__dirname, './components/lib/icons/' + folderName)).forEach((file) => {
                 if (/\.vue$/.test(file)) {
                     addEntry('icon/' + folderName, 'index.vue', 'index');
                 }
diff --git a/vite.config.js b/vite.config.js
index 4109fb795..1f804586d 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -14,51 +14,51 @@ export default {
             'primevue/portal': path.resolve(__dirname, './components/lib/portal/Portal.vue'),
             'primevue/basecomponent': path.resolve(__dirname, './components/lib/basecomponent/BaseComponent.vue'),
             'primevue/baseicon': path.resolve(__dirname, './components/lib/baseicon/BaseIcon.vue'),
-            'primevue/icon/angledoubledown': path.resolve(__dirname, './components/lib/icon/angledoubledown/index.vue'),
-            'primevue/icon/angledoubleleft': path.resolve(__dirname, './components/lib/icon/angledoubleleft/index.vue'),
-            'primevue/icon/angledoubleright': path.resolve(__dirname, './components/lib/icon/angledoubleright/index.vue'),
-            'primevue/icon/angledoubleup': path.resolve(__dirname, './components/lib/icon/angledoubleup/index.vue'),
-            'primevue/icon/angledown': path.resolve(__dirname, './components/lib/icon/angledown/index.vue'),
-            'primevue/icon/angleleft': path.resolve(__dirname, './components/lib/icon/angleleft/index.vue'),
-            'primevue/icon/angleright': path.resolve(__dirname, './components/lib/icon/angleright/index.vue'),
-            'primevue/icon/angleup': path.resolve(__dirname, './components/lib/icon/angleup/index.vue'),
-            'primevue/icon/arrowdown': path.resolve(__dirname, './components/lib/icon/arrowdown/index.vue'),
-            'primevue/icon/arrowup': path.resolve(__dirname, './components/lib/icon/arrowup/index.vue'),
-            'primevue/icon/ban': path.resolve(__dirname, './components/lib/icon/ban/index.vue'),
-            'primevue/icon/bars': path.resolve(__dirname, './components/lib/icon/bars/index.vue'),
-            'primevue/icon/calendar': path.resolve(__dirname, './components/lib/icon/calendar/index.vue'),
-            'primevue/icon/check': path.resolve(__dirname, './components/lib/icon/check/index.vue'),
-            'primevue/icon/chevrondown': path.resolve(__dirname, './components/lib/icon/chevrondown/index.vue'),
-            'primevue/icon/chevronleft': path.resolve(__dirname, './components/lib/icon/chevronleft/index.vue'),
-            'primevue/icon/chevronright': path.resolve(__dirname, './components/lib/icon/chevronright/index.vue'),
-            'primevue/icon/chevronup': path.resolve(__dirname, './components/lib/icon/chevronup/index.vue'),
-            'primevue/icon/exclamationtriangle': path.resolve(__dirname, './components/lib/icon/exclamationtriangle/index.vue'),
-            'primevue/icon/eye': path.resolve(__dirname, './components/lib/icon/eye/index.vue'),
-            'primevue/icon/eyeslash': path.resolve(__dirname, './components/lib/icon/eyeslash/index.vue'),
-            'primevue/icon/filter': path.resolve(__dirname, './components/lib/icon/filter/index.vue'),
-            'primevue/icon/filterslash': path.resolve(__dirname, './components/lib/icon/filterslash/index.vue'),
-            'primevue/icon/infocircle': path.resolve(__dirname, './components/lib/icon/infocircle/index.vue'),
-            'primevue/icon/minus': path.resolve(__dirname, './components/lib/icon/minus/index.vue'),
-            'primevue/icon/pencil': path.resolve(__dirname, './components/lib/icon/pencil/index.vue'),
-            'primevue/icon/plus': path.resolve(__dirname, './components/lib/icon/plus/index.vue'),
-            'primevue/icon/refresh': path.resolve(__dirname, './components/lib/icon/refresh/index.vue'),
-            'primevue/icon/search': path.resolve(__dirname, './components/lib/icon/search/index.vue'),
-            'primevue/icon/searchminus': path.resolve(__dirname, './components/lib/icon/searchminus/index.vue'),
-            'primevue/icon/searchplus': path.resolve(__dirname, './components/lib/icon/searchplus/index.vue'),
-            'primevue/icon/sortalt': path.resolve(__dirname, './components/lib/icon/sortalt/index.vue'),
-            'primevue/icon/sortamountdown': path.resolve(__dirname, './components/lib/icon/sortamountdown/index.vue'),
-            'primevue/icon/sortamountupalt': path.resolve(__dirname, './components/lib/icon/sortamountupalt/index.vue'),
-            'primevue/icon/spinner': path.resolve(__dirname, './components/lib/icon/spinner/index.vue'),
-            'primevue/icon/star': path.resolve(__dirname, './components/lib/icon/star/index.vue'),
-            'primevue/icon/starfill': path.resolve(__dirname, './components/lib/icon/starfill/index.vue'),
-            'primevue/icon/thlarge': path.resolve(__dirname, './components/lib/icon/thlarge/index.vue'),
-            'primevue/icon/times': path.resolve(__dirname, './components/lib/icon/times/index.vue'),
-            'primevue/icon/timescircle': path.resolve(__dirname, './components/lib/icon/timescircle/index.vue'),
-            'primevue/icon/trash': path.resolve(__dirname, './components/lib/icon/trash/index.vue'),
-            'primevue/icon/undo': path.resolve(__dirname, './components/lib/icon/undo/index.vue'),
-            'primevue/icon/upload': path.resolve(__dirname, './components/lib/icon/upload/index.vue'),
-            'primevue/icon/windowmaximize': path.resolve(__dirname, './components/lib/icon/windowmaximize/index.vue'),
-            'primevue/icon/windowminimize': path.resolve(__dirname, './components/lib/icon/windowminimize/index.vue'),
+            'primevue/icons/angledoubledown': path.resolve(__dirname, './components/lib/icons/angledoubledown/index.vue'),
+            'primevue/icons/angledoubleleft': path.resolve(__dirname, './components/lib/icons/angledoubleleft/index.vue'),
+            'primevue/icons/angledoubleright': path.resolve(__dirname, './components/lib/icons/angledoubleright/index.vue'),
+            'primevue/icons/angledoubleup': path.resolve(__dirname, './components/lib/icons/angledoubleup/index.vue'),
+            'primevue/icons/angledown': path.resolve(__dirname, './components/lib/icons/angledown/index.vue'),
+            'primevue/icons/angleleft': path.resolve(__dirname, './components/lib/icons/angleleft/index.vue'),
+            'primevue/icons/angleright': path.resolve(__dirname, './components/lib/icons/angleright/index.vue'),
+            'primevue/icons/angleup': path.resolve(__dirname, './components/lib/icons/angleup/index.vue'),
+            'primevue/icons/arrowdown': path.resolve(__dirname, './components/lib/icons/arrowdown/index.vue'),
+            'primevue/icons/arrowup': path.resolve(__dirname, './components/lib/icons/arrowup/index.vue'),
+            'primevue/icons/ban': path.resolve(__dirname, './components/lib/icons/ban/index.vue'),
+            'primevue/icons/bars': path.resolve(__dirname, './components/lib/icons/bars/index.vue'),
+            'primevue/icons/calendar': path.resolve(__dirname, './components/lib/icons/calendar/index.vue'),
+            'primevue/icons/check': path.resolve(__dirname, './components/lib/icons/check/index.vue'),
+            'primevue/icons/chevrondown': path.resolve(__dirname, './components/lib/icons/chevrondown/index.vue'),
+            'primevue/icons/chevronleft': path.resolve(__dirname, './components/lib/icons/chevronleft/index.vue'),
+            'primevue/icons/chevronright': path.resolve(__dirname, './components/lib/icons/chevronright/index.vue'),
+            'primevue/icons/chevronup': path.resolve(__dirname, './components/lib/icons/chevronup/index.vue'),
+            'primevue/icons/exclamationtriangle': path.resolve(__dirname, './components/lib/icons/exclamationtriangle/index.vue'),
+            'primevue/icons/eye': path.resolve(__dirname, './components/lib/icons/eye/index.vue'),
+            'primevue/icons/eyeslash': path.resolve(__dirname, './components/lib/icons/eyeslash/index.vue'),
+            'primevue/icons/filter': path.resolve(__dirname, './components/lib/icons/filter/index.vue'),
+            'primevue/icons/filterslash': path.resolve(__dirname, './components/lib/icons/filterslash/index.vue'),
+            'primevue/icons/infocircle': path.resolve(__dirname, './components/lib/icons/infocircle/index.vue'),
+            'primevue/icons/minus': path.resolve(__dirname, './components/lib/icons/minus/index.vue'),
+            'primevue/icons/pencil': path.resolve(__dirname, './components/lib/icons/pencil/index.vue'),
+            'primevue/icons/plus': path.resolve(__dirname, './components/lib/icons/plus/index.vue'),
+            'primevue/icons/refresh': path.resolve(__dirname, './components/lib/icons/refresh/index.vue'),
+            'primevue/icons/search': path.resolve(__dirname, './components/lib/icons/search/index.vue'),
+            'primevue/icons/searchminus': path.resolve(__dirname, './components/lib/icons/searchminus/index.vue'),
+            'primevue/icons/searchplus': path.resolve(__dirname, './components/lib/icons/searchplus/index.vue'),
+            'primevue/icons/sortalt': path.resolve(__dirname, './components/lib/icons/sortalt/index.vue'),
+            'primevue/icons/sortamountdown': path.resolve(__dirname, './components/lib/icons/sortamountdown/index.vue'),
+            'primevue/icons/sortamountupalt': path.resolve(__dirname, './components/lib/icons/sortamountupalt/index.vue'),
+            'primevue/icons/spinner': path.resolve(__dirname, './components/lib/icons/spinner/index.vue'),
+            'primevue/icons/star': path.resolve(__dirname, './components/lib/icons/star/index.vue'),
+            'primevue/icons/starfill': path.resolve(__dirname, './components/lib/icons/starfill/index.vue'),
+            'primevue/icons/thlarge': path.resolve(__dirname, './components/lib/icons/thlarge/index.vue'),
+            'primevue/icons/times': path.resolve(__dirname, './components/lib/icons/times/index.vue'),
+            'primevue/icons/timescircle': path.resolve(__dirname, './components/lib/icons/timescircle/index.vue'),
+            'primevue/icons/trash': path.resolve(__dirname, './components/lib/icons/trash/index.vue'),
+            'primevue/icons/undo': path.resolve(__dirname, './components/lib/icons/undo/index.vue'),
+            'primevue/icons/upload': path.resolve(__dirname, './components/lib/icons/upload/index.vue'),
+            'primevue/icons/windowmaximize': path.resolve(__dirname, './components/lib/icons/windowmaximize/index.vue'),
+            'primevue/icons/windowminimize': path.resolve(__dirname, './components/lib/icons/windowminimize/index.vue'),
             'primevue/button': path.resolve(__dirname, './components/lib/button/Button.vue'),
             'primevue/inputtext': path.resolve(__dirname, './components/lib/inputtext/InputText.vue'),
             'primevue/dialog': path.resolve(__dirname, './components/lib/dialog/Dialog.vue'),