diff --git a/src/components/style_switcher/style_switcher.scss b/src/components/style_switcher/style_switcher.scss
index c8c5d9dd77..f53f00a001 100644
--- a/src/components/style_switcher/style_switcher.scss
+++ b/src/components/style_switcher/style_switcher.scss
@@ -248,6 +248,12 @@
       .panel-heading {
         .badge, .alert, .btn, .faint {
           margin-left: 1em;
+          white-space: nowrap;
+        }
+        .faint {
+          text-overflow: ellipsis;
+          min-width: 2em;
+          overflow-x: hidden;
         }
         .flex-spacer {
           flex: 1;
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index d0e5ea87dc..fbd3321b60 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -11,7 +11,8 @@
     position: relative;
     justify-content: center;
     width: 100%;
-    overflow: hidden;
+    overflow-y: hidden;
+    overflow-x: auto;
     padding-top: 5px;
     height: 32px;
     box-sizing: border-box;
@@ -33,6 +34,7 @@
       border-bottom-left-radius: 0;
       border-bottom-right-radius: 0;
       padding: 5px 1em 99px;
+      white-space: nowrap;
 
       &:not(.active) {
         z-index: 4;
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 890ed6c4d2..c0d30b59c1 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -273,7 +273,7 @@
         "custom": "Custom"
       },
       "preview": {
-        "header": "Preview of header",
+        "header": "Preview",
         "content": "Content",
         "error": "Example error",
         "button": "Button",