diff --git a/custom-example/InstrumentValueIcons.qrc b/custom-example/InstrumentValueIcons.qrc
index b5c479d..7d5a381 100644
--- a/custom-example/InstrumentValueIcons.qrc
+++ b/custom-example/InstrumentValueIcons.qrc
@@ -1,301 +1,301 @@
 <RCC>
 	<qresource prefix="/InstrumentValueIcons">
-		<file alias="cheveron-outline-left.svg">../resources/InstrumentValueIcons/cheveron-outline-left.svg</file>
-		<file alias="forward.svg">../resources/InstrumentValueIcons/forward.svg</file>
-		<file alias="fast-rewind.svg">../resources/InstrumentValueIcons/fast-rewind.svg</file>
-		<file alias="zoom-in.svg">../resources/InstrumentValueIcons/zoom-in.svg</file>
-		<file alias="lock-open.svg">../resources/InstrumentValueIcons/lock-open.svg</file>
-		<file alias="bolt.svg">../resources/InstrumentValueIcons/bolt.svg</file>
-		<file alias="arrow-base-down.svg">../resources/InstrumentValueIcons/arrow-base-down.svg</file>
-		<file alias="bookmark-outline.svg">../resources/InstrumentValueIcons/bookmark-outline.svg</file>
-		<file alias="factory.svg">../resources/InstrumentValueIcons/factory.svg</file>
-		<file alias="pause-solid.svg">../resources/InstrumentValueIcons/pause-solid.svg</file>
-		<file alias="refresh.svg">../resources/InstrumentValueIcons/refresh.svg</file>
-		<file alias="airplane.svg">../resources/InstrumentValueIcons/airplane.svg</file>
-		<file alias="cheveron-outline-down.svg">../resources/InstrumentValueIcons/cheveron-outline-down.svg</file>
-		<file alias="brightness-up.svg">../resources/InstrumentValueIcons/brightness-up.svg</file>
-		<file alias="fast-forward.svg">../resources/InstrumentValueIcons/fast-forward.svg</file>
-		<file alias="user.svg">../resources/InstrumentValueIcons/user.svg</file>
-		<file alias="volume-mute.svg">../resources/InstrumentValueIcons/volume-mute.svg</file>
-		<file alias="star-full.svg">../resources/InstrumentValueIcons/star-full.svg</file>
-		<file alias="view-tile.svg">../resources/InstrumentValueIcons/view-tile.svg</file>
-		<file alias="travel-case.svg">../resources/InstrumentValueIcons/travel-case.svg</file>
-		<file alias="attachment.svg">../resources/InstrumentValueIcons/attachment.svg</file>
-		<file alias="dashboard.svg">../resources/InstrumentValueIcons/dashboard.svg</file>
-		<file alias="heart.svg">../resources/InstrumentValueIcons/heart.svg</file>
-		<file alias="reply-all.svg">../resources/InstrumentValueIcons/reply-all.svg</file>
-		<file alias="stroke-width.svg">../resources/InstrumentValueIcons/stroke-width.svg</file>
-		<file alias="user-group.svg">../resources/InstrumentValueIcons/user-group.svg</file>
-		<file alias="bookmark.svg">../resources/InstrumentValueIcons/bookmark.svg</file>
-		<file alias="pylon.svg">../resources/InstrumentValueIcons/pylon.svg</file>
-		<file alias="ticket.svg">../resources/InstrumentValueIcons/ticket.svg</file>
-		<file alias="target.svg">../resources/InstrumentValueIcons/target.svg</file>
-		<file alias="music-album.svg">../resources/InstrumentValueIcons/music-album.svg</file>
-		<file alias="travel-train.svg">../resources/InstrumentValueIcons/travel-train.svg</file>
-		<file alias="calculator.svg">../resources/InstrumentValueIcons/calculator.svg</file>
-		<file alias="play.svg">../resources/InstrumentValueIcons/play.svg</file>
-		<file alias="cheveron-left.svg">../resources/InstrumentValueIcons/cheveron-left.svg</file>
-		<file alias="view-column.svg">../resources/InstrumentValueIcons/view-column.svg</file>
-		<file alias="stethoscope.svg">../resources/InstrumentValueIcons/stethoscope.svg</file>
-		<file alias="tools copy.svg">../resources/InstrumentValueIcons/tools copy.svg</file>
+		<file alias="directions.svg">../resources/InstrumentValueIcons/directions.svg</file>
+		<file alias="announcement.svg">../resources/InstrumentValueIcons/announcement.svg</file>
+		<file alias="user-solid-square.svg">../resources/InstrumentValueIcons/user-solid-square.svg</file>
+		<file alias="shield.svg">../resources/InstrumentValueIcons/shield.svg</file>
 		<file alias="watch.svg">../resources/InstrumentValueIcons/watch.svg</file>
-		<file alias="mood-sad-solid.svg">../resources/InstrumentValueIcons/mood-sad-solid.svg</file>
-		<file alias="store-front.svg">../resources/InstrumentValueIcons/store-front.svg</file>
-		<file alias="chat-bubble-dots.svg">../resources/InstrumentValueIcons/chat-bubble-dots.svg</file>
-		<file alias="copy.svg">../resources/InstrumentValueIcons/copy.svg</file>
-		<file alias="user-add.svg">../resources/InstrumentValueIcons/user-add.svg</file>
-		<file alias="align-left.svg">../resources/InstrumentValueIcons/align-left.svg</file>
-		<file alias="format-italic.svg">../resources/InstrumentValueIcons/format-italic.svg</file>
-		<file alias="align-right.svg">../resources/InstrumentValueIcons/align-right.svg</file>
+		<file alias="share.svg">../resources/InstrumentValueIcons/share.svg</file>
+		<file alias="bookmark-outline-add.svg">../resources/InstrumentValueIcons/bookmark-outline-add.svg</file>
+		<file alias="arrow-thick-left.svg">../resources/InstrumentValueIcons/arrow-thick-left.svg</file>
+		<file alias="reload.svg">../resources/InstrumentValueIcons/reload.svg</file>
+		<file alias="badge.svg">../resources/InstrumentValueIcons/badge.svg</file>
+		<file alias="travel-walk.svg">../resources/InstrumentValueIcons/travel-walk.svg</file>
 		<file alias="cog.svg">../resources/InstrumentValueIcons/cog.svg</file>
-		<file alias="notifications.svg">../resources/InstrumentValueIcons/notifications.svg</file>
-		<file alias="arrow-simple-right.svg">../resources/InstrumentValueIcons/arrow-simple-right.svg</file>
-		<file alias="travel-bus.svg">../resources/InstrumentValueIcons/travel-bus.svg</file>
-		<file alias="inbox-download.svg">../resources/InstrumentValueIcons/inbox-download.svg</file>
-		<file alias="arrow-outline-down.svg">../resources/InstrumentValueIcons/arrow-outline-down.svg</file>
-		<file alias="document-add.svg">../resources/InstrumentValueIcons/document-add.svg</file>
-		<file alias="portfolio.svg">../resources/InstrumentValueIcons/portfolio.svg</file>
-		<file alias="chart-pie.svg">../resources/InstrumentValueIcons/chart-pie.svg</file>
-		<file alias="arrow-thin-down.svg">../resources/InstrumentValueIcons/arrow-thin-down.svg</file>
-		<file alias="folder-outline-add.svg">../resources/InstrumentValueIcons/folder-outline-add.svg</file>
+		<file alias="folder-outline.svg">../resources/InstrumentValueIcons/folder-outline.svg</file>
+		<file alias="queue.svg">../resources/InstrumentValueIcons/queue.svg</file>
+		<file alias="indent-decrease.svg">../resources/InstrumentValueIcons/indent-decrease.svg</file>
+		<file alias="menu.svg">../resources/InstrumentValueIcons/menu.svg</file>
+		<file alias="computer-laptop.svg">../resources/InstrumentValueIcons/computer-laptop.svg</file>
+		<file alias="view-column.svg">../resources/InstrumentValueIcons/view-column.svg</file>
+		<file alias="list.svg">../resources/InstrumentValueIcons/list.svg</file>
+		<file alias="question.svg">../resources/InstrumentValueIcons/question.svg</file>
+		<file alias="music-artist.svg">../resources/InstrumentValueIcons/music-artist.svg</file>
 		<file alias="playlist.svg">../resources/InstrumentValueIcons/playlist.svg</file>
-		<file alias="share-alt.svg">../resources/InstrumentValueIcons/share-alt.svg</file>
-		<file alias="dots-horizontal-double.svg">../resources/InstrumentValueIcons/dots-horizontal-double.svg</file>
-		<file alias="volume-up.svg">../resources/InstrumentValueIcons/volume-up.svg</file>
-		<file alias="map.svg">../resources/InstrumentValueIcons/map.svg</file>
-		<file alias="tuning.svg">../resources/InstrumentValueIcons/tuning.svg</file>
-		<file alias="location-shopping.svg">../resources/InstrumentValueIcons/location-shopping.svg</file>
+		<file alias="wallet.svg">../resources/InstrumentValueIcons/wallet.svg</file>
+		<file alias="bluetooth.svg">../resources/InstrumentValueIcons/bluetooth.svg</file>
 		<file alias="radar copy 2.svg">../resources/InstrumentValueIcons/radar copy 2.svg</file>
-		<file alias="step-forward.svg">../resources/InstrumentValueIcons/step-forward.svg</file>
-		<file alias="text-box.svg">../resources/InstrumentValueIcons/text-box.svg</file>
-		<file alias="border-top.svg">../resources/InstrumentValueIcons/border-top.svg</file>
-		<file alias="tablet.svg">../resources/InstrumentValueIcons/tablet.svg</file>
-		<file alias="timer.svg">../resources/InstrumentValueIcons/timer.svg</file>
-		<file alias="cheveron-outline-right.svg">../resources/InstrumentValueIcons/cheveron-outline-right.svg</file>
-		<file alias="radar.svg">../resources/InstrumentValueIcons/radar.svg</file>
-		<file alias="travel-car.svg">../resources/InstrumentValueIcons/travel-car.svg</file>
-		<file alias="battery-half.svg">../resources/InstrumentValueIcons/battery-half.svg</file>
-		<file alias="code.svg">../resources/InstrumentValueIcons/code.svg</file>
-		<file alias="cloud-upload.svg">../resources/InstrumentValueIcons/cloud-upload.svg</file>
-		<file alias="shopping-cart.svg">../resources/InstrumentValueIcons/shopping-cart.svg</file>
-		<file alias="keyboard.svg">../resources/InstrumentValueIcons/keyboard.svg</file>
-		<file alias="list-add.svg">../resources/InstrumentValueIcons/list-add.svg</file>
-		<file alias="border-bottom.svg">../resources/InstrumentValueIcons/border-bottom.svg</file>
-		<file alias="information-outline.svg">../resources/InstrumentValueIcons/information-outline.svg</file>
-		<file alias="arrow-simple-down.svg">../resources/InstrumentValueIcons/arrow-simple-down.svg</file>
-		<file alias="show-sidebar.svg">../resources/InstrumentValueIcons/show-sidebar.svg</file>
-		<file alias="computer-desktop.svg">../resources/InstrumentValueIcons/computer-desktop.svg</file>
-		<file alias="music-notes.svg">../resources/InstrumentValueIcons/music-notes.svg</file>
+		<file alias="tuning.svg">../resources/InstrumentValueIcons/tuning.svg</file>
+		<file alias="book-reference.svg">../resources/InstrumentValueIcons/book-reference.svg</file>
+		<file alias="information-solid.svg">../resources/InstrumentValueIcons/information-solid.svg</file>
+		<file alias="user-group.svg">../resources/InstrumentValueIcons/user-group.svg</file>
+		<file alias="view-hide.svg">../resources/InstrumentValueIcons/view-hide.svg</file>
+		<file alias="gift.svg">../resources/InstrumentValueIcons/gift.svg</file>
+		<file alias="pylon.svg">../resources/InstrumentValueIcons/pylon.svg</file>
+		<file alias="arrow-thin-left.svg">../resources/InstrumentValueIcons/arrow-thin-left.svg</file>
+		<file alias="pause.svg">../resources/InstrumentValueIcons/pause.svg</file>
+		<file alias="layers.svg">../resources/InstrumentValueIcons/layers.svg</file>
+		<file alias="repost.svg">../resources/InstrumentValueIcons/repost.svg</file>
+		<file alias="hand-stop.svg">../resources/InstrumentValueIcons/hand-stop.svg</file>
+		<file alias="border-horizontal.svg">../resources/InstrumentValueIcons/border-horizontal.svg</file>
 		<file alias="send.svg">../resources/InstrumentValueIcons/send.svg</file>
-		<file alias="border-left.svg">../resources/InstrumentValueIcons/border-left.svg</file>
-		<file alias="dial-pad.svg">../resources/InstrumentValueIcons/dial-pad.svg</file>
-		<file alias="arrow-simple-left.svg">../resources/InstrumentValueIcons/arrow-simple-left.svg</file>
-		<file alias="mood-sad-outline.svg">../resources/InstrumentValueIcons/mood-sad-outline.svg</file>
-		<file alias="notification.svg">../resources/InstrumentValueIcons/notification.svg</file>
-		<file alias="camera.svg">../resources/InstrumentValueIcons/camera.svg</file>
+		<file alias="beverage.svg">../resources/InstrumentValueIcons/beverage.svg</file>
+		<file alias="align-center.svg">../resources/InstrumentValueIcons/align-center.svg</file>
+		<file alias="travel-bus.svg">../resources/InstrumentValueIcons/travel-bus.svg</file>
+		<file alias="artist.svg">../resources/InstrumentValueIcons/artist.svg</file>
+		<file alias="color-palette.svg">../resources/InstrumentValueIcons/color-palette.svg</file>
 		<file alias="compose.svg">../resources/InstrumentValueIcons/compose.svg</file>
-		<file alias="location-gas-station.svg">../resources/InstrumentValueIcons/location-gas-station.svg</file>
-		<file alias="document.svg">../resources/InstrumentValueIcons/document.svg</file>
-		<file alias="inbox.svg">../resources/InstrumentValueIcons/inbox.svg</file>
-		<file alias="apparel.svg">../resources/InstrumentValueIcons/apparel.svg</file>
-		<file alias="thumbs-down.svg">../resources/InstrumentValueIcons/thumbs-down.svg</file>
-		<file alias="exclamation-solid.svg">../resources/InstrumentValueIcons/exclamation-solid.svg</file>
-		<file alias="announcement.svg">../resources/InstrumentValueIcons/announcement.svg</file>
-		<file alias="headphones.svg">../resources/InstrumentValueIcons/headphones.svg</file>
-		<file alias="conversation.svg">../resources/InstrumentValueIcons/conversation.svg</file>
-		<file alias="mouse.svg">../resources/InstrumentValueIcons/mouse.svg</file>
-		<file alias="share-01.svg">../resources/InstrumentValueIcons/share-01.svg</file>
-		<file alias="edit-pencil.svg">../resources/InstrumentValueIcons/edit-pencil.svg</file>
-		<file alias="hard-drive.svg">../resources/InstrumentValueIcons/hard-drive.svg</file>
-		<file alias="list.svg">../resources/InstrumentValueIcons/list.svg</file>
-		<file alias="indent-decrease.svg">../resources/InstrumentValueIcons/indent-decrease.svg</file>
+		<file alias="news-paper.svg">../resources/InstrumentValueIcons/news-paper.svg</file>
+		<file alias="printer.svg">../resources/InstrumentValueIcons/printer.svg</file>
+		<file alias="border-all.svg">../resources/InstrumentValueIcons/border-all.svg</file>
+		<file alias="edit-copy.svg">../resources/InstrumentValueIcons/edit-copy.svg</file>
 		<file alias="dots-horizontal-triple.svg">../resources/InstrumentValueIcons/dots-horizontal-triple.svg</file>
-		<file alias="arrow-base-up.svg">../resources/InstrumentValueIcons/arrow-base-up.svg</file>
-		<file alias="library.svg">../resources/InstrumentValueIcons/library.svg</file>
-		<file alias="browser-window-open.svg">../resources/InstrumentValueIcons/browser-window-open.svg</file>
-		<file alias="photo.svg">../resources/InstrumentValueIcons/photo.svg</file>
-		<file alias="edit-crop.svg">../resources/InstrumentValueIcons/edit-crop.svg</file>
-		<file alias="information-solid.svg">../resources/InstrumentValueIcons/information-solid.svg</file>
-		<file alias="duplicate.svg">../resources/InstrumentValueIcons/duplicate.svg</file>
+		<file alias="border-left.svg">../resources/InstrumentValueIcons/border-left.svg</file>
+		<file alias="view-show.svg">../resources/InstrumentValueIcons/view-show.svg</file>
+		<file alias="globe.svg">../resources/InstrumentValueIcons/globe.svg</file>
 		<file alias="subdirectory-right.svg">../resources/InstrumentValueIcons/subdirectory-right.svg</file>
-		<file alias="screen-full.svg">../resources/InstrumentValueIcons/screen-full.svg</file>
-		<file alias="backward-step.svg">../resources/InstrumentValueIcons/backward-step.svg</file>
-		<file alias="mood-happy-solid.svg">../resources/InstrumentValueIcons/mood-happy-solid.svg</file>
-		<file alias="flag.svg">../resources/InstrumentValueIcons/flag.svg</file>
-		<file alias="arrow-outline-up.svg">../resources/InstrumentValueIcons/arrow-outline-up.svg</file>
-		<file alias="clipboard.svg">../resources/InstrumentValueIcons/clipboard.svg</file>
-		<file alias="mood-neutral-outline.svg">../resources/InstrumentValueIcons/mood-neutral-outline.svg</file>
-		<file alias="bluetooth.svg">../resources/InstrumentValueIcons/bluetooth.svg</file>
-		<file alias="reload.svg">../resources/InstrumentValueIcons/reload.svg</file>
-		<file alias="browser-window-new.svg">../resources/InstrumentValueIcons/browser-window-new.svg</file>
-		<file alias="brightness-down.svg">../resources/InstrumentValueIcons/brightness-down.svg</file>
-		<file alias="battery-low.svg">../resources/InstrumentValueIcons/battery-low.svg</file>
-		<file alias="thermometer.svg">../resources/InstrumentValueIcons/thermometer.svg</file>
-		<file alias="php-elephant.svg">../resources/InstrumentValueIcons/php-elephant.svg</file>
+		<file alias="chart.svg">../resources/InstrumentValueIcons/chart.svg</file>
+		<file alias="arrow-outline-down.svg">../resources/InstrumentValueIcons/arrow-outline-down.svg</file>
+		<file alias="browser-window.svg">../resources/InstrumentValueIcons/browser-window.svg</file>
+		<file alias="inbox.svg">../resources/InstrumentValueIcons/inbox.svg</file>
+		<file alias="music-album.svg">../resources/InstrumentValueIcons/music-album.svg</file>
 		<file alias="currency-dollar.svg">../resources/InstrumentValueIcons/currency-dollar.svg</file>
-		<file alias="color-palette.svg">../resources/InstrumentValueIcons/color-palette.svg</file>
-		<file alias="mood-happy-outline.svg">../resources/InstrumentValueIcons/mood-happy-outline.svg</file>
-		<file alias="window.svg">../resources/InstrumentValueIcons/window.svg</file>
-		<file alias="cheveron-up.svg">../resources/InstrumentValueIcons/cheveron-up.svg</file>
-		<file alias="border-inner.svg">../resources/InstrumentValueIcons/border-inner.svg</file>
-		<file alias="search.svg">../resources/InstrumentValueIcons/search.svg</file>
-		<file alias="border-horizontal.svg">../resources/InstrumentValueIcons/border-horizontal.svg</file>
-		<file alias="close-solid.svg">../resources/InstrumentValueIcons/close-solid.svg</file>
-		<file alias="text-decoration.svg">../resources/InstrumentValueIcons/text-decoration.svg</file>
-		<file alias="window-open.svg">../resources/InstrumentValueIcons/window-open.svg</file>
-		<file alias="inbox-full.svg">../resources/InstrumentValueIcons/inbox-full.svg</file>
-		<file alias="location-current.svg">../resources/InstrumentValueIcons/location-current.svg</file>
-		<file alias="link.svg">../resources/InstrumentValueIcons/link.svg</file>
-		<file alias="travel-taxi-cab.svg">../resources/InstrumentValueIcons/travel-taxi-cab.svg</file>
-		<file alias="border-all.svg">../resources/InstrumentValueIcons/border-all.svg</file>
-		<file alias="tag.svg">../resources/InstrumentValueIcons/tag.svg</file>
-		<file alias="user-solid-circle.svg">../resources/InstrumentValueIcons/user-solid-circle.svg</file>
-		<file alias="cheveron-right.svg">../resources/InstrumentValueIcons/cheveron-right.svg</file>
-		<file alias="servers.svg">../resources/InstrumentValueIcons/servers.svg</file>
-		<file alias="view-carousel.svg">../resources/InstrumentValueIcons/view-carousel.svg</file>
-		<file alias="buoy.svg">../resources/InstrumentValueIcons/buoy.svg</file>
-		<file alias="mic.svg">../resources/InstrumentValueIcons/mic.svg</file>
-		<file alias="yin-yang.svg">../resources/InstrumentValueIcons/yin-yang.svg</file>
-		<file alias="shuffle.svg">../resources/InstrumentValueIcons/shuffle.svg</file>
-		<file alias="backspace.svg">../resources/InstrumentValueIcons/backspace.svg</file>
-		<file alias="hand-stop.svg">../resources/InstrumentValueIcons/hand-stop.svg</file>
-		<file alias="menu.svg">../resources/InstrumentValueIcons/menu.svg</file>
-		<file alias="view-list.svg">../resources/InstrumentValueIcons/view-list.svg</file>
-		<file alias="calendar.svg">../resources/InstrumentValueIcons/calendar.svg</file>
-		<file alias="travel-walk.svg">../resources/InstrumentValueIcons/travel-walk.svg</file>
-		<file alias="trophy.svg">../resources/InstrumentValueIcons/trophy.svg</file>
-		<file alias="travel.svg">../resources/InstrumentValueIcons/travel.svg</file>
-		<file alias="close.svg">../resources/InstrumentValueIcons/close.svg</file>
-		<file alias="window-new.svg">../resources/InstrumentValueIcons/window-new.svg</file>
-		<file alias="border-none.svg">../resources/InstrumentValueIcons/border-none.svg</file>
-		<file alias="arrow-thick-right.svg">../resources/InstrumentValueIcons/arrow-thick-right.svg</file>
+		<file alias="chart-bar.svg">../resources/InstrumentValueIcons/chart-bar.svg</file>
+		<file alias="text-box.svg">../resources/InstrumentValueIcons/text-box.svg</file>
+		<file alias="border-outer.svg">../resources/InstrumentValueIcons/border-outer.svg</file>
+		<file alias="stethoscope.svg">../resources/InstrumentValueIcons/stethoscope.svg</file>
+		<file alias="coffee.svg">../resources/InstrumentValueIcons/coffee.svg</file>
+		<file alias="timer.svg">../resources/InstrumentValueIcons/timer.svg</file>
+		<file alias="mood-sad-outline.svg">../resources/InstrumentValueIcons/mood-sad-outline.svg</file>
+		<file alias="show-sidebar.svg">../resources/InstrumentValueIcons/show-sidebar.svg</file>
 		<file alias="border-vertical.svg">../resources/InstrumentValueIcons/border-vertical.svg</file>
+		<file alias="thumbs-up.svg">../resources/InstrumentValueIcons/thumbs-up.svg</file>
+		<file alias="step-forward.svg">../resources/InstrumentValueIcons/step-forward.svg</file>
+		<file alias="location-marina.svg">../resources/InstrumentValueIcons/location-marina.svg</file>
+		<file alias="inbox-download.svg">../resources/InstrumentValueIcons/inbox-download.svg</file>
+		<file alias="cheveron-outline-down.svg">../resources/InstrumentValueIcons/cheveron-outline-down.svg</file>
 		<file alias="volume-down.svg">../resources/InstrumentValueIcons/volume-down.svg</file>
-		<file alias="arrow-thick-down.svg">../resources/InstrumentValueIcons/arrow-thick-down.svg</file>
-		<file alias="pause-outline.svg">../resources/InstrumentValueIcons/pause-outline.svg</file>
-		<file alias="translate.svg">../resources/InstrumentValueIcons/translate.svg</file>
-		<file alias="location-hotel.svg">../resources/InstrumentValueIcons/location-hotel.svg</file>
-		<file alias="layers.svg">../resources/InstrumentValueIcons/layers.svg</file>
+		<file alias="browser-window-new.svg">../resources/InstrumentValueIcons/browser-window-new.svg</file>
 		<file alias="add-solid.svg">../resources/InstrumentValueIcons/add-solid.svg</file>
-		<file alias="book-reference.svg">../resources/InstrumentValueIcons/book-reference.svg</file>
 		<file alias="credit-card.svg">../resources/InstrumentValueIcons/credit-card.svg</file>
+		<file alias="cheveron-outline-up.svg">../resources/InstrumentValueIcons/cheveron-outline-up.svg</file>
+		<file alias="edit-pencil.svg">../resources/InstrumentValueIcons/edit-pencil.svg</file>
 		<file alias="format-bold.svg">../resources/InstrumentValueIcons/format-bold.svg</file>
-		<file alias="chart-bar.svg">../resources/InstrumentValueIcons/chart-bar.svg</file>
-		<file alias="wrench.svg">../resources/InstrumentValueIcons/wrench.svg</file>
-		<file alias="cheveron-down.svg">../resources/InstrumentValueIcons/cheveron-down.svg</file>
-		<file alias="subdirectory-left.svg">../resources/InstrumentValueIcons/subdirectory-left.svg</file>
-		<file alias="filter.svg">../resources/InstrumentValueIcons/filter.svg</file>
-		<file alias="folder-outline.svg">../resources/InstrumentValueIcons/folder-outline.svg</file>
-		<file alias="explore.svg">../resources/InstrumentValueIcons/explore.svg</file>
-		<file alias="stand-by.svg">../resources/InstrumentValueIcons/stand-by.svg</file>
-		<file alias="chart.svg">../resources/InstrumentValueIcons/chart.svg</file>
-		<file alias="lock-closed.svg">../resources/InstrumentValueIcons/lock-closed.svg</file>
-		<file alias="add-outline.svg">../resources/InstrumentValueIcons/add-outline.svg</file>
-		<file alias="beverage.svg">../resources/InstrumentValueIcons/beverage.svg</file>
-		<file alias="thumbs-up.svg">../resources/InstrumentValueIcons/thumbs-up.svg</file>
-		<file alias="arrow-thin-right.svg">../resources/InstrumentValueIcons/arrow-thin-right.svg</file>
-		<file alias="artist.svg">../resources/InstrumentValueIcons/artist.svg</file>
-		<file alias="notifications-outline.svg">../resources/InstrumentValueIcons/notifications-outline.svg</file>
 		<file alias="paste.svg">../resources/InstrumentValueIcons/paste.svg</file>
-		<file alias="inbox-check.svg">../resources/InstrumentValueIcons/inbox-check.svg</file>
-		<file alias="arrow-thick-left.svg">../resources/InstrumentValueIcons/arrow-thick-left.svg</file>
-		<file alias="minus-solid.svg">../resources/InstrumentValueIcons/minus-solid.svg</file>
-		<file alias="badge.svg">../resources/InstrumentValueIcons/badge.svg</file>
-		<file alias="user-solid-square.svg">../resources/InstrumentValueIcons/user-solid-square.svg</file>
-		<file alias="vector.svg">../resources/InstrumentValueIcons/vector.svg</file>
-		<file alias="volume-off.svg">../resources/InstrumentValueIcons/volume-off.svg</file>
-		<file alias="bug.svg">../resources/InstrumentValueIcons/bug.svg</file>
-		<file alias="date-add.svg">../resources/InstrumentValueIcons/date-add.svg</file>
-		<file alias="video-camera.svg">../resources/InstrumentValueIcons/video-camera.svg</file>
-		<file alias="plugin.svg">../resources/InstrumentValueIcons/plugin.svg</file>
-		<file alias="mobile-devices.svg">../resources/InstrumentValueIcons/mobile-devices.svg</file>
+		<file alias="radio.svg">../resources/InstrumentValueIcons/radio.svg</file>
+		<file alias="album.svg">../resources/InstrumentValueIcons/album.svg</file>
+		<file alias="at-symbol.svg">../resources/InstrumentValueIcons/at-symbol.svg</file>
 		<file alias="education.svg">../resources/InstrumentValueIcons/education.svg</file>
-		<file alias="bookmark-outline-add.svg">../resources/InstrumentValueIcons/bookmark-outline-add.svg</file>
-		<file alias="location.svg">../resources/InstrumentValueIcons/location.svg</file>
-		<file alias="format-underline.svg">../resources/InstrumentValueIcons/format-underline.svg</file>
-		<file alias="light-bulb.svg">../resources/InstrumentValueIcons/light-bulb.svg</file>
-		<file alias="bookmark copy 2.svg">../resources/InstrumentValueIcons/bookmark copy 2.svg</file>
-		<file alias="zoom-out.svg">../resources/InstrumentValueIcons/zoom-out.svg</file>
-		<file alias="forward-step.svg">../resources/InstrumentValueIcons/forward-step.svg</file>
-		<file alias="station.svg">../resources/InstrumentValueIcons/station.svg</file>
-		<file alias="edit-cut.svg">../resources/InstrumentValueIcons/edit-cut.svg</file>
-		<file alias="queue.svg">../resources/InstrumentValueIcons/queue.svg</file>
-		<file alias="cloud.svg">../resources/InstrumentValueIcons/cloud.svg</file>
-		<file alias="list-bullet.svg">../resources/InstrumentValueIcons/list-bullet.svg</file>
-		<file alias="play-outline.svg">../resources/InstrumentValueIcons/play-outline.svg</file>
-		<file alias="arrow-outline-left.svg">../resources/InstrumentValueIcons/arrow-outline-left.svg</file>
-		<file alias="indent-increase.svg">../resources/InstrumentValueIcons/indent-increase.svg</file>
-		<file alias="phone.svg">../resources/InstrumentValueIcons/phone.svg</file>
-		<file alias="browser-window.svg">../resources/InstrumentValueIcons/browser-window.svg</file>
-		<file alias="pen-tool.svg">../resources/InstrumentValueIcons/pen-tool.svg</file>
-		<file alias="question.svg">../resources/InstrumentValueIcons/question.svg</file>
-		<file alias="view-hide.svg">../resources/InstrumentValueIcons/view-hide.svg</file>
-		<file alias="cheveron-outline-up.svg">../resources/InstrumentValueIcons/cheveron-outline-up.svg</file>
-		<file alias="shield.svg">../resources/InstrumentValueIcons/shield.svg</file>
-		<file alias="border-outer.svg">../resources/InstrumentValueIcons/border-outer.svg</file>
-		<file alias="printer.svg">../resources/InstrumentValueIcons/printer.svg</file>
-		<file alias="flashlight.svg">../resources/InstrumentValueIcons/flashlight.svg</file>
-		<file alias="music-artist.svg">../resources/InstrumentValueIcons/music-artist.svg</file>
-		<file alias="directions.svg">../resources/InstrumentValueIcons/directions.svg</file>
-		<file alias="box.svg">../resources/InstrumentValueIcons/box.svg</file>
-		<file alias="news-paper.svg">../resources/InstrumentValueIcons/news-paper.svg</file>
+		<file alias="radar.svg">../resources/InstrumentValueIcons/radar.svg</file>
+		<file alias="headphones.svg">../resources/InstrumentValueIcons/headphones.svg</file>
+		<file alias="load-balancer.svg">../resources/InstrumentValueIcons/load-balancer.svg</file>
+		<file alias="home.svg">../resources/InstrumentValueIcons/home.svg</file>
+		<file alias="backward.svg">../resources/InstrumentValueIcons/backward.svg</file>
+		<file alias="tablet.svg">../resources/InstrumentValueIcons/tablet.svg</file>
+		<file alias="mood-happy-solid.svg">../resources/InstrumentValueIcons/mood-happy-solid.svg</file>
+		<file alias="align-right.svg">../resources/InstrumentValueIcons/align-right.svg</file>
+		<file alias="folder.svg">../resources/InstrumentValueIcons/folder.svg</file>
+		<file alias="duplicate.svg">../resources/InstrumentValueIcons/duplicate.svg</file>
 		<file alias="envelope.svg">../resources/InstrumentValueIcons/envelope.svg</file>
+		<file alias="bookmark copy 3.svg">../resources/InstrumentValueIcons/bookmark copy 3.svg</file>
+		<file alias="lock-closed.svg">../resources/InstrumentValueIcons/lock-closed.svg</file>
+		<file alias="clipboard.svg">../resources/InstrumentValueIcons/clipboard.svg</file>
+		<file alias="border-bottom.svg">../resources/InstrumentValueIcons/border-bottom.svg</file>
+		<file alias="shuffle.svg">../resources/InstrumentValueIcons/shuffle.svg</file>
+		<file alias="save-disk.svg">../resources/InstrumentValueIcons/save-disk.svg</file>
+		<file alias="refresh.svg">../resources/InstrumentValueIcons/refresh.svg</file>
+		<file alias="lock-open.svg">../resources/InstrumentValueIcons/lock-open.svg</file>
+		<file alias="link.svg">../resources/InstrumentValueIcons/link.svg</file>
+		<file alias="view-carousel.svg">../resources/InstrumentValueIcons/view-carousel.svg</file>
+		<file alias="share-01.svg">../resources/InstrumentValueIcons/share-01.svg</file>
+		<file alias="arrow-thick-down.svg">../resources/InstrumentValueIcons/arrow-thick-down.svg</file>
+		<file alias="ticket.svg">../resources/InstrumentValueIcons/ticket.svg</file>
+		<file alias="portfolio.svg">../resources/InstrumentValueIcons/portfolio.svg</file>
+		<file alias="arrow-simple-down.svg">../resources/InstrumentValueIcons/arrow-simple-down.svg</file>
 		<file alias="location-restroom.svg">../resources/InstrumentValueIcons/location-restroom.svg</file>
-		<file alias="checkmark-outline.svg">../resources/InstrumentValueIcons/checkmark-outline.svg</file>
+		<file alias="yin-yang.svg">../resources/InstrumentValueIcons/yin-yang.svg</file>
+		<file alias="buoy.svg">../resources/InstrumentValueIcons/buoy.svg</file>
+		<file alias="play-outline.svg">../resources/InstrumentValueIcons/play-outline.svg</file>
+		<file alias="box.svg">../resources/InstrumentValueIcons/box.svg</file>
+		<file alias="align-left.svg">../resources/InstrumentValueIcons/align-left.svg</file>
+		<file alias="minus-solid.svg">../resources/InstrumentValueIcons/minus-solid.svg</file>
+		<file alias="play.svg">../resources/InstrumentValueIcons/play.svg</file>
+		<file alias="format-italic.svg">../resources/InstrumentValueIcons/format-italic.svg</file>
+		<file alias="close.svg">../resources/InstrumentValueIcons/close.svg</file>
+		<file alias="screen-full.svg">../resources/InstrumentValueIcons/screen-full.svg</file>
+		<file alias="airplane.svg">../resources/InstrumentValueIcons/airplane.svg</file>
+		<file alias="forward.svg">../resources/InstrumentValueIcons/forward.svg</file>
+		<file alias="document.svg">../resources/InstrumentValueIcons/document.svg</file>
+		<file alias="cheveron-outline-left.svg">../resources/InstrumentValueIcons/cheveron-outline-left.svg</file>
+		<file alias="travel-car.svg">../resources/InstrumentValueIcons/travel-car.svg</file>
+		<file alias="library.svg">../resources/InstrumentValueIcons/library.svg</file>
+		<file alias="heart.svg">../resources/InstrumentValueIcons/heart.svg</file>
+		<file alias="zoom-out.svg">../resources/InstrumentValueIcons/zoom-out.svg</file>
+		<file alias="travel-taxi-cab.svg">../resources/InstrumentValueIcons/travel-taxi-cab.svg</file>
+		<file alias="chat-bubble-dots.svg">../resources/InstrumentValueIcons/chat-bubble-dots.svg</file>
+		<file alias="vector.svg">../resources/InstrumentValueIcons/vector.svg</file>
+		<file alias="notifications-outline.svg">../resources/InstrumentValueIcons/notifications-outline.svg</file>
+		<file alias="swap.svg">../resources/InstrumentValueIcons/swap.svg</file>
+		<file alias="mic.svg">../resources/InstrumentValueIcons/mic.svg</file>
+		<file alias="folder-outline-add.svg">../resources/InstrumentValueIcons/folder-outline-add.svg</file>
+		<file alias="forward-step.svg">../resources/InstrumentValueIcons/forward-step.svg</file>
 		<file alias="minus-outline.svg">../resources/InstrumentValueIcons/minus-outline.svg</file>
-		<file alias="hot.svg">../resources/InstrumentValueIcons/hot.svg</file>
-		<file alias="film.svg">../resources/InstrumentValueIcons/film.svg</file>
+		<file alias="translate.svg">../resources/InstrumentValueIcons/translate.svg</file>
+		<file alias="navigation-more.svg">../resources/InstrumentValueIcons/navigation-more.svg</file>
+		<file alias="battery-full.svg">../resources/InstrumentValueIcons/battery-full.svg</file>
+		<file alias="pause-solid.svg">../resources/InstrumentValueIcons/pause-solid.svg</file>
+		<file alias="explore.svg">../resources/InstrumentValueIcons/explore.svg</file>
+		<file alias="format-text-size.svg">../resources/InstrumentValueIcons/format-text-size.svg</file>
+		<file alias="reply.svg">../resources/InstrumentValueIcons/reply.svg</file>
+		<file alias="volume-off.svg">../resources/InstrumentValueIcons/volume-off.svg</file>
+		<file alias="list-add.svg">../resources/InstrumentValueIcons/list-add.svg</file>
+		<file alias="pin.svg">../resources/InstrumentValueIcons/pin.svg</file>
+		<file alias="zoom-in.svg">../resources/InstrumentValueIcons/zoom-in.svg</file>
+		<file alias="photo.svg">../resources/InstrumentValueIcons/photo.svg</file>
+		<file alias="mobile-devices.svg">../resources/InstrumentValueIcons/mobile-devices.svg</file>
+		<file alias="text-decoration.svg">../resources/InstrumentValueIcons/text-decoration.svg</file>
+		<file alias="music-playlist.svg">../resources/InstrumentValueIcons/music-playlist.svg</file>
 		<file alias="step-backward.svg">../resources/InstrumentValueIcons/step-backward.svg</file>
+		<file alias="information-outline.svg">../resources/InstrumentValueIcons/information-outline.svg</file>
+		<file alias="share-alt.svg">../resources/InstrumentValueIcons/share-alt.svg</file>
+		<file alias="exclamation-outline.svg">../resources/InstrumentValueIcons/exclamation-outline.svg</file>
+		<file alias="notification.svg">../resources/InstrumentValueIcons/notification.svg</file>
+		<file alias="window.svg">../resources/InstrumentValueIcons/window.svg</file>
+		<file alias="map.svg">../resources/InstrumentValueIcons/map.svg</file>
+		<file alias="thermometer.svg">../resources/InstrumentValueIcons/thermometer.svg</file>
+		<file alias="calendar.svg">../resources/InstrumentValueIcons/calendar.svg</file>
+		<file alias="stand-by.svg">../resources/InstrumentValueIcons/stand-by.svg</file>
+		<file alias="thumbs-down.svg">../resources/InstrumentValueIcons/thumbs-down.svg</file>
+		<file alias="cheveron-down.svg">../resources/InstrumentValueIcons/cheveron-down.svg</file>
+		<file alias="factory.svg">../resources/InstrumentValueIcons/factory.svg</file>
+		<file alias="stroke-width.svg">../resources/InstrumentValueIcons/stroke-width.svg</file>
+		<file alias="indent-increase.svg">../resources/InstrumentValueIcons/indent-increase.svg</file>
+		<file alias="search.svg">../resources/InstrumentValueIcons/search.svg</file>
+		<file alias="add-outline.svg">../resources/InstrumentValueIcons/add-outline.svg</file>
+		<file alias="mood-neutral-outline.svg">../resources/InstrumentValueIcons/mood-neutral-outline.svg</file>
+		<file alias="cheveron-outline-right.svg">../resources/InstrumentValueIcons/cheveron-outline-right.svg</file>
+		<file alias="arrow-thick-right.svg">../resources/InstrumentValueIcons/arrow-thick-right.svg</file>
 		<file alias="key.svg">../resources/InstrumentValueIcons/key.svg</file>
-		<file alias="location-park.svg">../resources/InstrumentValueIcons/location-park.svg</file>
-		<file alias="backward.svg">../resources/InstrumentValueIcons/backward.svg</file>
-		<file alias="reply.svg">../resources/InstrumentValueIcons/reply.svg</file>
-		<file alias="bookmark copy 3.svg">../resources/InstrumentValueIcons/bookmark copy 3.svg</file>
-		<file alias="align-justified.svg">../resources/InstrumentValueIcons/align-justified.svg</file>
-		<file alias="arrow-simple-up.svg">../resources/InstrumentValueIcons/arrow-simple-up.svg</file>
-		<file alias="repost.svg">../resources/InstrumentValueIcons/repost.svg</file>
-		<file alias="hour-glass.svg">../resources/InstrumentValueIcons/hour-glass.svg</file>
-		<file alias="mood-neutral-solid.svg">../resources/InstrumentValueIcons/mood-neutral-solid.svg</file>
+		<file alias="cloud.svg">../resources/InstrumentValueIcons/cloud.svg</file>
+		<file alias="mood-happy-outline.svg">../resources/InstrumentValueIcons/mood-happy-outline.svg</file>
+		<file alias="dots-horizontal-double.svg">../resources/InstrumentValueIcons/dots-horizontal-double.svg</file>
 		<file alias="format-font-size.svg">../resources/InstrumentValueIcons/format-font-size.svg</file>
-		<file alias="exclamation-outline.svg">../resources/InstrumentValueIcons/exclamation-outline.svg</file>
-		<file alias="arrow-outline-right.svg">../resources/InstrumentValueIcons/arrow-outline-right.svg</file>
-		<file alias="location-marina.svg">../resources/InstrumentValueIcons/location-marina.svg</file>
-		<file alias="globe.svg">../resources/InstrumentValueIcons/globe.svg</file>
+		<file alias="arrow-outline-up.svg">../resources/InstrumentValueIcons/arrow-outline-up.svg</file>
 		<file alias="arrow-thin-up.svg">../resources/InstrumentValueIcons/arrow-thin-up.svg</file>
-		<file alias="at-symbol.svg">../resources/InstrumentValueIcons/at-symbol.svg</file>
-		<file alias="pause.svg">../resources/InstrumentValueIcons/pause.svg</file>
-		<file alias="music-playlist.svg">../resources/InstrumentValueIcons/music-playlist.svg</file>
-		<file alias="align-center.svg">../resources/InstrumentValueIcons/align-center.svg</file>
-		<file alias="edit-copy.svg">../resources/InstrumentValueIcons/edit-copy.svg</file>
-		<file alias="save-disk.svg">../resources/InstrumentValueIcons/save-disk.svg</file>
-		<file alias="share.svg">../resources/InstrumentValueIcons/share.svg</file>
-		<file alias="format-text-size.svg">../resources/InstrumentValueIcons/format-text-size.svg</file>
-		<file alias="trash.svg">../resources/InstrumentValueIcons/trash.svg</file>
-		<file alias="album.svg">../resources/InstrumentValueIcons/album.svg</file>
-		<file alias="arrow-thick-up.svg">../resources/InstrumentValueIcons/arrow-thick-up.svg</file>
-		<file alias="arrow-thin-left.svg">../resources/InstrumentValueIcons/arrow-thin-left.svg</file>
-		<file alias="radio.svg">../resources/InstrumentValueIcons/radio.svg</file>
-		<file alias="wallet.svg">../resources/InstrumentValueIcons/wallet.svg</file>
-		<file alias="coffee.svg">../resources/InstrumentValueIcons/coffee.svg</file>
-		<file alias="gift.svg">../resources/InstrumentValueIcons/gift.svg</file>
-		<file alias="swap.svg">../resources/InstrumentValueIcons/swap.svg</file>
-		<file alias="view-show.svg">../resources/InstrumentValueIcons/view-show.svg</file>
-		<file alias="anchor.svg">../resources/InstrumentValueIcons/anchor.svg</file>
-		<file alias="home.svg">../resources/InstrumentValueIcons/home.svg</file>
-		<file alias="checkmark.svg">../resources/InstrumentValueIcons/checkmark.svg</file>
-		<file alias="navigation-more.svg">../resources/InstrumentValueIcons/navigation-more.svg</file>
-		<file alias="location-food.svg">../resources/InstrumentValueIcons/location-food.svg</file>
-		<file alias="border-right.svg">../resources/InstrumentValueIcons/border-right.svg</file>
 		<file alias="network.svg">../resources/InstrumentValueIcons/network.svg</file>
-		<file alias="pin.svg">../resources/InstrumentValueIcons/pin.svg</file>
-		<file alias="adjust.svg">../resources/InstrumentValueIcons/adjust.svg</file>
-		<file alias="computer-laptop.svg">../resources/InstrumentValueIcons/computer-laptop.svg</file>
-		<file alias="battery-full.svg">../resources/InstrumentValueIcons/battery-full.svg</file>
-		<file alias="folder.svg">../resources/InstrumentValueIcons/folder.svg</file>
-		<file alias="load-balancer.svg">../resources/InstrumentValueIcons/load-balancer.svg</file>
+		<file alias="mouse.svg">../resources/InstrumentValueIcons/mouse.svg</file>
+		<file alias="checkmark-outline.svg">../resources/InstrumentValueIcons/checkmark-outline.svg</file>
+		<file alias="mood-sad-solid.svg">../resources/InstrumentValueIcons/mood-sad-solid.svg</file>
+		<file alias="store-front.svg">../resources/InstrumentValueIcons/store-front.svg</file>
+		<file alias="battery-half.svg">../resources/InstrumentValueIcons/battery-half.svg</file>
+		<file alias="tools copy.svg">../resources/InstrumentValueIcons/tools copy.svg</file>
 		<file alias="time.svg">../resources/InstrumentValueIcons/time.svg</file>
 		<file alias="block.svg">../resources/InstrumentValueIcons/block.svg</file>
+		<file alias="camera.svg">../resources/InstrumentValueIcons/camera.svg</file>
+		<file alias="user-add.svg">../resources/InstrumentValueIcons/user-add.svg</file>
+		<file alias="cheveron-up.svg">../resources/InstrumentValueIcons/cheveron-up.svg</file>
+		<file alias="window-new.svg">../resources/InstrumentValueIcons/window-new.svg</file>
+		<file alias="battery-low.svg">../resources/InstrumentValueIcons/battery-low.svg</file>
+		<file alias="volume-up.svg">../resources/InstrumentValueIcons/volume-up.svg</file>
+		<file alias="volume-mute.svg">../resources/InstrumentValueIcons/volume-mute.svg</file>
+		<file alias="arrow-simple-up.svg">../resources/InstrumentValueIcons/arrow-simple-up.svg</file>
+		<file alias="travel.svg">../resources/InstrumentValueIcons/travel.svg</file>
+		<file alias="location.svg">../resources/InstrumentValueIcons/location.svg</file>
+		<file alias="dashboard.svg">../resources/InstrumentValueIcons/dashboard.svg</file>
+		<file alias="light-bulb.svg">../resources/InstrumentValueIcons/light-bulb.svg</file>
+		<file alias="travel-case.svg">../resources/InstrumentValueIcons/travel-case.svg</file>
+		<file alias="edit-crop.svg">../resources/InstrumentValueIcons/edit-crop.svg</file>
+		<file alias="close-solid.svg">../resources/InstrumentValueIcons/close-solid.svg</file>
+		<file alias="notifications.svg">../resources/InstrumentValueIcons/notifications.svg</file>
+		<file alias="video-camera.svg">../resources/InstrumentValueIcons/video-camera.svg</file>
+		<file alias="film.svg">../resources/InstrumentValueIcons/film.svg</file>
+		<file alias="border-right.svg">../resources/InstrumentValueIcons/border-right.svg</file>
+		<file alias="bolt.svg">../resources/InstrumentValueIcons/bolt.svg</file>
+		<file alias="keyboard.svg">../resources/InstrumentValueIcons/keyboard.svg</file>
+		<file alias="shopping-cart.svg">../resources/InstrumentValueIcons/shopping-cart.svg</file>
+		<file alias="cheveron-left.svg">../resources/InstrumentValueIcons/cheveron-left.svg</file>
+		<file alias="flag.svg">../resources/InstrumentValueIcons/flag.svg</file>
+		<file alias="adjust.svg">../resources/InstrumentValueIcons/adjust.svg</file>
+		<file alias="wrench.svg">../resources/InstrumentValueIcons/wrench.svg</file>
+		<file alias="station.svg">../resources/InstrumentValueIcons/station.svg</file>
+		<file alias="target.svg">../resources/InstrumentValueIcons/target.svg</file>
+		<file alias="location-food.svg">../resources/InstrumentValueIcons/location-food.svg</file>
+		<file alias="hour-glass.svg">../resources/InstrumentValueIcons/hour-glass.svg</file>
+		<file alias="date-add.svg">../resources/InstrumentValueIcons/date-add.svg</file>
+		<file alias="location-gas-station.svg">../resources/InstrumentValueIcons/location-gas-station.svg</file>
+		<file alias="cheveron-right.svg">../resources/InstrumentValueIcons/cheveron-right.svg</file>
+		<file alias="checkmark.svg">../resources/InstrumentValueIcons/checkmark.svg</file>
+		<file alias="format-underline.svg">../resources/InstrumentValueIcons/format-underline.svg</file>
+		<file alias="border-none.svg">../resources/InstrumentValueIcons/border-none.svg</file>
+		<file alias="inbox-full.svg">../resources/InstrumentValueIcons/inbox-full.svg</file>
+		<file alias="window-open.svg">../resources/InstrumentValueIcons/window-open.svg</file>
+		<file alias="travel-train.svg">../resources/InstrumentValueIcons/travel-train.svg</file>
+		<file alias="location-current.svg">../resources/InstrumentValueIcons/location-current.svg</file>
+		<file alias="computer-desktop.svg">../resources/InstrumentValueIcons/computer-desktop.svg</file>
+		<file alias="servers.svg">../resources/InstrumentValueIcons/servers.svg</file>
 		<file alias="close-outline.svg">../resources/InstrumentValueIcons/close-outline.svg</file>
+		<file alias="apparel.svg">../resources/InstrumentValueIcons/apparel.svg</file>
+		<file alias="arrow-thick-up.svg">../resources/InstrumentValueIcons/arrow-thick-up.svg</file>
+		<file alias="border-top.svg">../resources/InstrumentValueIcons/border-top.svg</file>
+		<file alias="bookmark copy 2.svg">../resources/InstrumentValueIcons/bookmark copy 2.svg</file>
+		<file alias="trophy.svg">../resources/InstrumentValueIcons/trophy.svg</file>
+		<file alias="view-list.svg">../resources/InstrumentValueIcons/view-list.svg</file>
+		<file alias="arrow-thin-right.svg">../resources/InstrumentValueIcons/arrow-thin-right.svg</file>
+		<file alias="arrow-outline-left.svg">../resources/InstrumentValueIcons/arrow-outline-left.svg</file>
+		<file alias="edit-cut.svg">../resources/InstrumentValueIcons/edit-cut.svg</file>
+		<file alias="brightness-up.svg">../resources/InstrumentValueIcons/brightness-up.svg</file>
+		<file alias="phone.svg">../resources/InstrumentValueIcons/phone.svg</file>
+		<file alias="arrow-outline-right.svg">../resources/InstrumentValueIcons/arrow-outline-right.svg</file>
+		<file alias="mood-neutral-solid.svg">../resources/InstrumentValueIcons/mood-neutral-solid.svg</file>
+		<file alias="arrow-base-down.svg">../resources/InstrumentValueIcons/arrow-base-down.svg</file>
+		<file alias="arrow-simple-left.svg">../resources/InstrumentValueIcons/arrow-simple-left.svg</file>
+		<file alias="browser-window-open.svg">../resources/InstrumentValueIcons/browser-window-open.svg</file>
+		<file alias="document-add.svg">../resources/InstrumentValueIcons/document-add.svg</file>
+		<file alias="inbox-check.svg">../resources/InstrumentValueIcons/inbox-check.svg</file>
+		<file alias="star-full.svg">../resources/InstrumentValueIcons/star-full.svg</file>
+		<file alias="fast-forward.svg">../resources/InstrumentValueIcons/fast-forward.svg</file>
+		<file alias="fast-rewind.svg">../resources/InstrumentValueIcons/fast-rewind.svg</file>
+		<file alias="hot.svg">../resources/InstrumentValueIcons/hot.svg</file>
+		<file alias="brightness-down.svg">../resources/InstrumentValueIcons/brightness-down.svg</file>
+		<file alias="backward-step.svg">../resources/InstrumentValueIcons/backward-step.svg</file>
+		<file alias="user.svg">../resources/InstrumentValueIcons/user.svg</file>
+		<file alias="backspace.svg">../resources/InstrumentValueIcons/backspace.svg</file>
+		<file alias="border-inner.svg">../resources/InstrumentValueIcons/border-inner.svg</file>
+		<file alias="chart-pie.svg">../resources/InstrumentValueIcons/chart-pie.svg</file>
+		<file alias="arrow-base-up.svg">../resources/InstrumentValueIcons/arrow-base-up.svg</file>
+		<file alias="music-notes.svg">../resources/InstrumentValueIcons/music-notes.svg</file>
+		<file alias="filter.svg">../resources/InstrumentValueIcons/filter.svg</file>
+		<file alias="code.svg">../resources/InstrumentValueIcons/code.svg</file>
+		<file alias="dial-pad.svg">../resources/InstrumentValueIcons/dial-pad.svg</file>
+		<file alias="reply-all.svg">../resources/InstrumentValueIcons/reply-all.svg</file>
+		<file alias="arrow-thin-down.svg">../resources/InstrumentValueIcons/arrow-thin-down.svg</file>
 		<file alias="usb.svg">../resources/InstrumentValueIcons/usb.svg</file>
+		<file alias="anchor.svg">../resources/InstrumentValueIcons/anchor.svg</file>
+		<file alias="align-justified.svg">../resources/InstrumentValueIcons/align-justified.svg</file>
+		<file alias="conversation.svg">../resources/InstrumentValueIcons/conversation.svg</file>
+		<file alias="bug.svg">../resources/InstrumentValueIcons/bug.svg</file>
+		<file alias="arrow-simple-right.svg">../resources/InstrumentValueIcons/arrow-simple-right.svg</file>
+		<file alias="location-park.svg">../resources/InstrumentValueIcons/location-park.svg</file>
+		<file alias="flashlight.svg">../resources/InstrumentValueIcons/flashlight.svg</file>
+		<file alias="pen-tool.svg">../resources/InstrumentValueIcons/pen-tool.svg</file>
+		<file alias="subdirectory-left.svg">../resources/InstrumentValueIcons/subdirectory-left.svg</file>
+		<file alias="exclamation-solid.svg">../resources/InstrumentValueIcons/exclamation-solid.svg</file>
+		<file alias="php-elephant.svg">../resources/InstrumentValueIcons/php-elephant.svg</file>
+		<file alias="bookmark.svg">../resources/InstrumentValueIcons/bookmark.svg</file>
+		<file alias="location-hotel.svg">../resources/InstrumentValueIcons/location-hotel.svg</file>
+		<file alias="calculator.svg">../resources/InstrumentValueIcons/calculator.svg</file>
+		<file alias="view-tile.svg">../resources/InstrumentValueIcons/view-tile.svg</file>
+		<file alias="plugin.svg">../resources/InstrumentValueIcons/plugin.svg</file>
+		<file alias="tag.svg">../resources/InstrumentValueIcons/tag.svg</file>
+		<file alias="pause-outline.svg">../resources/InstrumentValueIcons/pause-outline.svg</file>
+		<file alias="copy.svg">../resources/InstrumentValueIcons/copy.svg</file>
+		<file alias="hard-drive.svg">../resources/InstrumentValueIcons/hard-drive.svg</file>
+		<file alias="attachment.svg">../resources/InstrumentValueIcons/attachment.svg</file>
+		<file alias="cloud-upload.svg">../resources/InstrumentValueIcons/cloud-upload.svg</file>
+		<file alias="list-bullet.svg">../resources/InstrumentValueIcons/list-bullet.svg</file>
+		<file alias="user-solid-circle.svg">../resources/InstrumentValueIcons/user-solid-circle.svg</file>
+		<file alias="trash.svg">../resources/InstrumentValueIcons/trash.svg</file>
+		<file alias="bookmark-outline.svg">../resources/InstrumentValueIcons/bookmark-outline.svg</file>
+		<file alias="location-shopping.svg">../resources/InstrumentValueIcons/location-shopping.svg</file>
 	</qresource>
 </RCC>
diff --git a/custom-example/qgroundcontrol.qrc b/custom-example/qgroundcontrol.qrc
index 7af3c93..f2c562c 100644
--- a/custom-example/qgroundcontrol.qrc
+++ b/custom-example/qgroundcontrol.qrc
@@ -36,9 +36,7 @@
 		<file alias="AnalyzeView.qml">../src/AnalyzeView/AnalyzeView.qml</file>
 		<file alias="AppSettings.qml">../src/ui/AppSettings.qml</file>
 		<file alias="BluetoothSettings.qml">../src/ui/preferences/BluetoothSettings.qml</file>
-		<file alias="CameraPageWidget.qml">../src/FlightMap/Widgets/CameraPageWidget.qml</file>
 		<file alias="CorridorScanEditor.qml">../src/PlanView/CorridorScanEditor.qml</file>
-		<file alias="CustomCommandWidget.qml">../src/ViewWidgets/CustomCommandWidget.qml</file>
 		<file alias="DebugWindow.qml">../src/ui/preferences/DebugWindow.qml</file>
 		<file alias="ESP8266Component.qml">../src/AutoPilotPlugins/Common/ESP8266Component.qml</file>
 		<file alias="ESP8266ComponentSummary.qml">../src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml</file>
@@ -118,7 +116,6 @@
 		<file alias="QGroundControl/Controls/ModeSwitchDisplay.qml">../src/QmlControls/ModeSwitchDisplay.qml</file>
 		<file alias="QGroundControl/Controls/MultiRotorMotorDisplay.qml">../src/QmlControls/MultiRotorMotorDisplay.qml</file>
 		<file alias="QGroundControl/Controls/OfflineMapButton.qml">../src/QmlControls/OfflineMapButton.qml</file>
-		<file alias="QGroundControl/Controls/PageView.qml">../src/QmlControls/PageView.qml</file>
 		<file alias="QGroundControl/Controls/ParameterEditor.qml">../src/QmlControls/ParameterEditor.qml</file>
 		<file alias="QGroundControl/Controls/ParameterEditorDialog.qml">../src/QmlControls/ParameterEditorDialog.qml</file>
 		<file alias="QGroundControl/Controls/PIDTuning.qml">../src/QmlControls/PIDTuning.qml</file>
@@ -186,8 +183,6 @@
 		<file alias="QGroundControl/Controls/TransectStyleComplexItemTerrainFollow.qml">../src/PlanView/TransectStyleComplexItemTerrainFollow.qml</file>
 		<file alias="QGroundControl/Controls/VehicleRotationCal.qml">../src/QmlControls/VehicleRotationCal.qml</file>
 		<file alias="QGroundControl/Controls/VehicleSummaryRow.qml">../src/QmlControls/VehicleSummaryRow.qml</file>
-		<file alias="QGroundControl/Controls/VerticalFactValueGrid.qml">../src/QmlControls/VerticalFactValueGrid.qml</file>
-		<file alias="QGroundControl/Controls/ViewWidget.qml">../src/ViewWidgets/ViewWidget.qml</file>
 		<file alias="QGroundControl/Controls/VTOLLandingPatternMapVisual.qml">../src/PlanView/VTOLLandingPatternMapVisual.qml</file>
 		<file alias="QGroundControl/FactControls/AltitudeFactTextField.qml">../src/FactSystem/FactControls/AltitudeFactTextField.qml</file>
 		<file alias="QGroundControl/FactControls/FactBitmask.qml">../src/FactSystem/FactControls/FactBitmask.qml</file>
@@ -224,7 +219,6 @@
 		<file alias="QGroundControl/FlightDisplay/GuidedAltitudeSlider.qml">../src/FlightDisplay/GuidedAltitudeSlider.qml</file>
 		<file alias="QGroundControl/FlightDisplay/GuidedToolStripAction.qml">../src/FlightDisplay/GuidedToolStripAction.qml</file>
 		<file alias="QGroundControl/FlightDisplay/MultiVehicleList.qml">../src/FlightDisplay/MultiVehicleList.qml</file>
-		<file alias="QGroundControl/FlightDisplay/MultiVehiclePanel.qml">../src/FlightDisplay/MultiVehiclePanel.qml</file>
 		<file alias="QGroundControl/FlightDisplay/PreFlightBatteryCheck.qml">../src/FlightDisplay/PreFlightBatteryCheck.qml</file>
 		<file alias="QGroundControl/FlightDisplay/PreFlightGPSCheck.qml">../src/FlightDisplay/PreFlightGPSCheck.qml</file>
 		<file alias="QGroundControl/FlightDisplay/PreFlightRCCheck.qml">../src/FlightDisplay/PreFlightRCCheck.qml</file>
@@ -232,6 +226,7 @@
 		<file alias="QGroundControl/FlightDisplay/PreFlightSoundCheck.qml">../src/FlightDisplay/PreFlightSoundCheck.qml</file>
 		<file alias="QGroundControl/FlightDisplay/PreFlightCheckListShowAction.qml">../src/FlightDisplay/PreFlightCheckListShowAction.qml</file>
 		<file alias="QGroundControl/FlightDisplay/TerrainProgress.qml">../src/FlightDisplay/TerrainProgress.qml</file>
+		<file alias="QGroundControl/FlightDisplay/TelemetryValuesBar.qml">../src/FlightDisplay/TelemetryValuesBar.qml</file>
 		<file alias="QGroundControl/FlightDisplay/VehicleWarnings.qml">../src/FlightDisplay/VehicleWarnings.qml</file>
 		<file alias="QGroundControl/FlightDisplay/qmldir">../src/QmlControls/QGroundControl/FlightDisplay/qmldir</file>
 		<file alias="QGroundControl/FlightMap/CameraTriggerIndicator.qml">../src/FlightMap/MapItems/CameraTriggerIndicator.qml</file>
@@ -240,13 +235,13 @@
 		<file alias="QGroundControl/FlightMap/CompassRing.qml">../src/FlightMap/Widgets/CompassRing.qml</file>
 		<file alias="QGroundControl/FlightMap/CustomMapItems.qml">../src/FlightMap/MapItems/CustomMapItems.qml</file>
 		<file alias="QGroundControl/FlightMap/FlightMap.qml">../src/FlightMap/FlightMap.qml</file>
-		<file alias="QGroundControl/FlightMap/InstrumentSwipeView.qml">../src/FlightMap/Widgets/InstrumentSwipeView.qml</file>
 		<file alias="QGroundControl/FlightMap/MapFitFunctions.qml">../src/FlightMap/Widgets/MapFitFunctions.qml</file>
 		<file alias="QGroundControl/FlightMap/MapScale.qml">../src/FlightMap/MapScale.qml</file>
 		<file alias="QGroundControl/FlightMap/MissionItemIndicator.qml">../src/FlightMap/MapItems/MissionItemIndicator.qml</file>
 		<file alias="QGroundControl/FlightMap/MissionItemIndicatorDrag.qml">../src/FlightMap/MapItems/MissionItemIndicatorDrag.qml</file>
 		<file alias="QGroundControl/FlightMap/MissionItemView.qml">../src/FlightMap/MapItems/MissionItemView.qml</file>
 		<file alias="QGroundControl/FlightMap/MissionLineView.qml">../src/FlightMap/MapItems/MissionLineView.qml</file>
+		<file alias="QGroundControl/FlightMap/PhotoVideoControl.qml">../src/FlightMap/Widgets/PhotoVideoControl.qml</file>
 		<file alias="QGroundControl/FlightMap/PlanMapItems.qml">../src/FlightMap/MapItems/PlanMapItems.qml</file>
 		<file alias="QGroundControl/FlightMap/PolygonEditor.qml">../src/FlightMap/MapItems/PolygonEditor.qml</file>
 		<file alias="QGroundControl/FlightMap/QGCArtificialHorizon.qml">../src/FlightMap/Widgets/QGCArtificialHorizon.qml</file>
@@ -272,12 +267,12 @@
 		<file alias="TcpSettings.qml">../src/ui/preferences/TcpSettings.qml</file>
 		<file alias="test.qml">../src/test.qml</file>
 		<file alias="UdpSettings.qml">../src/ui/preferences/UdpSettings.qml</file>
-		<file alias="ValuePageWidget.qml">../src/FlightMap/Widgets/ValuePageWidget.qml</file>
 		<file alias="VehicleSummary.qml">../src/VehicleSetup/VehicleSummary.qml</file>
-		<file alias="VibrationPageWidget.qml">../src/FlightMap/Widgets/VibrationPageWidget.qml</file>
-		<file alias="VideoPageWidget.qml">../src/FlightMap/Widgets/VideoPageWidget.qml</file>
+		<file alias="VibrationPage.qml">../src/AnalyzeView/VibrationPage.qml</file>
 		<file alias="VirtualJoystick.qml">../src/FlightDisplay/VirtualJoystick.qml</file>
 		<file alias="VTOLLandingPatternEditor.qml">../src/PlanView/VTOLLandingPatternEditor.qml</file>
+		<file alias="QGroundControl/FlightMap/ProximityRadarMapView.qml">../src/FlightMap/MapItems/ProximityRadarMapView.qml</file>
+		<file alias="QGroundControl/FlightDisplay/ProximityRadarVideoView.qml">../src/FlightDisplay/ProximityRadarVideoView.qml</file>
 	</qresource>
 	<qresource prefix="/FirstRunPromptDialogs">
 		<file alias="UnitsFirstRunPrompt.qml">../src/FirstRunPromptDialogs/UnitsFirstRunPrompt.qml</file>
diff --git a/custom-example/src/CustomPlugin.h b/custom-example/src/CustomPlugin.h
index 9b4e1c6..ffa1251 100644
--- a/custom-example/src/CustomPlugin.h
+++ b/custom-example/src/CustomPlugin.h
@@ -14,7 +14,6 @@
 #include "QGCCorePlugin.h"
 #include "QGCOptions.h"
 #include "QGCLoggingCategory.h"
-#include "GstVideoReceiver.h"
 #include "SettingsManager.h"
 
 #include <QTranslator>