diff --git a/src/common/NavBar/AddonsButton/AddonsButton.js b/src/common/NavBar/HorizontalNavBar/AddonsButton/AddonsButton.js
similarity index 100%
rename from src/common/NavBar/AddonsButton/AddonsButton.js
rename to src/common/NavBar/HorizontalNavBar/AddonsButton/AddonsButton.js
diff --git a/src/common/NavBar/AddonsButton/index.js b/src/common/NavBar/HorizontalNavBar/AddonsButton/index.js
similarity index 100%
rename from src/common/NavBar/AddonsButton/index.js
rename to src/common/NavBar/HorizontalNavBar/AddonsButton/index.js
diff --git a/src/common/NavBar/AddonsButton/styles.less b/src/common/NavBar/HorizontalNavBar/AddonsButton/styles.less
similarity index 100%
rename from src/common/NavBar/AddonsButton/styles.less
rename to src/common/NavBar/HorizontalNavBar/AddonsButton/styles.less
diff --git a/src/common/NavBar/FullscreenButton/FullscreenButton.js b/src/common/NavBar/HorizontalNavBar/FullscreenButton/FullscreenButton.js
similarity index 100%
rename from src/common/NavBar/FullscreenButton/FullscreenButton.js
rename to src/common/NavBar/HorizontalNavBar/FullscreenButton/FullscreenButton.js
diff --git a/src/common/NavBar/FullscreenButton/index.js b/src/common/NavBar/HorizontalNavBar/FullscreenButton/index.js
similarity index 100%
rename from src/common/NavBar/FullscreenButton/index.js
rename to src/common/NavBar/HorizontalNavBar/FullscreenButton/index.js
diff --git a/src/common/NavBar/FullscreenButton/styles.less b/src/common/NavBar/HorizontalNavBar/FullscreenButton/styles.less
similarity index 100%
rename from src/common/NavBar/FullscreenButton/styles.less
rename to src/common/NavBar/HorizontalNavBar/FullscreenButton/styles.less
diff --git a/src/common/NavBar/HorizontalNavBar/HorizontalNavBar.js b/src/common/NavBar/HorizontalNavBar/HorizontalNavBar.js
index 5a7a1c58d..460607339 100644
--- a/src/common/NavBar/HorizontalNavBar/HorizontalNavBar.js
+++ b/src/common/NavBar/HorizontalNavBar/HorizontalNavBar.js
@@ -4,11 +4,11 @@ const classnames = require('classnames');
 const Icon = require('stremio-icons/dom');
 const Button = require('stremio/common/Button');
 const Image = require('stremio/common/Image');
-const SearchBar = require('../SearchBar');
-const AddonsButton = require('../AddonsButton');
-const FullscreenButton = require('../FullscreenButton');
-const NotificationsMenu = require('../NotificationsMenu');
-const NavMenu = require('../NavMenu');
+const SearchBar = require('./SearchBar');
+const AddonsButton = require('./AddonsButton');
+const FullscreenButton = require('./FullscreenButton');
+const NotificationsMenu = require('./NotificationsMenu');
+const NavMenu = require('./NavMenu');
 const styles = require('./styles');
 
 const HorizontalNavBar = React.memo(({ className, route, query, title, backButton, searchBar, addonsButton, fullscreenButton, notificationsMenu, navMenu }) => {
diff --git a/src/common/NavBar/NavMenu/NavMenu.js b/src/common/NavBar/HorizontalNavBar/NavMenu/NavMenu.js
similarity index 100%
rename from src/common/NavBar/NavMenu/NavMenu.js
rename to src/common/NavBar/HorizontalNavBar/NavMenu/NavMenu.js
diff --git a/src/common/NavBar/NavMenu/index.js b/src/common/NavBar/HorizontalNavBar/NavMenu/index.js
similarity index 100%
rename from src/common/NavBar/NavMenu/index.js
rename to src/common/NavBar/HorizontalNavBar/NavMenu/index.js
diff --git a/src/common/NavBar/NavMenu/styles.less b/src/common/NavBar/HorizontalNavBar/NavMenu/styles.less
similarity index 100%
rename from src/common/NavBar/NavMenu/styles.less
rename to src/common/NavBar/HorizontalNavBar/NavMenu/styles.less
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsList/Notification/Notification.js b/src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/Notification/Notification.js
similarity index 100%
rename from src/common/NavBar/NotificationsMenu/NotificationsList/Notification/Notification.js
rename to src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/Notification/Notification.js
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsList/Notification/index.js b/src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/Notification/index.js
similarity index 100%
rename from src/common/NavBar/NotificationsMenu/NotificationsList/Notification/index.js
rename to src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/Notification/index.js
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsList/Notification/styles.less b/src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/Notification/styles.less
similarity index 100%
rename from src/common/NavBar/NotificationsMenu/NotificationsList/Notification/styles.less
rename to src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/Notification/styles.less
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/NotificationPlaceholder.js b/src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/NotificationPlaceholder.js
similarity index 100%
rename from src/common/NavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/NotificationPlaceholder.js
rename to src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/NotificationPlaceholder.js
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/index.js b/src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/index.js
similarity index 100%
rename from src/common/NavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/index.js
rename to src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/index.js
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/styles.less b/src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/styles.less
similarity index 100%
rename from src/common/NavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/styles.less
rename to src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/NotificationPlaceholder/styles.less
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsList/NotificationsList.js b/src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/NotificationsList.js
similarity index 100%
rename from src/common/NavBar/NotificationsMenu/NotificationsList/NotificationsList.js
rename to src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/NotificationsList.js
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsList/index.js b/src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/index.js
similarity index 100%
rename from src/common/NavBar/NotificationsMenu/NotificationsList/index.js
rename to src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/index.js
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsList/styles.less b/src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/styles.less
similarity index 100%
rename from src/common/NavBar/NotificationsMenu/NotificationsList/styles.less
rename to src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsList/styles.less
diff --git a/src/common/NavBar/NotificationsMenu/NotificationsMenu.js b/src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsMenu.js
similarity index 100%
rename from src/common/NavBar/NotificationsMenu/NotificationsMenu.js
rename to src/common/NavBar/HorizontalNavBar/NotificationsMenu/NotificationsMenu.js
diff --git a/src/common/NavBar/NotificationsMenu/index.js b/src/common/NavBar/HorizontalNavBar/NotificationsMenu/index.js
similarity index 100%
rename from src/common/NavBar/NotificationsMenu/index.js
rename to src/common/NavBar/HorizontalNavBar/NotificationsMenu/index.js
diff --git a/src/common/NavBar/NotificationsMenu/styles.less b/src/common/NavBar/HorizontalNavBar/NotificationsMenu/styles.less
similarity index 100%
rename from src/common/NavBar/NotificationsMenu/styles.less
rename to src/common/NavBar/HorizontalNavBar/NotificationsMenu/styles.less
diff --git a/src/common/NavBar/NotificationsMenu/useNotifications.js b/src/common/NavBar/HorizontalNavBar/NotificationsMenu/useNotifications.js
similarity index 100%
rename from src/common/NavBar/NotificationsMenu/useNotifications.js
rename to src/common/NavBar/HorizontalNavBar/NotificationsMenu/useNotifications.js
diff --git a/src/common/NavBar/SearchBar/SearchBar.js b/src/common/NavBar/HorizontalNavBar/SearchBar/SearchBar.js
similarity index 100%
rename from src/common/NavBar/SearchBar/SearchBar.js
rename to src/common/NavBar/HorizontalNavBar/SearchBar/SearchBar.js
diff --git a/src/common/NavBar/SearchBar/index.js b/src/common/NavBar/HorizontalNavBar/SearchBar/index.js
similarity index 100%
rename from src/common/NavBar/SearchBar/index.js
rename to src/common/NavBar/HorizontalNavBar/SearchBar/index.js
diff --git a/src/common/NavBar/SearchBar/styles.less b/src/common/NavBar/HorizontalNavBar/SearchBar/styles.less
similarity index 100%
rename from src/common/NavBar/SearchBar/styles.less
rename to src/common/NavBar/HorizontalNavBar/SearchBar/styles.less
diff --git a/src/common/NavBar/NavBar.js b/src/common/NavBar/NavBar.js
deleted file mode 100644
index 0e946f3c4..000000000
--- a/src/common/NavBar/NavBar.js
+++ /dev/null
@@ -1,105 +0,0 @@
-const React = require('react');
-const PropTypes = require('prop-types');
-const classnames = require('classnames');
-const NavTabButton = require('./NavTabButton');
-const SearchBar = require('./SearchBar');
-const AddonsButton = require('./AddonsButton');
-const FullscreenButton = require('./FullscreenButton');
-const NotificationsMenu = require('./NotificationsMenu');
-const NavMenu = require('./NavMenu');
-const styles = require('./styles');
-
-const NavBar = React.memo(({ className, route, query, backButton, tabs, title, searchBar, addonsButton, fullscreenButton, notificationsMenu, navMenu }) => {
-    const backButtonOnClick = React.useCallback(() => {
-        window.history.back();
-    }, []);
-    return (
-        <nav className={classnames(className, styles['nav-bar-container'])}>
-            {
-                backButton ?
-                    <NavTabButton
-                        className={styles['nav-tab-button']}
-                        icon={'ic_back_ios'}
-                        label={'Back'}
-                        onClick={backButtonOnClick}
-                    />
-                    :
-                    null
-            }
-            {
-                Array.isArray(tabs) && tabs.length > 0 ?
-                    tabs.slice(0, 4).map((tab, index) => (
-                        <NavTabButton
-                            key={index}
-                            className={styles['nav-tab-button']}
-                            selected={tab.route === route}
-                            href={tab.href}
-                            icon={tab.icon}
-                            label={tab.label}
-                            onClick={tab.onClick}
-                        />
-                    ))
-                    :
-                    <h2 className={styles['title']}>{title}</h2>
-            }
-            {
-                searchBar ?
-                    <React.Fragment>
-                        <div className={styles['spacing']} />
-                        <SearchBar className={styles['search-bar']} query={query} active={route === 'search'} />
-                        <div className={styles['spacing']} />
-                    </React.Fragment>
-                    :
-                    null
-            }
-            {
-                addonsButton ?
-                    <AddonsButton className={styles['addons-button']} />
-                    :
-                    null
-            }
-            {
-                fullscreenButton ?
-                    <FullscreenButton className={styles['fullscreen-button']} />
-                    :
-                    null
-            }
-            {
-                notificationsMenu ?
-                    <NotificationsMenu className={styles['notifications-menu']} />
-                    :
-                    null
-            }
-            {
-                navMenu ?
-                    <NavMenu className={styles['nav-menu']} />
-                    :
-                    null
-            }
-        </nav>
-    );
-});
-
-NavBar.displayName = 'NavBar';
-
-NavBar.propTypes = {
-    className: PropTypes.string,
-    route: PropTypes.string,
-    query: PropTypes.string,
-    backButton: PropTypes.bool,
-    tabs: PropTypes.arrayOf(PropTypes.shape({
-        route: PropTypes.string,
-        label: PropTypes.string,
-        icon: PropTypes.string,
-        href: PropTypes.string,
-        onClick: PropTypes.func
-    })),
-    title: PropTypes.string,
-    searchBar: PropTypes.bool,
-    addonsButton: PropTypes.bool,
-    fullscreenButton: PropTypes.bool,
-    notificationsMenu: PropTypes.bool,
-    navMenu: PropTypes.bool
-};
-
-module.exports = NavBar;
diff --git a/src/common/NavBar/NavTabButton/NavTabButton.js b/src/common/NavBar/VerticalNavBar/NavTabButton/NavTabButton.js
similarity index 100%
rename from src/common/NavBar/NavTabButton/NavTabButton.js
rename to src/common/NavBar/VerticalNavBar/NavTabButton/NavTabButton.js
diff --git a/src/common/NavBar/NavTabButton/index.js b/src/common/NavBar/VerticalNavBar/NavTabButton/index.js
similarity index 100%
rename from src/common/NavBar/NavTabButton/index.js
rename to src/common/NavBar/VerticalNavBar/NavTabButton/index.js
diff --git a/src/common/NavBar/NavTabButton/styles.less b/src/common/NavBar/VerticalNavBar/NavTabButton/styles.less
similarity index 100%
rename from src/common/NavBar/NavTabButton/styles.less
rename to src/common/NavBar/VerticalNavBar/NavTabButton/styles.less
diff --git a/src/common/NavBar/VerticalNavBar/VerticalNavBar.js b/src/common/NavBar/VerticalNavBar/VerticalNavBar.js
index 67f8492ba..88f00a679 100644
--- a/src/common/NavBar/VerticalNavBar/VerticalNavBar.js
+++ b/src/common/NavBar/VerticalNavBar/VerticalNavBar.js
@@ -1,7 +1,7 @@
 const React = require('react');
 const PropTypes = require('prop-types');
 const classnames = require('classnames');
-const NavTabButton = require('../NavTabButton');
+const NavTabButton = require('./NavTabButton');
 const styles = require('./styles');
 
 const VerticalNavBar = React.memo(({ className, route, tabs }) => {
diff --git a/src/common/NavBar/styles.less b/src/common/NavBar/styles.less
deleted file mode 100644
index 30304c8ec..000000000
--- a/src/common/NavBar/styles.less
+++ /dev/null
@@ -1,51 +0,0 @@
-.nav-bar-container {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    height: var(--nav-bar-size);
-    background-color: var(--color-secondarydark);
-    overflow: visible;
-
-    .nav-tab-button {
-        flex: none;
-        align-self: stretch;
-        max-width: 11rem;
-    }
-
-    .title {
-        flex: 1;
-        padding: 0 1rem;
-        font-size: 1.1rem;
-        font-style: normal;
-        font-weight: 400;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        color: var(--color-surfacelighter);
-
-        &~.spacing {
-            display: none;
-        }
-    }
-
-    .spacing {
-        flex: 1;
-    }
-
-    .search-bar {
-        flex-grow: 0;
-        flex-shrink: 1;
-        flex-basis: 25rem;
-        align-self: stretch;
-        min-width: 9.5rem;
-
-        &+.spacing {
-            max-width: 11rem;
-        }
-    }
-
-    .addons-button, .fullscreen-button, .notifications-menu, .nav-menu {
-        flex: none;
-        width: var(--nav-bar-size);
-        height: var(--nav-bar-size);
-    }
-}
\ No newline at end of file