diff --git a/favicons/favicon.ico b/assets/favicons/favicon.ico
similarity index 100%
rename from favicons/favicon.ico
rename to assets/favicons/favicon.ico
diff --git a/fonts/PlusJakartaSans.ttf b/assets/fonts/PlusJakartaSans.ttf
similarity index 100%
rename from fonts/PlusJakartaSans.ttf
rename to assets/fonts/PlusJakartaSans.ttf
diff --git a/images/anonymous.png b/assets/images/anonymous.png
similarity index 100%
rename from images/anonymous.png
rename to assets/images/anonymous.png
diff --git a/images/background_1.svg b/assets/images/background_1.svg
similarity index 100%
rename from images/background_1.svg
rename to assets/images/background_1.svg
diff --git a/images/background_2.svg b/assets/images/background_2.svg
similarity index 100%
rename from images/background_2.svg
rename to assets/images/background_2.svg
diff --git a/images/calendar_placeholder.png b/assets/images/calendar_placeholder.png
similarity index 100%
rename from images/calendar_placeholder.png
rename to assets/images/calendar_placeholder.png
diff --git a/images/default_avatar.png b/assets/images/default_avatar.png
similarity index 100%
rename from images/default_avatar.png
rename to assets/images/default_avatar.png
diff --git a/images/empty.png b/assets/images/empty.png
similarity index 100%
rename from images/empty.png
rename to assets/images/empty.png
diff --git a/images/icon.png b/assets/images/icon.png
similarity index 100%
rename from images/icon.png
rename to assets/images/icon.png
diff --git a/images/icon_196x196.png b/assets/images/icon_196x196.png
similarity index 100%
rename from images/icon_196x196.png
rename to assets/images/icon_196x196.png
diff --git a/images/icon_512x512.png b/assets/images/icon_512x512.png
similarity index 100%
rename from images/icon_512x512.png
rename to assets/images/icon_512x512.png
diff --git a/images/library_placeholder.png b/assets/images/library_placeholder.png
similarity index 100%
rename from images/library_placeholder.png
rename to assets/images/library_placeholder.png
diff --git a/images/logo.png b/assets/images/logo.png
similarity index 100%
rename from images/logo.png
rename to assets/images/logo.png
diff --git a/images/maskable_icon.png b/assets/images/maskable_icon.png
similarity index 100%
rename from images/maskable_icon.png
rename to assets/images/maskable_icon.png
diff --git a/images/maskable_icon_196x196.png b/assets/images/maskable_icon_196x196.png
similarity index 100%
rename from images/maskable_icon_196x196.png
rename to assets/images/maskable_icon_196x196.png
diff --git a/images/maskable_icon_512x512.png b/assets/images/maskable_icon_512x512.png
similarity index 100%
rename from images/maskable_icon_512x512.png
rename to assets/images/maskable_icon_512x512.png
diff --git a/images/stremio_symbol.png b/assets/images/stremio_symbol.png
similarity index 100%
rename from images/stremio_symbol.png
rename to assets/images/stremio_symbol.png
diff --git a/screenshots/board.png b/assets/screenshots/board.png
similarity index 100%
rename from screenshots/board.png
rename to assets/screenshots/board.png
diff --git a/screenshots/board_narrow.webp b/assets/screenshots/board_narrow.webp
similarity index 100%
rename from screenshots/board_narrow.webp
rename to assets/screenshots/board_narrow.webp
diff --git a/screenshots/board_wide.webp b/assets/screenshots/board_wide.webp
similarity index 100%
rename from screenshots/board_wide.webp
rename to assets/screenshots/board_wide.webp
diff --git a/screenshots/discover.png b/assets/screenshots/discover.png
similarity index 100%
rename from screenshots/discover.png
rename to assets/screenshots/discover.png
diff --git a/screenshots/metadetails.png b/assets/screenshots/metadetails.png
similarity index 100%
rename from screenshots/metadetails.png
rename to assets/screenshots/metadetails.png
diff --git a/src/App/ErrorDialog/ErrorDialog.js b/src/App/ErrorDialog/ErrorDialog.js
index a2b31ba41..eac9b34ac 100644
--- a/src/App/ErrorDialog/ErrorDialog.js
+++ b/src/App/ErrorDialog/ErrorDialog.js
@@ -22,7 +22,7 @@ const ErrorDialog = ({ className }) => {
         <div className={classnames(className, styles['error-container'])}>
             <Image
                 className={styles['error-image']}
-                src={require('/images/empty.png')}
+                src={require('/assets/images/empty.png')}
                 alt={' '}
             />
             <div className={styles['error-message']}>
diff --git a/src/App/styles.less b/src/App/styles.less
index ae6555500..e6fd7d747 100644
--- a/src/App/styles.less
+++ b/src/App/styles.less
@@ -5,7 +5,7 @@
 
 @font-face {
     font-family: 'PlusJakartaSans';
-    src: url('/fonts/PlusJakartaSans.ttf') format('truetype');
+    src: url('/assets/fonts/PlusJakartaSans.ttf') format('truetype');
 }
 
 :global {
diff --git a/src/components/NavBar/HorizontalNavBar/HorizontalNavBar.js b/src/components/NavBar/HorizontalNavBar/HorizontalNavBar.js
index 6be35cd5d..65bf30c94 100644
--- a/src/components/NavBar/HorizontalNavBar/HorizontalNavBar.js
+++ b/src/components/NavBar/HorizontalNavBar/HorizontalNavBar.js
@@ -35,7 +35,7 @@ const HorizontalNavBar = React.memo(({ className, route, query, title, backButto
                     <div className={styles['logo-container']}>
                         <Image
                             className={styles['logo']}
-                            src={require('/images/stremio_symbol.png')}
+                            src={require('/assets/images/stremio_symbol.png')}
                             alt={' '}
                         />
                     </div>
diff --git a/src/components/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js b/src/components/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js
index de0a02212..4b2fdc87e 100644
--- a/src/components/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js
+++ b/src/components/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js
@@ -52,12 +52,12 @@ const NavMenuContent = ({ onClick }) => {
                     className={styles['avatar-container']}
                     style={{
                         backgroundImage: profile.auth === null ?
-                            `url('${require('/images/anonymous.png')}')`
+                            `url('${require('/assets/images/anonymous.png')}')`
                             :
                             profile.auth.user.avatar ?
                                 `url('${profile.auth.user.avatar}')`
                                 :
-                                `url('${require('/images/default_avatar.png')}')`
+                                `url('${require('/assets/images/default_avatar.png')}')`
                     }}
                 />
                 <div className={styles['user-info-details']}>
diff --git a/src/routes/Calendar/Placeholder/Placeholder.tsx b/src/routes/Calendar/Placeholder/Placeholder.tsx
index c84e7a1b8..1f87acb26 100644
--- a/src/routes/Calendar/Placeholder/Placeholder.tsx
+++ b/src/routes/Calendar/Placeholder/Placeholder.tsx
@@ -17,7 +17,7 @@ const Placeholder = () => {
             <div className={styles['image-container']}>
                 <Image
                     className={styles['image']}
-                    src={require('/images/calendar_placeholder.png')}
+                    src={require('/assets/images/calendar_placeholder.png')}
                     alt={' '}
                 />
             </div>
diff --git a/src/routes/Discover/Discover.js b/src/routes/Discover/Discover.js
index 6f32d1f9a..a28a86405 100644
--- a/src/routes/Discover/Discover.js
+++ b/src/routes/Discover/Discover.js
@@ -133,14 +133,14 @@ const Discover = ({ urlParams, queryParams }) => {
                         discover.catalog === null ?
                             <DelayedRenderer delay={500}>
                                 <div className={styles['message-container']}>
-                                    <Image className={styles['image']} src={require('/images/empty.png')} alt={' '} />
+                                    <Image className={styles['image']} src={require('/assets/images/empty.png')} alt={' '} />
                                     <div className={styles['message-label']}>{t('NO_CATALOG_SELECTED')}</div>
                                 </div>
                             </DelayedRenderer>
                             :
                             discover.catalog.content.type === 'Err' ?
                                 <div className={styles['message-container']}>
-                                    <Image className={styles['image']} src={require('/images/empty.png')} alt={' '} />
+                                    <Image className={styles['image']} src={require('/assets/images/empty.png')} alt={' '} />
                                     <div className={styles['message-label']}>{discover.catalog.content.content}</div>
                                 </div>
                                 :
diff --git a/src/routes/Intro/Intro.js b/src/routes/Intro/Intro.js
index f04302fc7..5a2f80aaa 100644
--- a/src/routes/Intro/Intro.js
+++ b/src/routes/Intro/Intro.js
@@ -296,7 +296,7 @@ const Intro = ({ queryParams }) => {
             <div className={styles['background-container']} />
             <div className={styles['heading-container']}>
                 <div className={styles['logo-container']}>
-                    <Image className={styles['logo']} src={require('/images/logo.png')} alt={' '} />
+                    <Image className={styles['logo']} src={require('/assets/images/logo.png')} alt={' '} />
                 </div>
                 <div className={styles['title-container']}>
                     {t('WEBSITE_SLOGAN_NEW_NEW')}
diff --git a/src/routes/Intro/styles.less b/src/routes/Intro/styles.less
index 31a09d54c..4a6f6ec8e 100644
--- a/src/routes/Intro/styles.less
+++ b/src/routes/Intro/styles.less
@@ -19,7 +19,7 @@
         bottom: -1rem;
         left: -1rem;
         right: -1rem;
-        background: url('/images/background_1.svg'), url('/images/background_2.svg');
+        background: url('/assets/images/background_1.svg'), url('/assets/images/background_2.svg');
         background-color: var(--primary-background-color);
         background-position: bottom left, top right;
         background-size: 53%, 54%;
diff --git a/src/routes/Library/Library.js b/src/routes/Library/Library.js
index 16a4c79b5..8307b786a 100644
--- a/src/routes/Library/Library.js
+++ b/src/routes/Library/Library.js
@@ -85,7 +85,7 @@ const Library = ({ model, urlParams, queryParams }) => {
                                     <div className={styles['message-container']}>
                                         <Image
                                             className={styles['image']}
-                                            src={require('/images/empty.png')}
+                                            src={require('/assets/images/empty.png')}
                                             alt={' '}
                                         />
                                         <div className={styles['message-label']}>{model === 'library' ? t('LIBRARY_NOT_LOADED') : t('BOARD_CONTINUE_WATCHING_NOT_LOADED')}</div>
@@ -96,7 +96,7 @@ const Library = ({ model, urlParams, queryParams }) => {
                                     <div className={styles['message-container']}>
                                         <Image
                                             className={styles['image']}
-                                            src={require('/images/empty.png')}
+                                            src={require('/assets/images/empty.png')}
                                             alt={' '}
                                         />
                                         <div className={styles['message-label']}>{model === 'library' ? t('LIBRARY_EMPTY') : t('BOARD_CONTINUE_WATCHING_EMPTY')}</div>
diff --git a/src/routes/Library/Placeholder/Placeholder.tsx b/src/routes/Library/Placeholder/Placeholder.tsx
index d854a2d54..a066324e0 100644
--- a/src/routes/Library/Placeholder/Placeholder.tsx
+++ b/src/routes/Library/Placeholder/Placeholder.tsx
@@ -17,7 +17,7 @@ const Placeholder = () => {
             <div className={styles['image-container']}>
                 <Image
                     className={styles['image']}
-                    src={require('/images/library_placeholder.png')}
+                    src={require('/assets/images/library_placeholder.png')}
                     alt={' '}
                 />
             </div>
diff --git a/src/routes/MetaDetails/MetaDetails.js b/src/routes/MetaDetails/MetaDetails.js
index fd27478b5..926671080 100644
--- a/src/routes/MetaDetails/MetaDetails.js
+++ b/src/routes/MetaDetails/MetaDetails.js
@@ -130,20 +130,20 @@ const MetaDetails = ({ urlParams, queryParams }) => {
                     metaPath === null ?
                         <DelayedRenderer delay={500}>
                             <div className={styles['meta-message-container']}>
-                                <Image className={styles['image']} src={require('/images/empty.png')} alt={' '} />
+                                <Image className={styles['image']} src={require('/assets/images/empty.png')} alt={' '} />
                                 <div className={styles['message-label']}>{t('ERR_NO_META_SELECTED')}</div>
                             </div>
                         </DelayedRenderer>
                         :
                         metaDetails.metaItem === null ?
                             <div className={styles['meta-message-container']}>
-                                <Image className={styles['image']} src={require('/images/empty.png')} alt={' '} />
+                                <Image className={styles['image']} src={require('/assets/images/empty.png')} alt={' '} />
                                 <div className={styles['message-label']}>{t('ERR_NO_ADDONS_FOR_META')}</div>
                             </div>
                             :
                             metaDetails.metaItem.content.type === 'Err' ?
                                 <div className={styles['meta-message-container']}>
-                                    <Image className={styles['image']} src={require('/images/empty.png')} alt={' '} />
+                                    <Image className={styles['image']} src={require('/assets/images/empty.png')} alt={' '} />
                                     <div className={styles['message-label']}>{t('ERR_NO_META_FOUND')}</div>
                                 </div>
                                 :
diff --git a/src/routes/MetaDetails/StreamsList/StreamsList.js b/src/routes/MetaDetails/StreamsList/StreamsList.js
index eebc0c3cf..7021644ab 100644
--- a/src/routes/MetaDetails/StreamsList/StreamsList.js
+++ b/src/routes/MetaDetails/StreamsList/StreamsList.js
@@ -132,7 +132,7 @@ const StreamsList = ({ className, video, type, onEpisodeSearch, ...props }) => {
                                 <SeasonEpisodePicker className={styles['search']} onSubmit={handleEpisodePicker} />
                                 : null
                         }
-                        <Image className={styles['image']} src={require('/images/empty.png')} alt={' '} />
+                        <Image className={styles['image']} src={require('/assets/images/empty.png')} alt={' '} />
                         <div className={styles['label']}>{t('ERR_NO_ADDONS_FOR_STREAMS')}</div>
                     </div>
                     :
@@ -148,7 +148,7 @@ const StreamsList = ({ className, video, type, onEpisodeSearch, ...props }) => {
                                     <div className={styles['label']}>{t('UPCOMING')}...</div>
                                     : null
                             }
-                            <Image className={styles['image']} src={require('/images/empty.png')} alt={' '} />
+                            <Image className={styles['image']} src={require('/assets/images/empty.png')} alt={' '} />
                             <div className={styles['label']}>{t('NO_STREAM')}</div>
                             {
                                 showInstallAddonsButton ?
diff --git a/src/routes/MetaDetails/VideosList/VideosList.js b/src/routes/MetaDetails/VideosList/VideosList.js
index 8891947db..3cc3832d6 100644
--- a/src/routes/MetaDetails/VideosList/VideosList.js
+++ b/src/routes/MetaDetails/VideosList/VideosList.js
@@ -124,7 +124,7 @@ const VideosList = ({ className, metaItem, libraryItem, season, seasonOnSelect,
                     metaItem.content.type === 'Err' || videosForSeason.length === 0 ?
                         <div className={styles['message-container']}>
                             <EpisodePicker className={styles['episode-picker']} onSubmit={onSeasonSearch} />
-                            <Image className={styles['image']} src={require('/images/empty.png')} alt={' '} />
+                            <Image className={styles['image']} src={require('/assets/images/empty.png')} alt={' '} />
                             <div className={styles['label']}>{t('ERR_NO_VIDEOS_FOR_META')}</div>
                         </div>
                         :
diff --git a/src/routes/NotFound/NotFound.js b/src/routes/NotFound/NotFound.js
index d984496bc..a3c97d8c1 100644
--- a/src/routes/NotFound/NotFound.js
+++ b/src/routes/NotFound/NotFound.js
@@ -19,7 +19,7 @@ const NotFound = () => {
             <div className={styles['not-found-content']}>
                 <Image
                     className={styles['not-found-image']}
-                    src={require('/images/empty.png')}
+                    src={require('/assets/images/empty.png')}
                     alt={' '}
                 />
                 <div className={styles['not-found-label']}>{t('PAGE_NOT_FOUND')}</div>
diff --git a/src/routes/Player/BufferingLoader/BufferingLoader.js b/src/routes/Player/BufferingLoader/BufferingLoader.js
index 3d5664ae4..a762506f4 100644
--- a/src/routes/Player/BufferingLoader/BufferingLoader.js
+++ b/src/routes/Player/BufferingLoader/BufferingLoader.js
@@ -13,7 +13,7 @@ const BufferingLoader = React.forwardRef(({ className, logo }, ref) => {
                 className={styles['buffering-loader']}
                 src={logo}
                 alt={' '}
-                fallbackSrc={require('/images/stremio_symbol.png')}
+                fallbackSrc={require('/assets/images/stremio_symbol.png')}
             />
         </div>
     );
diff --git a/src/routes/Search/Search.js b/src/routes/Search/Search.js
index 58e6e834b..6990ccfd8 100644
--- a/src/routes/Search/Search.js
+++ b/src/routes/Search/Search.js
@@ -78,7 +78,7 @@ const Search = ({ queryParams }) => {
                             <div className={styles['message-container']}>
                                 <Image
                                     className={styles['image']}
-                                    src={require('/images/empty.png')}
+                                    src={require('/assets/images/empty.png')}
                                     alt={' '}
                                 />
                                 <div className={styles['message-label']}>{ t.string('STREMIO_TV_SEARCH_NO_ADDONS') }</div>
diff --git a/src/routes/Settings/General/User/User.tsx b/src/routes/Settings/General/User/User.tsx
index 6b44e9903..7555e521e 100644
--- a/src/routes/Settings/General/User/User.tsx
+++ b/src/routes/Settings/General/User/User.tsx
@@ -14,12 +14,12 @@ const User = ({ profile }: Props) => {
 
     const avatar = useMemo(() => (
         !profile.auth ?
-            `url('${require('/images/anonymous.png')}')`
+            `url('${require('/assets/images/anonymous.png')}')`
             :
             profile.auth.user.avatar ?
                 `url('${profile.auth.user.avatar}')`
                 :
-                `url('${require('/images/default_avatar.png')}')`
+                `url('${require('/assets/images/default_avatar.png')}')`
     ), [profile.auth]);
 
     const onLogout = useCallback(() => {
diff --git a/webpack.config.js b/webpack.config.js
index 5c6df3871..3a2cdc58c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -228,9 +228,9 @@ module.exports = (env, argv) => ({
             }),
         new CopyWebpackPlugin({
             patterns: [
-                { from: 'favicons', to: 'favicons' },
-                { from: 'images', to: 'images' },
-                { from: 'screenshots/*.webp', to: './' },
+                { from: 'assets/favicons', to: 'favicons' },
+                { from: 'assets/images', to: 'images' },
+                { from: 'assets/screenshots/*.webp', to: 'screenshots/[name][ext]' },
                 { from: '.well-known', to: '.well-known' },
                 { from: 'manifest.json', to: 'manifest.json' },
             ]