diff --git a/ui-common/src/components/EntriesList/EntriesList.tsx b/ui-common/src/components/EntriesList/EntriesList.tsx
index 1bbbdd26c..68236c5e1 100644
--- a/ui-common/src/components/EntriesList/EntriesList.tsx
+++ b/ui-common/src/components/EntriesList/EntriesList.tsx
@@ -3,8 +3,8 @@ import styles from './EntriesList.module.sass';
 import ScrollableFeedVirtualized from "react-scrollable-feed-virtualized";
 import Moment from 'moment';
 import {EntryItem} from "../EntryListItem/EntryListItem";
-import down from "../assets/downImg.svg";
-import spinner from '../assets/spinner.svg';
+import down from "assets/downImg.svg";
+import spinner from 'assets/spinner.svg';
 import {RecoilState, useRecoilState, useRecoilValue, useSetRecoilState} from "recoil";
 import entriesAtom from "../../recoil/entries";
 import queryAtom from "../../recoil/query";
diff --git a/ui-common/src/components/assets/downImg.svg b/ui-common/src/components/EntriesList/assets/downImg.svg
similarity index 100%
rename from ui-common/src/components/assets/downImg.svg
rename to ui-common/src/components/EntriesList/assets/downImg.svg
diff --git a/ui-common/src/components/assets/spinner.svg b/ui-common/src/components/EntriesList/assets/spinner.svg
similarity index 100%
rename from ui-common/src/components/assets/spinner.svg
rename to ui-common/src/components/EntriesList/assets/spinner.svg
diff --git a/ui-common/src/components/EntryDetailed/EntryDetailed.tsx b/ui-common/src/components/EntryDetailed/EntryDetailed.tsx
index c7b1a9cfd..d41afa4f6 100644
--- a/ui-common/src/components/EntryDetailed/EntryDetailed.tsx
+++ b/ui-common/src/components/EntryDetailed/EntryDetailed.tsx
@@ -12,7 +12,7 @@ import TrafficViewerApiAtom from "../../recoil/TrafficViewerApi/atom";
 import queryAtom from "../../recoil/query/atom";
 import useWindowDimensions, { useRequestTextByWidth } from "../../hooks/WindowDimensionsHook";
 import { TOAST_CONTAINER_ID } from "../../configs/Consts";
-import spinner from "../assets/spinner.svg";
+import spinner from "assets/spinner.svg";
 
 const useStyles = makeStyles(() => ({
     entryTitle: {
diff --git a/ui-common/src/components/EntryDetailed/assets/spinner.svg b/ui-common/src/components/EntryDetailed/assets/spinner.svg
new file mode 100644
index 000000000..16ac582fa
--- /dev/null
+++ b/ui-common/src/components/EntryDetailed/assets/spinner.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: none; display: block; shape-rendering: auto;" width="200px" height="200px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
+<circle cx="50" cy="50" fill="none" stroke="#1d3f72" stroke-width="10" r="35" stroke-dasharray="164.93361431346415 56.97787143782138" transform="rotate(275.903 50 50)">
+  <animateTransform attributeName="transform" type="rotate" repeatCount="indefinite" dur="1s" values="0 50 50;360 50 50" keyTimes="0;1"></animateTransform>
+</circle>
+<!-- [ldio] generated by https://loading.io/ --></svg>
\ No newline at end of file
diff --git a/ui-common/src/components/EntryListItem/EntryListItem.tsx b/ui-common/src/components/EntryListItem/EntryListItem.tsx
index be9f85452..0baaded7d 100644
--- a/ui-common/src/components/EntryListItem/EntryListItem.tsx
+++ b/ui-common/src/components/EntryListItem/EntryListItem.tsx
@@ -4,15 +4,15 @@ import SwapHorizIcon from '@mui/icons-material/SwapHoriz';
 import styles from './EntryListItem.module.sass';
 import StatusCode, {getClassification, StatusCodeClassification} from "../UI/StatusCode/StatusCode";
 import Protocol, {ProtocolInterface} from "../UI/Protocol/Protocol"
-import eBPFLogo from './assets/lock.svg';
+import eBPFLogo from 'assets/lock.svg';
 import {Summary} from "../UI/Summary/Summary";
 import Queryable from "../UI/Queryable/Queryable";
-import ingoingIconSuccess from "./assets/ingoing-traffic-success.svg"
-import ingoingIconFailure from "./assets/ingoing-traffic-failure.svg"
-import ingoingIconNeutral from "./assets/ingoing-traffic-neutral.svg"
-import outgoingIconSuccess from "./assets/outgoing-traffic-success.svg"
-import outgoingIconFailure from "./assets/outgoing-traffic-failure.svg"
-import outgoingIconNeutral from "./assets/outgoing-traffic-neutral.svg"
+import ingoingIconSuccess from "assets/ingoing-traffic-success.svg"
+import ingoingIconFailure from "assets/ingoing-traffic-failure.svg"
+import ingoingIconNeutral from "assets/ingoing-traffic-neutral.svg"
+import outgoingIconSuccess from "assets/outgoing-traffic-success.svg"
+import outgoingIconFailure from "assets/outgoing-traffic-failure.svg"
+import outgoingIconNeutral from "assets/outgoing-traffic-neutral.svg"
 import {useRecoilState} from "recoil";
 import focusedEntryIdAtom from "../../recoil/focusedEntryId";
 import queryAtom from "../../recoil/query";
diff --git a/ui-common/src/components/Filters/Filters.tsx b/ui-common/src/components/Filters/Filters.tsx
index 81c5cc2f2..689f7c653 100644
--- a/ui-common/src/components/Filters/Filters.tsx
+++ b/ui-common/src/components/Filters/Filters.tsx
@@ -4,8 +4,8 @@ import {Button, Grid, Modal, Box, Typography, Backdrop, Fade, Divider, debounce}
 import CodeEditor from '@uiw/react-textarea-code-editor';
 import MenuBookIcon from '@mui/icons-material/MenuBook';
 import { SyntaxHighlighter } from "../UI/SyntaxHighlighter";
-import filterUIExample1 from "../TrafficViewer/assets/filter-ui-example-1.png"
-import filterUIExample2 from "../TrafficViewer/assets/filter-ui-example-2.png"
+import filterUIExample1 from "assets/filter-ui-example-1.png"
+import filterUIExample2 from "assets/filter-ui-example-2.png"
 import variables from '../../variables.module.scss';
 import { useRecoilState, useRecoilValue } from "recoil";
 import queryAtom from "../../recoil/query";
diff --git a/ui-common/src/components/TrafficViewer/assets/filter-ui-example-1.png b/ui-common/src/components/Filters/assets/filter-ui-example-1.png
similarity index 100%
rename from ui-common/src/components/TrafficViewer/assets/filter-ui-example-1.png
rename to ui-common/src/components/Filters/assets/filter-ui-example-1.png
diff --git a/ui-common/src/components/TrafficViewer/assets/filter-ui-example-2.png b/ui-common/src/components/Filters/assets/filter-ui-example-2.png
similarity index 100%
rename from ui-common/src/components/TrafficViewer/assets/filter-ui-example-2.png
rename to ui-common/src/components/Filters/assets/filter-ui-example-2.png
diff --git a/ui-common/src/components/UI/CollapsibleContainer/CollapsibleContainer.tsx b/ui-common/src/components/UI/CollapsibleContainer/CollapsibleContainer.tsx
index c73bcd341..afe2849da 100644
--- a/ui-common/src/components/UI/CollapsibleContainer/CollapsibleContainer.tsx
+++ b/ui-common/src/components/UI/CollapsibleContainer/CollapsibleContainer.tsx
@@ -1,6 +1,6 @@
 import React from "react";
-import collapsedImg from "../assets/collapsed.svg";
-import expandedImg from "../assets/expanded.svg";
+import collapsedImg from "assets/collapsed.svg";
+import expandedImg from "assets/expanded.svg";
 import styles from "./CollapsibleContainer.module.sass";
 
 interface Props {
diff --git a/ui-common/src/components/UI/assets/collapsed.svg b/ui-common/src/components/UI/CollapsibleContainer/assets/collapsed.svg
similarity index 100%
rename from ui-common/src/components/UI/assets/collapsed.svg
rename to ui-common/src/components/UI/CollapsibleContainer/assets/collapsed.svg
diff --git a/ui-common/src/components/UI/assets/expanded.svg b/ui-common/src/components/UI/CollapsibleContainer/assets/expanded.svg
similarity index 100%
rename from ui-common/src/components/UI/assets/expanded.svg
rename to ui-common/src/components/UI/CollapsibleContainer/assets/expanded.svg
diff --git a/ui-common/src/components/UI/FancyTextDisplay/FancyTextDisplay.tsx b/ui-common/src/components/UI/FancyTextDisplay/FancyTextDisplay.tsx
index 048d33798..c156275dc 100644
--- a/ui-common/src/components/UI/FancyTextDisplay/FancyTextDisplay.tsx
+++ b/ui-common/src/components/UI/FancyTextDisplay/FancyTextDisplay.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import duplicateImg from "../assets/duplicate.svg";
+import duplicateImg from "assets/duplicate.svg";
 import styles from './FancyTextDisplay.module.sass';
 
 interface Props {
diff --git a/ui-common/src/components/UI/assets/duplicate.svg b/ui-common/src/components/UI/FancyTextDisplay/assets/duplicate.svg
similarity index 100%
rename from ui-common/src/components/UI/assets/duplicate.svg
rename to ui-common/src/components/UI/FancyTextDisplay/assets/duplicate.svg
diff --git a/ui-common/src/components/UI/NoDataMessage/NoDataMessage.tsx b/ui-common/src/components/UI/NoDataMessage/NoDataMessage.tsx
index 5ee4bbb3f..b62fc85b2 100644
--- a/ui-common/src/components/UI/NoDataMessage/NoDataMessage.tsx
+++ b/ui-common/src/components/UI/NoDataMessage/NoDataMessage.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import circleImg from '../assets/dotted-circle.svg';
+import circleImg from 'assets/dotted-circle.svg';
 import styles from './NoDataMessage.module.sass'
 
 export interface Props {
diff --git a/ui-common/src/components/UI/assets/dotted-circle.svg b/ui-common/src/components/UI/NoDataMessage/assets/dotted-circle.svg
similarity index 100%
rename from ui-common/src/components/UI/assets/dotted-circle.svg
rename to ui-common/src/components/UI/NoDataMessage/assets/dotted-circle.svg
diff --git a/ui-common/src/components/UI/SearchableDropdown/SearchableDropdown.tsx b/ui-common/src/components/UI/SearchableDropdown/SearchableDropdown.tsx
index 67a97065f..91c56c302 100644
--- a/ui-common/src/components/UI/SearchableDropdown/SearchableDropdown.tsx
+++ b/ui-common/src/components/UI/SearchableDropdown/SearchableDropdown.tsx
@@ -4,7 +4,7 @@ import { Autocomplete } from "@mui/material";
 import { Checkbox, TextField } from "@mui/material";
 import CheckBoxOutlineBlankIcon from '@mui/icons-material/CheckBoxOutlineBlank';
 import CheckBoxIcon from '@mui/icons-material/CheckBox';
-import DefaultIconDown from "DefaultIconDown.svg";
+import DefaultIconDown from "assets/DefaultIconDown.svg";
 import styles from "./SearchableDropdown.module.sass";
 
 interface SearchableDropdownProps {
diff --git a/ui-common/src/components/UI/SearchableDropdown/DefaultIconDown.svg b/ui-common/src/components/UI/SearchableDropdown/assets/DefaultIconDown.svg
similarity index 100%
rename from ui-common/src/components/UI/SearchableDropdown/DefaultIconDown.svg
rename to ui-common/src/components/UI/SearchableDropdown/assets/DefaultIconDown.svg
diff --git a/ui-common/src/components/UI/Select/Select.tsx b/ui-common/src/components/UI/Select/Select.tsx
index d52cd759a..2f3021a84 100644
--- a/ui-common/src/components/UI/Select/Select.tsx
+++ b/ui-common/src/components/UI/Select/Select.tsx
@@ -1,4 +1,4 @@
-import {ReactComponent as DefaultIconDown} from '../assets/default_icon_down.svg';
+import {ReactComponent as DefaultIconDown} from './assets/defaultIconDown.svg';
 import {MenuItem, Select as MUISelect, SelectProps as MUISelectProps} from '@mui/material';
 import React from 'react';
 import styles from './Select.module.sass';
diff --git a/ui-common/src/components/UI/Select/assets/defaultIconDown.svg b/ui-common/src/components/UI/Select/assets/defaultIconDown.svg
new file mode 100644
index 000000000..7adbb0d4d
--- /dev/null
+++ b/ui-common/src/components/UI/Select/assets/defaultIconDown.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.99999 13.6568L9.99997 13.6569L5.75732 9.41421L7.17154 8L10.0001 10.8285L12.8285 8.00009L14.2428 9.41431L10.0001 13.6569L9.99999 13.6568Z" fill="#205CF5"/>
+</svg>
diff --git a/ui-common/src/components/UI/StatusBar/StatusBar.tsx b/ui-common/src/components/UI/StatusBar/StatusBar.tsx
index 1d78253d8..05d0848c7 100644
--- a/ui-common/src/components/UI/StatusBar/StatusBar.tsx
+++ b/ui-common/src/components/UI/StatusBar/StatusBar.tsx
@@ -1,8 +1,8 @@
 import style from './StatusBar.module.sass';
 import React, {useState} from "react";
-import warningIcon from '../assets/warning_icon.svg';
-import failIcon from '../assets/failed.svg';
-import successIcon from '../assets/success.svg';
+import warningIcon from 'assets/warning_icon.svg';
+import failIcon from 'assets/failed.svg';
+import successIcon from 'assets/success.svg';
 import {useRecoilValue} from "recoil";
 import tappingStatusAtom, {tappingStatusDetails} from "../../../recoil/tappingStatus";
 import Tooltip from "../Tooltip/Tooltip";
diff --git a/ui-common/src/components/UI/assets/failed.svg b/ui-common/src/components/UI/StatusBar/assets/failed.svg
similarity index 100%
rename from ui-common/src/components/UI/assets/failed.svg
rename to ui-common/src/components/UI/StatusBar/assets/failed.svg
diff --git a/ui-common/src/components/UI/assets/success.svg b/ui-common/src/components/UI/StatusBar/assets/success.svg
similarity index 100%
rename from ui-common/src/components/UI/assets/success.svg
rename to ui-common/src/components/UI/StatusBar/assets/success.svg
diff --git a/ui-common/src/components/UI/assets/warning_icon.svg b/ui-common/src/components/UI/StatusBar/assets/warning_icon.svg
similarity index 100%
rename from ui-common/src/components/UI/assets/warning_icon.svg
rename to ui-common/src/components/UI/StatusBar/assets/warning_icon.svg
diff --git a/ui-common/src/components/UI/assets/default_icon_down.svg b/ui-common/src/components/UI/assets/default_icon_down.svg
deleted file mode 100644
index 52aac5735..000000000
--- a/ui-common/src/components/UI/assets/default_icon_down.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="7.237" height="7.237" viewBox="0 0 7.237 7.237" fill="white">
-    <path id="icon_down" d="M5.117 0H3.07v3.07H0v2.047h5.117V0z" transform="rotate(45 1.809 4.367)"/>
-</svg>
diff --git a/ui-common/src/components/assets/authBackground.png b/ui-common/src/components/assets/authBackground.png
deleted file mode 100644
index f67800313..000000000
Binary files a/ui-common/src/components/assets/authBackground.png and /dev/null differ
diff --git a/ui-common/src/components/assets/icon-next.svg b/ui-common/src/components/assets/icon-next.svg
deleted file mode 100644
index 96ad8ab8d..000000000
--- a/ui-common/src/components/assets/icon-next.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 22 22">
-    <g id="prefix__icon_expand" fill="#627ef7" transform="rotate(0 11 11)">
-        <path id="prefix__icon_down" d="M5.117 0H3.07v3.07H0v2.047h5.117V0z" transform="rotate(-45 16.54 -2.201)"/>
-    </g>
-</svg>
diff --git a/ui-common/src/components/assets/icon-prev.svg b/ui-common/src/components/assets/icon-prev.svg
deleted file mode 100644
index 4b93e6704..000000000
--- a/ui-common/src/components/assets/icon-prev.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 22 22">
-    <g id="prefix__icon_expand" fill="#627ef7" transform="rotate(180 11 11)">
-        <path id="prefix__icon_down" d="M5.117 0H3.07v3.07H0v2.047h5.117V0z" transform="rotate(-45 16.54 -2.201)"/>
-    </g>
-</svg>
diff --git a/ui-common/src/components/modals/OasModal/OasModal.tsx b/ui-common/src/components/modals/OasModal/OasModal.tsx
index 9a8e2b918..09902d71b 100644
--- a/ui-common/src/components/modals/OasModal/OasModal.tsx
+++ b/ui-common/src/components/modals/OasModal/OasModal.tsx
@@ -1,10 +1,10 @@
 import { Box, Fade, FormControl, Modal, Backdrop } from "@mui/material";
 import { useCallback, useEffect, useState } from "react";
 import { RedocStandalone } from "redoc";
-import closeIcon from "./assets/closeIcon.svg";
+import closeIcon from "assets/closeIcon.svg";
 import { toast } from 'react-toastify';
 import style from './OasModal.module.sass';
-import openApiLogo from './assets/openApiLogo.png'
+import openApiLogo from 'assets/openApiLogo.png'
 import { redocThemeOptions } from "./redocThemeOptions";
 import React from "react";
 import { TOAST_CONTAINER_ID } from "../../../configs/Consts";
diff --git a/ui-common/src/components/modals/ServiceMapModal/ServiceMapModal.tsx b/ui-common/src/components/modals/ServiceMapModal/ServiceMapModal.tsx
index 1af4ef448..281484b6b 100644
--- a/ui-common/src/components/modals/ServiceMapModal/ServiceMapModal.tsx
+++ b/ui-common/src/components/modals/ServiceMapModal/ServiceMapModal.tsx
@@ -1,15 +1,15 @@
 import React, { useState, useEffect, useCallback, useMemo } from "react";
 import { Box, Fade, Modal, Backdrop, Button } from "@mui/material";
 import { toast } from "react-toastify";
-import spinnerImg from '../../assets/spinner.svg';
+import spinnerImg from 'assets/spinner.svg';
 import Graph from "react-graph-vis";
 import debounce from 'lodash/debounce';
 import ServiceMapOptions from './ServiceMapOptions'
 import { useCommonStyles } from "../../../helpers/commonStyle";
-import refreshIcon from "./assets/refresh.svg";
-import filterIcon from "./assets/filter-icon.svg";
-import filterIconClicked from "./assets/filter-icon-clicked.svg";
-import closeIcon from "./assets/close.svg"
+import refreshIcon from "assets/refresh.svg";
+import filterIcon from "assets/filter-icon.svg";
+import filterIconClicked from "assets/filter-icon-clicked.svg";
+import closeIcon from "assets/close.svg"
 import styles from './ServiceMapModal.module.sass'
 import SelectList from "../../UI/SelectList/SelectList";
 import { GraphData, ServiceMapGraph } from "./ServiceMapModalTypes"
diff --git a/ui-common/src/components/modals/ServiceMapModal/assets/spinner.svg b/ui-common/src/components/modals/ServiceMapModal/assets/spinner.svg
new file mode 100644
index 000000000..16ac582fa
--- /dev/null
+++ b/ui-common/src/components/modals/ServiceMapModal/assets/spinner.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="margin: auto; background: none; display: block; shape-rendering: auto;" width="200px" height="200px" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid">
+<circle cx="50" cy="50" fill="none" stroke="#1d3f72" stroke-width="10" r="35" stroke-dasharray="164.93361431346415 56.97787143782138" transform="rotate(275.903 50 50)">
+  <animateTransform attributeName="transform" type="rotate" repeatCount="indefinite" dur="1s" values="0 50 50;360 50 50" keyTimes="0;1"></animateTransform>
+</circle>
+<!-- [ldio] generated by https://loading.io/ --></svg>
\ No newline at end of file