diff --git a/src/pages/settings/panes/Audio.tsx b/src/pages/settings/panes/Audio.tsx
index 093d83cd..f65d07c0 100644
--- a/src/pages/settings/panes/Audio.tsx
+++ b/src/pages/settings/panes/Audio.tsx
@@ -94,6 +94,33 @@ export function Audio() {
     return (
         <>
             <div className={styles.audio}>
+                <Tip palette="warning">
+                    <span>
+                        We are currently{" "}
+                        <a
+                            style={{ color: "inherit", fontWeight: "600" }}
+                            href="https://github.com/revoltchat/frontend/issues/14"
+                            target="_blank"
+                            rel="noreferrer">
+                            rebuilding the client
+                        </a>{" "}
+                        and{" "}
+                        <a
+                            style={{ color: "inherit", fontWeight: "600" }}
+                            href="https://trello.com/c/Ay6KdiOV/1-voice-overhaul-and-video-calling"
+                            target="_blank"
+                            rel="noreferrer">
+                            the voice server
+                        </a>{" "}
+                        from scratch.
+                        <br />
+                        <br />
+                        The old voice should work in most cases, but it may
+                        inexplicably not connect in some scenarios and / or
+                        exhibit weird behaviour.
+                    </span>
+                </Tip>
+
                 {!permission && (
                     <Tip palette="error">
                         <Text id="app.settings.pages.audio.tip_grant_permission" />
diff --git a/src/pages/settings/panes/Feedback.tsx b/src/pages/settings/panes/Feedback.tsx
index c22eba74..fe85eae4 100644
--- a/src/pages/settings/panes/Feedback.tsx
+++ b/src/pages/settings/panes/Feedback.tsx
@@ -5,60 +5,76 @@ import { Link } from "react-router-dom";
 import styles from "./Panes.module.scss";
 import { Text } from "preact-i18n";
 
-import { CategoryButton } from "@revoltchat/ui";
+import { CategoryButton, Column, Tip } from "@revoltchat/ui";
 
 export function Feedback() {
     return (
-        <div className={styles.feedback}>
-            <a
-                href="https://github.com/revoltchat/revolt/discussions"
-                target="_blank"
-                rel="noreferrer">
-                <CategoryButton
-                    action="external"
-                    icon={<Github size={24} />}
-                    description={
-                        <Text id="app.settings.pages.feedback.suggest_desc" />
-                    }>
-                    <Text id="app.settings.pages.feedback.suggest" />
-                </CategoryButton>
-            </a>
-            <a
-                href="https://github.com/revoltchat/revite/issues/new/choose"
-                target="_blank"
-                rel="noreferrer">
-                <CategoryButton
-                    action="external"
-                    icon={<ListOl size={24} />}
-                    description={
-                        <Text id="app.settings.pages.feedback.issue_desc" />
-                    }>
-                    <Text id="app.settings.pages.feedback.issue" />
-                </CategoryButton>
-            </a>
-            <a
-                href="https://github.com/orgs/revoltchat/projects/3"
-                target="_blank"
-                rel="noreferrer">
-                <CategoryButton
-                    action="external"
-                    icon={<BugAlt size={24} />}
-                    description={
-                        <Text id="app.settings.pages.feedback.bug_desc" />
-                    }>
-                    <Text id="app.settings.pages.feedback.bug" />
-                </CategoryButton>
-            </a>
-            <Link to="/invite/Testers">
-                <a>
+        <Column>
+            <Tip palette="warning">
+                <span>
+                    We are currently rebuilding the client from scratch. You can{" "}
+                    <a
+                        style={{ color: "inherit", fontWeight: "600" }}
+                        href="https://github.com/revoltchat/frontend/issues/14"
+                        target="_blank"
+                        rel="noreferrer">
+                        view our progress here
+                    </a>
+                    ; in the meantime, we are only accepting and fixing critical
+                    bugs with the current client.
+                </span>
+            </Tip>
+            <div className={styles.feedback}>
+                <a
+                    href="https://github.com/revoltchat/revolt/discussions"
+                    target="_blank"
+                    rel="noreferrer">
                     <CategoryButton
-                        action="chevron"
-                        icon={<Group size={24} />}
-                        description="You can report issues and discuss improvements with us directly here.">
-                        {"Join the Revolt Lounge"}
+                        action="external"
+                        icon={<Github size={24} />}
+                        description={
+                            <Text id="app.settings.pages.feedback.suggest_desc" />
+                        }>
+                        <Text id="app.settings.pages.feedback.suggest" />
                     </CategoryButton>
                 </a>
-            </Link>
-        </div>
+                <a
+                    href="https://github.com/revoltchat/revite/issues/new/choose"
+                    target="_blank"
+                    rel="noreferrer">
+                    <CategoryButton
+                        action="external"
+                        icon={<ListOl size={24} />}
+                        description={
+                            <Text id="app.settings.pages.feedback.issue_desc" />
+                        }>
+                        <Text id="app.settings.pages.feedback.issue" />
+                    </CategoryButton>
+                </a>
+                <a
+                    href="https://github.com/orgs/revoltchat/projects/3"
+                    target="_blank"
+                    rel="noreferrer">
+                    <CategoryButton
+                        action="external"
+                        icon={<BugAlt size={24} />}
+                        description={
+                            <Text id="app.settings.pages.feedback.bug_desc" />
+                        }>
+                        <Text id="app.settings.pages.feedback.bug" />
+                    </CategoryButton>
+                </a>
+                <Link to="/invite/Testers">
+                    <a>
+                        <CategoryButton
+                            action="chevron"
+                            icon={<Group size={24} />}
+                            description="You can report issues and discuss improvements with us directly here.">
+                            {"Join the Revolt Lounge"}
+                        </CategoryButton>
+                    </a>
+                </Link>
+            </div>
+        </Column>
     );
 }