diff --git a/src/bundle/ui-dev/src/modules/common/icon/inculdedIcon.js b/src/bundle/ui-dev/src/modules/common/icon/inculdedIcon.js
index 16f4432fa4..7ec0ff842b 100644
--- a/src/bundle/ui-dev/src/modules/common/icon/inculdedIcon.js
+++ b/src/bundle/ui-dev/src/modules/common/icon/inculdedIcon.js
@@ -1,103 +1,135 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import About from '@ids-assets/img/icons/info-square.svg';
-import AboutInfo from '@ids-assets/img/icons/help.svg';
-import Approved from '@ids-assets/img/icons/check-circle.svg';
-import Article from '@ids-assets/img/icons/file-text.svg';
-import Back from '@ids-assets/img/icons/arrow-left.svg';
-import Blog from '@ids-assets/img/icons/app-blog.svg';
-import BlogPost from '@ids-assets/img/icons/note-blog.svg';
-import CaretDown from '@ids-assets/img/icons/arrow-chevron-down.svg';
-import CaretUp from '@ids-assets/img/icons/arrow-chevron-up.svg';
-import CircleClose from '@ids-assets/img/icons/discard-circle.svg';
-import Create from '@ids-assets/img/icons/add.svg';
-import Checkmark from '@ids-assets/img/icons/form-check.svg';
+import Add from '@ids-assets/img/icons/add.svg';
+import AlertError from '@ids-assets/img/icons/alert-error.svg';
+import AlertWarning from '@ids-assets/img/icons/alert-warning.svg';
+import AppBlog from '@ids-assets/img/icons/app-blog.svg';
+import ArrowChevronDown from '@ids-assets/img/icons/arrow-chevron-down.svg';
+import ArrowChevronUp from '@ids-assets/img/icons/arrow-chevron-up.svg';
+import ArrowExpandLeft from '@ids-assets/img/icons/arrow-expand-left.svg';
+import ArrowLeft from '@ids-assets/img/icons/arrow-left.svg';
+import ArrowRotate from '@ids-assets/img/icons/arrow-rotate.svg';
+import Calendar from '@ids-assets/img/icons/calendar.svg';
+import CheckCircle from '@ids-assets/img/icons/check-circle.svg';
 import ContentTree from '@ids-assets/img/icons/content-tree.svg';
-import Date from '@ids-assets/img/icons/calendar.svg';
 import Discard from '@ids-assets/img/icons/discard.svg';
-import Drag from '@ids-assets/img/icons/drag.svg';
+import DiscardCircle from '@ids-assets/img/icons/discard-circle.svg';
 import Download from '@ids-assets/img/icons/download.svg';
+import Drag from '@ids-assets/img/icons/drag.svg';
 import Duplicate from '@ids-assets/img/icons/duplicate.svg';
 import Edit from '@ids-assets/img/icons/edit.svg';
-import ExpandLeft from '@ids-assets/img/icons/arrow-expand-left.svg';
-import Fields from '@ids-assets/img/icons/form-input.svg';
 import File from '@ids-assets/img/icons/file.svg';
+import FileText from '@ids-assets/img/icons/file-text.svg';
 import Filters from '@ids-assets/img/icons/filters.svg';
 import Folder from '@ids-assets/img/icons/folder.svg';
-import Form from '@ids-assets/img/icons/form-check-square.svg';
-import Gallery from '@ids-assets/img/icons/image-gallery.svg';
+import FormCheck from '@ids-assets/img/icons/form-check.svg';
+import FormCheckSquare from '@ids-assets/img/icons/form-check-square.svg';
+import FormInput from '@ids-assets/img/icons/form-input.svg';
+import Help from '@ids-assets/img/icons/help.svg';
 import Image from '@ids-assets/img/icons/image.svg';
-import LandingPage from '@ids-assets/img/icons/layout-navbar.svg';
-import Notice from '@ids-assets/img/icons/alert-error.svg';
-import Options from '@ids-assets/img/icons/more.svg';
-import Place from '@ids-assets/img/icons/pin-location.svg';
+import ImageGallery from '@ids-assets/img/icons/image-gallery.svg';
+import ImageUpload from '@ids-assets/img/icons/image-upload.svg';
+import InfoCircle from '@ids-assets/img/icons/info-circle.svg';
+import InfoSquare from '@ids-assets/img/icons/info-square.svg';
+import LayoutNavbar from '@ids-assets/img/icons/layout-navbar.svg';
+import More from '@ids-assets/img/icons/more.svg';
+import NoteBlog from '@ids-assets/img/icons/note-blog.svg';
+import PinLocation from '@ids-assets/img/icons/pin-location.svg';
 import Product from '@ids-assets/img/icons/product.svg';
-import QaForm from '@ids-assets/img/icons/qa-form-check.svg';
+import QaFormCheck from '@ids-assets/img/icons/qa-form-check.svg';
 import Search from '@ids-assets/img/icons/search.svg';
-import Spinner from '@ids-assets/img/icons/arrow-rotate.svg';
-import SystemInformation from '@ids-assets/img/icons/info-circle.svg';
 import Trash from '@ids-assets/img/icons/trash.svg';
-import Video from '@ids-assets/img/icons/video-play.svg';
-import View from '@ids-assets/img/icons/visibility.svg';
-import ViewGrid from '@ids-assets/img/icons/view-grid.svg';
-import ViewList from '@ids-assets/img/icons/view-list.svg';
+import Upload from '@ids-assets/img/icons/upload.svg';
 import User from '@ids-assets/img/icons/user.svg';
 import UserGroup from '@ids-assets/img/icons/user-group.svg';
-import Upload from '@ids-assets/img/icons/upload.svg';
-import UploadImage from '@ids-assets/img/icons/image-upload.svg';
-import Warning from '@ids-assets/img/icons/alert-warning.svg';
+import VideoPlay from '@ids-assets/img/icons/video-play.svg';
+import ViewGrid from '@ids-assets/img/icons/view-grid.svg';
+import ViewList from '@ids-assets/img/icons/view-list.svg';
+import Visibility from '@ids-assets/img/icons/visibility.svg';
+
+const bcIconsMap = {
+    about: InfoSquare,
+    'about-info': Help,
+    approved: CheckCircle,
+    article: FileText,
+    back: ArrowLeft,
+    blog_post: NoteBlog,
+    blog: AppBlog,
+    'caret-down': ArrowChevronDown,
+    'caret-up': ArrowChevronUp,
+    checkmark: FormCheck,
+    'circle-close': DiscardCircle,
+    create: Add,
+    date: Calendar,
+    'expand-left': ArrowExpandLeft,
+    fields: FormInput,
+    form: FormCheckSquare,
+    gallery: ImageGallery,
+    landing_page: LayoutNavbar,
+    notice: AlertError,
+    options: More,
+    place: PinLocation,
+    'qa-form': QaFormCheck,
+    spinner: ArrowRotate,
+    'system-information': InfoCircle,
+    'upload-image': ImageUpload,
+    video: VideoPlay,
+    view: Visibility,
+    warning: AlertWarning,
+};
 
 const iconsMap = {
-    about: About,
-    'about-info': AboutInfo,
-    approved: Approved,
-    article: Article,
-    back: Back,
-    blog: Blog,
-    blog_post: BlogPost,
-    'caret-down': CaretDown,
-    'caret-up': CaretUp,
-    'circle-close': CircleClose,
-    create: Create,
-    checkmark: Checkmark,
+    ...bcIconsMap,
+    add: Add,
+    'alert-error': AlertError,
+    'alert-warning': AlertWarning,
+    'app-blog': AppBlog,
+    'arrow-chevron-down': ArrowChevronDown,
+    'arrow-chevron-up': ArrowChevronUp,
+    'arrow-expand-left': ArrowExpandLeft,
+    'arrow-left': ArrowLeft,
+    'arrow-rotate': ArrowRotate,
+    calendar: Calendar,
+    'check-circle': CheckCircle,
     'content-tree': ContentTree,
-    date: Date,
     discard: Discard,
-    drag: Drag,
+    'discard-circle': DiscardCircle,
     download: Download,
+    drag: Drag,
     duplicate: Duplicate,
-    'expand-left': ExpandLeft,
     edit: Edit,
     file: File,
+    'file-text': FileText,
     filters: Filters,
-    fields: Fields,
     folder: Folder,
-    form: Form,
-    gallery: Gallery,
+    'form-check-square': FormCheckSquare,
+    'form-check': FormCheck,
+    'form-input': FormInput,
+    help: Help,
     image: Image,
-    landing_page: LandingPage,
-    notice: Notice,
-    options: Options,
-    place: Place,
+    'image-gallery': ImageGallery,
+    'image-upload': ImageUpload,
+    'info-circle': InfoCircle,
+    'info-square': InfoSquare,
+    'layout-navbar': LayoutNavbar,
+    more: More,
+    'note-blog': NoteBlog,
+    'pin-location': PinLocation,
     product: Product,
-    'qa-form': QaForm,
+    'qa-form-check': QaFormCheck,
     search: Search,
-    spinner: Spinner,
-    'system-information': SystemInformation,
     trash: Trash,
-    video: Video,
-    view: View,
+    upload: Upload,
+    user_group: UserGroup,
+    user: User,
+    'video-play': VideoPlay,
     'view-grid': ViewGrid,
     'view-list': ViewList,
-    user: User,
-    user_group: UserGroup,
-    upload: Upload,
-    'upload-image': UploadImage,
-    warning: Warning,
+    visibility: Visibility,
 };
 
-const InculdedIcon = ({ name = 'about-info', cssClass = '', defaultIconName = 'about-info' }) => {
+const InculdedIcon = ({ name = 'help', cssClass = '', defaultIconName = 'help' }) => {
     const IconComponent = iconsMap[name] ?? iconsMap[defaultIconName];
 
     return <IconComponent className={cssClass} />;