diff --git a/public/assets/banners/compare.png b/public/assets/banners/compare.png
deleted file mode 100644
index 7c7f25e6c..000000000
Binary files a/public/assets/banners/compare.png and /dev/null differ
diff --git a/public/assets/banners/compare.webp b/public/assets/banners/compare.webp
deleted file mode 100644
index 1e7c40f5a..000000000
Binary files a/public/assets/banners/compare.webp and /dev/null differ
diff --git a/public/assets/banners/discord.png b/public/assets/banners/discord.png
deleted file mode 100644
index 33ad626ab..000000000
Binary files a/public/assets/banners/discord.png and /dev/null differ
diff --git a/public/assets/banners/discord.webp b/public/assets/banners/discord.webp
deleted file mode 100644
index e91139b5b..000000000
Binary files a/public/assets/banners/discord.webp and /dev/null differ
diff --git a/public/assets/banners/home.webp b/public/assets/banners/home.webp
deleted file mode 100644
index cb798539b..000000000
Binary files a/public/assets/banners/home.webp and /dev/null differ
diff --git a/public/assets/banners/inactive.png b/public/assets/banners/inactive.png
deleted file mode 100644
index 8a35e9050..000000000
Binary files a/public/assets/banners/inactive.png and /dev/null differ
diff --git a/public/assets/banners/inactive.webp b/public/assets/banners/inactive.webp
deleted file mode 100644
index fa8451375..000000000
Binary files a/public/assets/banners/inactive.webp and /dev/null differ
diff --git a/public/assets/banners/more.png b/public/assets/banners/more.png
deleted file mode 100644
index 42a94cb3e..000000000
Binary files a/public/assets/banners/more.png and /dev/null differ
diff --git a/public/assets/banners/more.webp b/public/assets/banners/more.webp
deleted file mode 100644
index b051719ec..000000000
Binary files a/public/assets/banners/more.webp and /dev/null differ
diff --git a/public/assets/banners/profile.png b/public/assets/banners/profile.png
deleted file mode 100644
index 50ce06971..000000000
Binary files a/public/assets/banners/profile.png and /dev/null differ
diff --git a/public/assets/banners/profile.webp b/public/assets/banners/profile.webp
deleted file mode 100644
index 4d1738670..000000000
Binary files a/public/assets/banners/profile.webp and /dev/null differ
diff --git a/public/assets/banners/rating.png b/public/assets/banners/rating.png
deleted file mode 100644
index 653b7e285..000000000
Binary files a/public/assets/banners/rating.png and /dev/null differ
diff --git a/public/assets/banners/rating.webp b/public/assets/banners/rating.webp
deleted file mode 100644
index b9fce5658..000000000
Binary files a/public/assets/banners/rating.webp and /dev/null differ
diff --git a/public/assets/banners/session.png b/public/assets/banners/session.png
deleted file mode 100644
index e1cf8874b..000000000
Binary files a/public/assets/banners/session.png and /dev/null differ
diff --git a/public/assets/banners/session.webp b/public/assets/banners/session.webp
deleted file mode 100644
index f1ff01fb2..000000000
Binary files a/public/assets/banners/session.webp and /dev/null differ
diff --git a/public/assets/banners/statistics.png b/public/assets/banners/statistics.png
deleted file mode 100644
index ca1135d32..000000000
Binary files a/public/assets/banners/statistics.png and /dev/null differ
diff --git a/public/assets/banners/statistics.webp b/public/assets/banners/statistics.webp
deleted file mode 100644
index 3e08ad923..000000000
Binary files a/public/assets/banners/statistics.webp and /dev/null differ
diff --git a/public/assets/banners/tankopedia.png b/public/assets/banners/tankopedia.png
deleted file mode 100644
index 0700db917..000000000
Binary files a/public/assets/banners/tankopedia.png and /dev/null differ
diff --git a/public/assets/banners/tankopedia.webp b/public/assets/banners/tankopedia.webp
deleted file mode 100644
index 99dddecad..000000000
Binary files a/public/assets/banners/tankopedia.webp and /dev/null differ
diff --git a/src/components/Navbar/index.css.ts b/src/components/Navbar/index.css.ts
index 4820b320e..20a1d37e6 100644
--- a/src/components/Navbar/index.css.ts
+++ b/src/components/Navbar/index.css.ts
@@ -1,10 +1,10 @@
 import { style, styleVariants } from '@vanilla-extract/css';
 
-const MAX_EXPANDED_TOOLS = 680;
+const MIN_EXPANDED_TOOLS = 752;
 
 export const hamburgerButton = style({
   '@media': {
-    [`screen and (min-width: ${MAX_EXPANDED_TOOLS}px)`]: {
+    [`screen and (min-width: ${MIN_EXPANDED_TOOLS}px)`]: {
       display: 'none',
     },
   },
@@ -49,7 +49,7 @@ export const toolCard = style({
 
 export const toolTexts = style({
   '@media': {
-    [`screen and (max-width: ${MAX_EXPANDED_TOOLS}px)`]: {
+    [`screen and (max-width: ${MIN_EXPANDED_TOOLS}px)`]: {
       display: 'none',
     },
   },
diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx
index 50efdd3b5..d013f65e4 100644
--- a/src/components/Navbar/index.tsx
+++ b/src/components/Navbar/index.tsx
@@ -18,13 +18,14 @@ import {
   Separator,
   Text,
 } from '@radix-ui/themes';
-import { usePathname, useRouter } from 'next/navigation';
+import { usePathname } from 'next/navigation';
 import { useState } from 'react';
 import { REGIONS } from '../../constants/regions';
 import { TOOLS } from '../../constants/tools';
 import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
 import { logoutPatreon } from '../../core/blitz/logoutPatreon';
 import { logoutWargaming } from '../../core/blitz/logoutWargaming';
+import { imgur, ImgurSize } from '../../core/blitzkit/imgur';
 import { patreonLoginUrl } from '../../core/blitzkit/patreonLoginUrl';
 import { BlitzkitWide } from '../../icons/BlitzkitWide';
 import { PatreonIcon } from '../../icons/Patreon';
@@ -38,10 +39,10 @@ import * as styles from './index.css';
 export const NAVBAR_HEIGHT = 64;
 
 export default function Navbar() {
-  const router = useRouter();
   const [showHamburgerMenu, setShowHamburgerMenu] = useState(false);
   const pathname = usePathname();
   const logins = useApp((state) => state.logins);
+  const filteredTools = TOOLS.filter((tool) => !tool.href);
 
   return (
     <Box
@@ -80,7 +81,7 @@ export default function Navbar() {
           </Flex>
 
           <Flex justify="center" gap="4" className={styles.toolTexts}>
-            {TOOLS.filter((tool) => !tool.href).map((tool) => {
+            {filteredTools.map((tool) => {
               const selected = pathname.startsWith(`/tools/${tool.id}`);
 
               return (
@@ -247,13 +248,16 @@ export default function Navbar() {
         </Flex>
 
         <Flex mt="6" gap="3" justify="center" wrap="wrap">
-          {TOOLS.filter((tool) => !tool.href).map((tool) => (
+          {filteredTools.map((tool) => (
             <Link
               key={tool.id}
               href={`/tools/${tool.id}`}
               className={styles.toolCard}
               style={{
-                backgroundImage: `url(/assets/banners/${tool.id}.webp)`,
+                backgroundImage: `url(${imgur(tool.image, {
+                  format: 'jpeg',
+                  size: ImgurSize.MediumThumbnail,
+                })})`,
                 cursor: tool.disabled ? 'default' : 'pointer',
                 opacity: tool.disabled ? 0.25 : 1,
                 height: 64,
diff --git a/src/constants/tools.tsx b/src/constants/tools.tsx
index 09c425023..b6ea94a20 100644
--- a/src/constants/tools.tsx
+++ b/src/constants/tools.tsx
@@ -120,11 +120,11 @@ export const tankPerformanceTool: Tool = {
 
 export const TOOLS: Tool[] = [
   tankopediaTool,
-  ratingTool,
   compareTool,
+  tankPerformanceTool,
   // playerStatsTool,
   sessionTool,
+  ratingTool,
   discordTool,
   moreTool,
-  tankPerformanceTool,
 ];