diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00544e3..e80cb35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * Add `helm-ff-file-extension` face.
 * Add `rmail` support.
 * Add `tab-bar-mode` support.
+* Add `tab-line-mode` support.
 * [#367](https://github.com/bbatsov/zenburn-emacs/pull/367): Brighten org headline levels 7 and 8 to improve contrast and possibly help those with color blindness.
 * Add support for `ansi-color` faces.
 * Add support for SLY faces.
diff --git a/zenburn-theme.el b/zenburn-theme.el
index b9974c3..6627db7 100644
--- a/zenburn-theme.el
+++ b/zenburn-theme.el
@@ -1549,13 +1549,41 @@ Also bind `class' to ((class color) (min-colors 89))."
                                         :box (:line-width -1 :style released-button)))))
 ;;;;; tab-bar
    `(tab-bar ((t (:background ,zenburn-bg+1))))
-   `(tab-bar-tab ((t (:foreground ,zenburn-fg
-                                  :background ,zenburn-bg
-                                  :weight bold
-                                  :box (:line-width -1 :style released-button)))))
-   `(tab-bar-tab-inactive ((t (:foreground ,zenburn-fg
-                                           :background ,zenburn-bg+1
-                                           :box (:line-width -1 :style released-button)))))
+   `(tab-bar-tab
+     ((t (:foreground ,zenburn-fg
+                      :background ,zenburn-bg
+                      :weight bold
+                      :height 1.1
+                      :box (:line-width (6 . 4) :color ,zenburn-bg :style nil)))))
+   `(tab-bar-tab-inactive
+     ((t (:foreground ,zenburn-fg
+                      :background ,zenburn-bg+1
+                      :height 1.1
+                      :box (:line-width (6 . 4) :color ,zenburn-bg+1 :style nil)))))
+;;;;; tab-line
+   `(tab-line ((t (:background ,zenburn-bg+1))))
+   `(tab-line-tab
+     ((t (:foreground ,zenburn-fg
+                      :background ,zenburn-bg+1
+                      :box (:line-width (6 . 4) :color ,zenburn-bg+1 :style nil)))))
+   `(tab-line-tab-inactive
+     ((t (:foreground ,zenburn-fg
+                      :background ,zenburn-bg+1
+                      :box (:line-width (6 . 4) :color ,zenburn-bg+1 :style nil)))))
+   `(tab-line-tab-current
+     ((t (:foreground ,zenburn-fg
+                      :background ,zenburn-bg
+                      :weight bold
+                      :box (:line-width (6 . 4) :color ,zenburn-bg :style nil)))))
+   `(tab-line-highlight
+     ((t (:foreground ,zenburn-fg
+                      :background ,zenburn-bg+2
+                      :box (:line-width (6 . 4) :color ,zenburn-bg+2 :style nil)))))
+   `(tab-line-tab-group
+     ((t (:foreground ,zenburn-fg
+                      :background ,zenburn-bg-1
+                      :weight bold
+                      :box (:line-width (6 . 4) :color ,zenburn-bg-1 :style nil)))))
 ;;;;; term
    `(term-color-black ((t (:foreground ,zenburn-bg
                                        :background ,zenburn-bg-1))))
@@ -1688,6 +1716,12 @@ Also bind `class' to ((class color) (min-colors 89))."
        ,zenburn-cyan ,zenburn-blue+1 ,zenburn-magenta))
 ;;;;; pdf-tools
    `(pdf-view-midnight-colors '(,zenburn-fg . ,zenburn-bg-05))
+;;;;; tab-bar
+   ;; For some reason, the padding doesn't display properly if the
+   ;; tab-bar-separator is "", swe we use a zero-width space instead
+   `(tab-bar-separator "\u200b")
+;;;;; tab-line
+   `(tab-line-separator "\u200b")
 ;;;;; vc-annotate
    `(vc-annotate-color-map
      '(( 20. . ,zenburn-red-1)