diff --git a/.gitignore b/.gitignore
index 84a9c66cd..71947782e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /yarn.lock
 /npm-debug.log
 .DS_Store
+.prettierignore
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 366b5f240..f1b15e61d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -65,7 +65,7 @@
                 "terser-webpack-plugin": "5.2.4",
                 "webpack": "5.61.0",
                 "webpack-cli": "4.9.1",
-                "webpack-dev-server": "4.7.4",
+                "webpack-dev-server": "^4.7.4",
                 "workbox-webpack-plugin": "^6.5.3"
             }
         },
diff --git a/package.json b/package.json
index d8d32d32d..c26a659d9 100755
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
         "terser-webpack-plugin": "5.2.4",
         "webpack": "5.61.0",
         "webpack-cli": "4.9.1",
-        "webpack-dev-server": "4.7.4",
+        "webpack-dev-server": "^4.7.4",
         "workbox-webpack-plugin": "^6.5.3"
     }
 }
diff --git a/src/common/NavBar/HorizontalNavBar/HorizontalNavBar.js b/src/common/NavBar/HorizontalNavBar/HorizontalNavBar.js
index e1d6ee77a..376291700 100644
--- a/src/common/NavBar/HorizontalNavBar/HorizontalNavBar.js
+++ b/src/common/NavBar/HorizontalNavBar/HorizontalNavBar.js
@@ -19,7 +19,7 @@ const HorizontalNavBar = React.memo(({ className, route, query, title, backButto
     const [fullscreen, requestFullscreen, exitFullscreen] = useFullscreen();
     const renderNavMenuLabel = React.useCallback(({ ref, className, onClick, children, }) => (
         <Button ref={ref} className={classnames(className, styles['button-container'], styles['menu-button-container'])} tabIndex={-1} onClick={onClick}>
-            <Icon className={styles['icon']} name={'more-vertical'} />
+            <Icon className={styles['icon']} name={'person-outline'} />
             {children}
         </Button>
     ), []);
@@ -55,7 +55,7 @@ const HorizontalNavBar = React.memo(({ className, route, query, title, backButto
                 {
                     addonsButton ?
                         <Button className={styles['button-container']} href={'#/addons'} title={t('ADDONS')} tabIndex={-1}>
-                            <Icon className={styles['icon']} name={'addons'} />
+                            <Icon className={styles['icon']} name={'addons-outline'} />
                         </Button>
                         :
                         null
diff --git a/src/common/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js b/src/common/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js
index 6c8acdf00..ab130e62c 100644
--- a/src/common/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js
+++ b/src/common/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js
@@ -71,7 +71,7 @@ const NavMenuContent = ({ onClick }) => {
                     <div className={styles['nav-menu-option-label']}>{ t('SETTINGS') }</div>
                 </Button>
                 <Button className={styles['nav-menu-option-container']} title={ t('ADDONS') } href={'#/addons'}>
-                    <Icon className={styles['icon']} name={'addons'} />
+                    <Icon className={styles['icon']} name={'addons-outline'} />
                     <div className={styles['nav-menu-option-label']}>{ t('ADDONS') }</div>
                 </Button>
                 <Button className={styles['nav-menu-option-container']} title={ t('PLAY_URL_MAGNET_LINK') } onClick={onPlayMagnetLinkClick}>
diff --git a/src/routes/Search/Search.js b/src/routes/Search/Search.js
index b6996258b..bdba1a32e 100644
--- a/src/routes/Search/Search.js
+++ b/src/routes/Search/Search.js
@@ -49,14 +49,27 @@ const Search = ({ queryParams }) => {
             <div ref={scrollContainerRef} className={styles['search-content']} onScroll={onScroll}>
                 {
                     query === null ?
-                        <div className={classnames(styles['search-hints-container'], 'animation-fade-in')}>
-                            <div className={styles['search-hint-container']}>
-                                <Icon className={styles['icon']} name={'movies'} />
-                                <div className={styles['label']}>{ t('SEARCH_EXPLANATION_CONTENT') }</div>
+                        <div className={classnames(styles['search-hints-wrapper'])}>
+                            <div className={classnames(styles['search-hints-title-container'], 'animation-fade-in')}>
+                                <div className={styles['search-hints-title']}>{t('SEARCH_HINTS_TITLE')}</div>
                             </div>
-                            <div className={styles['search-hint-container']}>
-                                <Icon className={styles['icon']} name={'actors'} />
-                                <div className={styles['label']}>{ t('SEARCH_EXPLANATION_PEOPLE') }</div>
+                            <div className={classnames(styles['search-hints-container'], 'animation-fade-in')}>
+                                <div className={styles['search-hint-container']}>
+                                    <Icon className={styles['icon']} name={'trailer'} />
+                                    <div className={styles['label']}>{t('SEARCH_HINTS_CONTENT')}</div>
+                                </div>
+                                <div className={styles['search-hint-container']}>
+                                    <Icon className={styles['icon']} name={'actors'} />
+                                    <div className={styles['label']}>{t('SEARCH_HINTS_ACTORS')}</div>
+                                </div>
+                                <div className={styles['search-hint-container']}>
+                                    <Icon className={styles['icon']} name={'link'} />
+                                    <div className={styles['label']}>{t('SEARCH_HINTS_LINKS')}</div>
+                                </div>
+                                <div className={styles['search-hint-container']}>
+                                    <Icon className={styles['icon']} name={'imdb-outline'} />
+                                    <div className={styles['label']}>{t('SEARCH_HINTS_IMDB')}</div>
+                                </div>
                             </div>
                         </div>
                         :
diff --git a/src/routes/Search/styles.less b/src/routes/Search/styles.less
index 6ee49d356..efcfbf500 100644
--- a/src/routes/Search/styles.less
+++ b/src/routes/Search/styles.less
@@ -24,42 +24,70 @@
         .search-row {
             margin: 4rem 2rem;
         }
-
-        .search-hints-container {
+        .search-hints-wrapper {
             display: flex;
-            flex-direction: row;
-            align-items: flex-start;
-            justify-content: flex-start;
-            align-content: flex-start;
-            flex-wrap: wrap;
-            padding: 4rem;
+            align-items: center;
+            justify-content: center;
+            flex-direction: column;
+            width: 100%;
+            height: 100%;
 
-            .search-hint-container {
-                flex: 0 0 50%;
+            .search-hints-title-container {
                 display: flex;
-                flex-direction: column;
-                align-items: center;
                 justify-content: center;
-                padding: 0 2rem;
-                margin-bottom: 4rem;
-
-                .icon {
-                    flex: none;
-                    width: 6rem;
-                    height: 6rem;
-                    margin-bottom: 2rem;
-                    color: @color-surface-light5-90;
-                }
-
-                .label {
+                align-items: center;
+                padding: 0 1rem;
+                .search-hints-title {
                     flex-grow: 0;
                     flex-shrink: 1;
                     flex-basis: auto;
-                    font-size: 1.2rem;
+                    font-size: 1.6rem;
                     color: @color-surface-light5-90;
                     text-align: center;
+                    opacity: 0.4;
                 }
             }
+    
+            .search-hints-container {
+                display: flex;
+                flex-direction: row;
+                align-items: flex-start;
+                justify-content: center;
+                align-content: flex-start;
+                flex-wrap: wrap;
+                padding: 4rem;
+                max-width: 50%;
+                margin: 0 auto;
+    
+                .search-hint-container {
+                    flex: 0 0 25%;
+                    display: flex;
+                    flex-direction: column;
+                    align-items: center;
+                    justify-content: center;
+                    padding: 0 1rem;
+                    margin-bottom: 4rem;
+    
+                    .icon {
+                        flex: none;
+                        width: 4rem;
+                        height: 4rem;
+                        margin-bottom: 2rem;
+                        color: @color-surface-light5-90;
+                        opacity: 0.4;
+                    }
+    
+                    .label {
+                        flex-grow: 0;
+                        flex-shrink: 1;
+                        flex-basis: auto;
+                        font-size: 1.2rem;
+                        color: @color-surface-light5-90;
+                        text-align: center;
+                        opacity: 0.4;
+                    }
+                }
+            }  
         }
 
         .message-container {
@@ -135,6 +163,11 @@
 @media only screen and (max-width: @medium) {
     .search-container {
         .search-content {
+            .search-hints-wrapper {
+                .search-hints-container {
+                    max-width: 70%;
+                }
+            }
             .search-row-poster, .search-row-square {
                 .meta-item, .meta-item-placeholder {
                     &:nth-child(n+8) {
@@ -157,6 +190,11 @@
 @media only screen and (max-width: @small) {
     .search-container {
         .search-content {
+            .search-hints-wrapper {
+                .search-hints-container {
+                    max-width: 90%;
+                }
+            }
             .search-row-poster, .search-row-square {
                 .meta-item, .meta-item-placeholder {
                     &:nth-child(n+7) {
@@ -201,6 +239,15 @@
 @media only screen and (max-width: @xxsmall) {
     .search-container {
         .search-content {
+            .search-hints-wrapper {
+                margin-top: 4rem;
+                .search-hints-container {
+                    max-width: 100%;
+                    .search-hint-container {
+                        flex: 0 0 50%;
+                    }
+                }
+            }
             .search-row-poster, .search-row-square {
                 .meta-item, .meta-item-placeholder {
                     &:nth-child(n+5) {
@@ -235,11 +282,12 @@
                 }
             }
 
-            .search-hints-container {
-                padding: 4rem 2rem;
-
-                .search-hint-container {
-                    padding: 0 1.5rem;
+            .search-hints-wrapper {
+                .search-hints-container {
+                    padding: 4rem 2rem;
+                    .search-hint-container {
+                        padding: 0 1.5rem;
+                    }
                 }
             }
         }