diff --git a/external/lang b/external/lang
index 09955e9d..e3b83ab1 160000
--- a/external/lang
+++ b/external/lang
@@ -1 +1 @@
-Subproject commit 09955e9d30c19c1a180fd3aacdb85961641da2bc
+Subproject commit e3b83ab17a6021de7957a3030d5ead6d9eeb38d3
diff --git a/src/pages/settings/panes/Feedback.tsx b/src/pages/settings/panes/Feedback.tsx
index f7e2075f..b9850334 100644
--- a/src/pages/settings/panes/Feedback.tsx
+++ b/src/pages/settings/panes/Feedback.tsx
@@ -1,50 +1,15 @@
 import { Github } from "@styled-icons/boxicons-logos";
-import { ListOl } from "@styled-icons/boxicons-regular";
+import { BugAlt, Group, ListOl } from "@styled-icons/boxicons-regular";
+import { Link } from "react-router-dom";
 
 import styles from "./Panes.module.scss";
-import { Localizer, Text } from "preact-i18n";
-import { useState } from "preact/hooks";
+import { Text } from "preact-i18n";
 
-import { useClient } from "../../../context/revoltjs/RevoltClient";
-
-import Button from "../../../components/ui/Button";
-import InputBox from "../../../components/ui/InputBox";
-import Radio from "../../../components/ui/Radio";
-import TextArea from "../../../components/ui/TextArea";
 import CategoryButton from "../../../components/ui/fluent/CategoryButton";
 
 export function Feedback() {
-    const client = useClient();
-    const [other, setOther] = useState("");
-    const [description, setDescription] = useState("");
-    const [state, setState] = useState<"ready" | "sending" | "sent">("ready");
-    const [checked, setChecked] = useState<
-        "Bug" | "Feature Request" | "__other_option__"
-    >("Bug");
-
-    async function onSubmit(ev: JSX.TargetedEvent<HTMLFormElement, Event>) {
-        ev.preventDefault();
-        setState("sending");
-
-        await fetch(`https://workers.revolt.chat/feedback`, {
-            method: "POST",
-            body: JSON.stringify({
-                checked,
-                other,
-                description,
-                name: client.user!.username,
-            }),
-            mode: "no-cors",
-        });
-
-        setState("sent");
-        setChecked("Bug");
-        setDescription("");
-        setOther("");
-    }
-
     return (
-        <form className={styles.feedback} onSubmit={onSubmit}>
+        <div className={styles.feedback}>
             <a
                 href="https://github.com/revoltchat/revolt/discussions"
                 target="_blank"
@@ -53,8 +18,10 @@ export function Feedback() {
                     hover
                     action="external"
                     icon={<Github size={24} />}
-                    description="Suggest new Revolt features on GitHub discussions.">
-                    Submit feature suggestion
+                    description={
+                        <Text id="app.settings.pages.feedback.suggest_desc" />
+                    }>
+                    <Text id="app.settings.pages.feedback.suggest" />
                 </CategoryButton>
             </a>
             <a
@@ -65,54 +32,37 @@ export function Feedback() {
                     hover
                     action="external"
                     icon={<ListOl size={24} />}
-                    description="To help us more easily triage issues, you can create an issue on GitHub.">
-                    Create a new GitHub issue
+                    description={
+                        <Text id="app.settings.pages.feedback.issue_desc" />
+                    }>
+                    <Text id="app.settings.pages.feedback.issue" />
                 </CategoryButton>
             </a>
-            <h3>
-                <Text id="app.settings.pages.feedback.report" />
-            </h3>
-            <div className={styles.options}>
-                <Radio
-                    checked={checked === "Bug"}
-                    disabled={state === "sending"}
-                    onSelect={() => setChecked("Bug")}>
+            <a
+                href="https://github.com/orgs/revoltchat/projects/1"
+                target="_blank"
+                rel="noreferrer">
+                <CategoryButton
+                    hover
+                    action="external"
+                    icon={<BugAlt size={24} />}
+                    description={
+                        <Text id="app.settings.pages.feedback.bug_desc" />
+                    }>
                     <Text id="app.settings.pages.feedback.bug" />
-                </Radio>
-                <Radio
-                    disabled={state === "sending"}
-                    checked={checked === "__other_option__"}
-                    onSelect={() => setChecked("__other_option__")}>
-                    <Localizer>
-                        <InputBox
-                            value={other}
-                            disabled={state === "sending"}
-                            name="entry.1151440373.other_option_response"
-                            onChange={(e) => setOther(e.currentTarget.value)}
-                            placeholder={
-                                (
-                                    <Text id="app.settings.pages.feedback.other" />
-                                ) as unknown as string
-                            }
-                        />
-                    </Localizer>
-                </Radio>
-            </div>
-            <h3>
-                <Text id="app.settings.pages.feedback.describe" />
-            </h3>
-            <TextArea
-                // maxRows={10}
-                value={description}
-                id="entry.685672624"
-                disabled={state === "sending"}
-                onChange={(ev) => setDescription(ev.currentTarget.value)}
-            />
-            <p>
-                <Button type="submit" contrast>
-                    <Text id="app.settings.pages.feedback.send" />
-                </Button>
-            </p>
-        </form>
+                </CategoryButton>
+            </a>
+            <Link to="/invite/Testers">
+                <a target="_blank" rel="noreferrer">
+                    <CategoryButton
+                        hover
+                        action="chevron"
+                        icon={<Group size={24} />}
+                        description="You can report issues and discuss improvements with us directly here.">
+                        Join Testers server.
+                    </CategoryButton>
+                </a>
+            </Link>
+        </div>
     );
 }