diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/components/layout-dropdown-button.js b/services/web/frontend/js/features/editor-navigation-toolbar/components/layout-dropdown-button.js
index 820da8b1d3..9429c94d03 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/components/layout-dropdown-button.js
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/components/layout-dropdown-button.js
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
 import PropTypes from 'prop-types'
-import { Dropdown, MenuItem } from 'react-bootstrap'
+import { Dropdown, MenuItem, OverlayTrigger, Tooltip } from 'react-bootstrap'
 import { Trans, useTranslation } from 'react-i18next'
 import Icon from '../../../shared/components/icon'
 import IconChecked from '../../../shared/components/icon-checked'
@@ -91,12 +91,19 @@ function LayoutDropdownButton() {
       )}
       <ControlledDropdown
         id="layout-dropdown"
-        className="toolbar-item"
+        className="toolbar-item layout-dropdown"
         pullRight
       >
         <Dropdown.Toggle className="btn-full-height" bsStyle="link">
           {processing ? <IconRefresh /> : <IconLayout />}
           <span className="toolbar-label">{t('layout')}</span>
+          <OverlayTrigger
+            placement="bottom"
+            overlay={<Tooltip id="pdf-detach-badge">Beta feature</Tooltip>}
+            delayHide={100}
+          >
+            <span className="beta-badge" />
+          </OverlayTrigger>
         </Dropdown.Toggle>
         <Dropdown.Menu id="layout-dropdown-list">
           <MenuItem onSelect={() => handleChangeLayout('sideBySide')}>
@@ -121,12 +128,14 @@ function LayoutDropdownButton() {
               detachRole={detachRole}
             />
             <IconEditorOnly />
-            <Trans
-              i18nKey="editor_only_hide_pdf"
-              components={[
-                <span key="editor_only_hide_pdf" className="subdued" />,
-              ]}
-            />
+            <span>
+              <Trans
+                i18nKey="editor_only_hide_pdf"
+                components={[
+                  <span key="editor_only_hide_pdf" className="subdued" />,
+                ]}
+              />
+            </span>
           </MenuItem>
 
           <MenuItem
@@ -140,12 +149,14 @@ function LayoutDropdownButton() {
               detachRole={detachRole}
             />
             <IconPdfOnly />
-            <Trans
-              i18nKey="pdf_only_hide_editor"
-              components={[
-                <span key="pdf_only_hide_editor" className="subdued" />,
-              ]}
-            />
+            <span>
+              <Trans
+                i18nKey="pdf_only_hide_editor"
+                components={[
+                  <span key="pdf_only_hide_editor" className="subdued" />,
+                ]}
+              />
+            </span>
           </MenuItem>
 
           {detachRole === 'detacher' ? (
@@ -161,6 +172,24 @@ function LayoutDropdownButton() {
               {t('pdf_in_separate_tab')}
             </MenuItem>
           )}
+
+          <MenuItem divider />
+          <div className="pdf-detach-survey">
+            <span>
+              <span className="beta-badge" />
+            </span>
+            <span className="pdf-detach-survey-text">
+              The Layout menu and opening the PDF in a new tab are beta
+              features.{' '}
+              <a
+                href="https://docs.google.com/forms/d/e/1FAIpQLScuxQA8Az9NQwvYgC6FALG7FEtCCj4e8of27e_L0SXGrJFRMw/viewform"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {t('give_feedback')}.
+              </a>
+            </span>
+          </div>
         </Dropdown.Menu>
       </ControlledDropdown>
     </>
diff --git a/services/web/frontend/stylesheets/app/editor/toolbar.less b/services/web/frontend/stylesheets/app/editor/toolbar.less
index 073962f7ba..935efdece0 100644
--- a/services/web/frontend/stylesheets/app/editor/toolbar.less
+++ b/services/web/frontend/stylesheets/app/editor/toolbar.less
@@ -165,6 +165,17 @@
   text-decoration: none !important;
 }
 
+.layout-dropdown {
+  .pdf-detach-survey {
+    display: flex;
+    font-size: @font-size-small;
+  }
+
+  .pdf-detach-survey-text {
+    margin-left: @margin-sm;
+    white-space: normal;
+  }
+}
 #layout-dropdown-list {
   a {
     i,
@@ -408,6 +419,11 @@
 }
 
 .menu-item-with-svg {
+  a {
+    align-items: center;
+    display: flex !important;
+  }
+
   svg {
     line,
     rect {