diff --git a/theme-source/partials/base-body.tsx b/theme-source/partials/base-body.tsx
index bde12f959289d7fafadac8d5428d182b2a1e8e5e..fe283105c79a9502a63beb1228bed26c18ae53ed 100644
--- a/theme-source/partials/base-body.tsx
+++ b/theme-source/partials/base-body.tsx
@@ -3,10 +3,25 @@ import { SymbolSearch, SymbolMenu, SymbolFacebook } from './svgs'
 import { Search } from './search'
 import { css } from '@emotion/react'
 
-const hideOnSmallAndUp = css`
-  display: none;
-  @media (max-width: 300px) {
-    display: block;
+function hideOnAndUp(px: number) {
+  return css`
+    display: none;
+    @media (max-width: ${px}px) {
+      display: block;
+    }
+  `
+}
+
+const hideOnSmallAndUp = hideOnAndUp(300)
+const hideOnMedAndUp = hideOnAndUp(600)
+const hideOnUltraSmall = css`
+  @media (max-width: 330px) {
+    display: none !important;
+  }
+`
+const hideOnSmallAndDown = css`
+  @media (max-width: 600px) {
+    display: none !important;
   }
 `
 
@@ -25,7 +40,8 @@ export function BaseBody({
         <div className="nav-wrapper container">
           <a
             data-activates="nav-mobile"
-            className="menu-icon hide-on-med-and-up"
+            css={hideOnMedAndUp}
+            className="menu-icon"
             style={{ float: 'left' }}
           >
             <SymbolMenu color="#fff" size={false} />
@@ -34,24 +50,24 @@ export function BaseBody({
             <a id="logo-container" href="/tag/vse/1/">
               <img css={hideOnSmallAndUp} src="/theme/icon56.png" />
               <img
-                className="hide-on-med-and-up hide-on-ultra-small"
+                css={[hideOnMedAndUp, hideOnUltraSmall]}
                 src="/theme/logo56.png"
               />
               <img
-                className="hide-on-small-only"
+                css={hideOnSmallAndDown}
                 src="/theme/logo64.png"
                 alt="Radioklub OK1KVK"
               />
             </a>
           </div>
           <div className="toplinks">
-            <a className="hide-on-small-only left" id="aktuality">
+            <a css={hideOnSmallAndDown} className="left" id="aktuality">
               Aktuality
             </a>
-            <a className="hide-on-small-only left" id="clanky">
+            <a css={hideOnSmallAndDown} className="left" id="clanky">
               Články
             </a>
-            <a className="hide-on-small-only left" id="o-nas">
+            <a css={hideOnSmallAndDown} className="left" id="o-nas">
               O nás
             </a>
             <a className="search-icon left">
@@ -171,7 +187,11 @@ export function BaseBody({
       </ul>
 
       {/* Lower nav */}
-      <nav className="subnav subnav1 hide-on-small-and-down" role="navigation">
+      <nav
+        css={hideOnSmallAndDown}
+        className="subnav subnav1"
+        role="navigation"
+      >
         <div className="nav-wrapper container">
           <ul className="right">
             <li>
@@ -190,7 +210,11 @@ export function BaseBody({
         </div>
       </nav>
       {/* Lower nav 2 - Aktuality */}
-      <nav className="subnav subnav2 hide-on-small-and-down" role="navigation">
+      <nav
+        css={hideOnSmallAndDown}
+        className="subnav subnav2"
+        role="navigation"
+      >
         <div className="nav-wrapper container">
           <ul className="right">
             <li>
@@ -209,7 +233,11 @@ export function BaseBody({
         </div>
       </nav>
       {/* Lower nav 3 - Články */}
-      <nav className="subnav subnav3 hide-on-small-and-down" role="navigation">
+      <nav
+        css={hideOnSmallAndDown}
+        className="subnav subnav3"
+        role="navigation"
+      >
         <div className="nav-wrapper container">
           <ul className="right">
             <li>
diff --git a/theme-source/partials/list.tsx b/theme-source/partials/list.tsx
index 5c2ee82a2e3a065b669f6440b0e64a12c44e6694..4d54ca4bca6f9dd1443e18bb1d7b1aa0731de561 100644
--- a/theme-source/partials/list.tsx
+++ b/theme-source/partials/list.tsx
@@ -15,6 +15,12 @@ function relURL(filename, dir_) {
   return `${dir}/${filename}`
 }
 
+const hideOnSmallAndDown = css`
+  @media (max-width: 600px) {
+    display: none !important;
+  }
+`
+
 export function List({ subtags, tag, content, metadata, file, config }) {
   return (
     <div id="content" className="container">
@@ -70,7 +76,7 @@ export function List({ subtags, tag, content, metadata, file, config }) {
         <Paginator metadata={metadata} file={file} config={config} />
       </div>
 
-      <div className="hide-on-small-only">
+      <div css={hideOnSmallAndDown}>
         {metadata.prevurl && (
           <div style={{ left: 0 }} className="sidelink sidelink-l">
             <a href={`/${metadata.prevurl}`}>
diff --git a/theme-source/sass/components/_global.scss b/theme-source/sass/components/_global.scss
index 0006139cd7eee55fbb315361333801e723a62cf2..f1c2a4be1bc17e8dda034634c65f32b2ab5ca038 100644
--- a/theme-source/sass/components/_global.scss
+++ b/theme-source/sass/components/_global.scss
@@ -280,11 +280,6 @@ ul.staggered-list li {
 /*********************
   Media Query Classes
 **********************/
-.hide-on-small-only, .hide-on-small-and-down {
-  @media #{$small-and-down} {
-    display: none !important;
-  }
-}
 .hide-on-med-and-down {
   @media #{$medium-and-down} {
     display: none !important;