diff --git a/epicyon-profile.css b/epicyon-profile.css
index 5d9a80fc..43925a1b 100644
--- a/epicyon-profile.css
+++ b/epicyon-profile.css
@@ -21,6 +21,7 @@
     --main-visited-color: #888;
     --border-color: #505050;
     --border-width: 2px;
+    --border-width-header: 2px;
     --font-size-header: 18px;
     --font-size-header-mobile: 32px;
     --font-color-header: #ccc;
@@ -372,6 +373,14 @@ a:focus {
     margin: 10px;
 }
 
+.containerHeader {
+    border: var(--border-width-header) solid var(--border-color);
+    background-color: var(--main-bg-color);
+    border-radius: var(--timeline-border-radius);
+    padding: 20px;
+    margin: 10px;
+}
+
 .media {
     width: 80%;
     border-radius: 5px;
diff --git a/theme.py b/theme.py
index fda4aeec..51ce2194 100644
--- a/theme.py
+++ b/theme.py
@@ -321,6 +321,7 @@ def setThemeIndymediaClassic(baseDir: str):
         "main-bg-color-dm": "#0b0a0a",
         "border-color": "#003366",
         "border-width": "0",
+        "border-width-header": "0",
         "main-bg-color-reply": "#0f0d10",
         "main-bg-color-report": "#0f0d10",
         "hashtag-vertical-spacing3": "100px",
@@ -481,6 +482,7 @@ def setThemeStarlight(baseDir: str):
         "main-bg-color-dm": "#0b0a0a",
         "border-color": "#69282c",
         "border-width": "3px",
+        "border-width-header": "3px",
         "main-bg-color-reply": "#0f0d10",
         "main-bg-color-report": "#0f0d10",
         "hashtag-vertical-spacing3": "100px",
@@ -548,6 +550,7 @@ def setThemeHenge(baseDir: str):
         "main-bg-color-dm": "#343335",
         "border-color": "#222",
         "border-width": "5px",
+        "border-width-header": "5px",
         "main-bg-color-reply": "#383335",
         "main-bg-color-report": "#383335",
         "hashtag-vertical-spacing3": "100px",
@@ -599,6 +602,7 @@ def setThemeZen(baseDir: str):
         "day-number2": "#5c4e41",
         "border-color": "#463b35",
         "border-width": "7px",
+        "border-width-header": "7px",
         "main-link-color": "#dddddd",
         "main-link-color-hover": "white",
         "title-color": "#dddddd",
@@ -669,6 +673,7 @@ def setThemeLCD(baseDir: str):
         "main-fg-color": "#33390d",
         "border-color": "#33390d",
         "border-width": "5px",
+        "border-width-header": "5px",
         "main-link-color": "#9fb42b",
         "main-link-color-hover": "#cfb42b",
         "title-color": "#9fb42b",
@@ -916,6 +921,7 @@ def setThemeLight(baseDir: str):
 def setThemeIndymediaModern(baseDir: str):
     name = 'indymediamodern'
     themeParams = {
+        "border-width-header": "0px",
         "tab-border-width": "3px",
         "tab-border-color": "grey",
         "button-corner-radius": "0px",
diff --git a/webinterface.py b/webinterface.py
index 04f96714..37294154 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -5949,7 +5949,7 @@ def getTimelineButtonHeader(defaultTimeline: str,
     buttons for inbox, outbox, search, calendar, etc
     """
     # start of the button header with inbox, outbox, etc
-    tlStr = '    <div class="container">\n'
+    tlStr = '    <div class="containerHeader">\n'
     # first button
     if defaultTimeline == 'tlmedia':
         tlStr += \