diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index 88e391936ac6c360dac8116db988fcefe481c2d7..92f23b9a7d5922b78fb13fd532f83a962669766c 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -116,7 +116,7 @@ It picks reviewers and maintainers from the list at the
[engineering projects](https://handbook.gitlab.com/handbook/engineering/projects/)
page, with these behaviors:
-- It doesn't pick people whose Slack or [GitLab status](../user/profile/index.md#set-your-current-status):
+- It doesn't pick people whose Slack or [GitLab status](../user/profile/index.md#set-your-status):
- Contains the string `OOO`, `PTO`, `Parental Leave`, `Friends and Family`, or `Conference`.
- Emoji is from one of these categories:
- **On leave** - 🌴 `palm_tree`, ðŸ–ï¸ `beach`, â›± `beach_umbrella`, 🖠`beach_with_umbrella`, 🌞 `sun_with_face`, 🎡 `ferris_wheel`, 🙠`cityscape`
@@ -125,7 +125,7 @@ page, with these behaviors:
- It doesn't pick people who are already assigned a number of reviews that is equal to
or greater than their chosen "review limit". The review limit is the maximum number of
reviews people are ready to handle at a time. Set a review limit by using one of the following
- as a Slack or [GitLab status](../user/profile/index.md#set-your-current-status):
+ as a Slack or [GitLab status](../user/profile/index.md#set-your-status):
- 2ï¸âƒ£ - `two`
- 3ï¸âƒ£ - `three`
- 4ï¸âƒ£ - `four`
@@ -143,7 +143,7 @@ page, with these behaviors:
branch name (unless their out-of-office (`OOO`) status changes, as in point 1). It
removes leading `ce-` and `ee-`, and trailing `-ce` and `-ee`, so
that it can be stable for backport branches.
-- People whose Slack or [GitLab status](../user/profile/index.md#set-your-current-status) emoji
+- People whose Slack or [GitLab status](../user/profile/index.md#set-your-status) emoji
is â“‚ `:m:`are only suggested as reviewers on projects they are a maintainer of.
The [Roulette dashboard](https://gitlab-org.gitlab.io/gitlab-roulette/) contains:
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index 05c9707d2b3be4fdf25939f9bccebe6b4ad54085..13a32f73ab57deeaa05bbd31c060b0ffb1eefdce 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -228,43 +228,26 @@ To add your name pronunciation:
1. In the **Pronunciation** text box, enter how your name is pronounced. The pronunciation must be plain text and 255 characters or less.
1. Select **Update profile settings**.
-## Set your current status
+## Set your status
-You can provide a custom status message for your user profile along with an emoji that describes it.
-This may be helpful when you are out of office or otherwise not available.
+Set your status to let others know your availability. Others can see your status when they hover over your avatar, name, or username. Your status is publicly visible even if you've [made your user profile page private](#make-your-user-profile-page-private).
-Your status is publicly visible even if your [profile is private](#make-your-user-profile-page-private).
+Your status consists of the following elements. You can use each separately to indicate your status.
+
+- An emoji to indicate your status.
+- A message that describes your availability. You can include emoji codes like `:palm_tree:` or `:bulb:`. Maximum of 100 characters.
+- A checkbox that adds a `Busy` badge to your status.
To set your current status:
1. On the left sidebar, select your avatar.
-1. Select **Set status** or, if you have already set a status, **Edit status**.
-1. Set the desired emoji and status message. Status messages must be plain text and 100 characters or less.
- They can also contain emoji codes like, `I'm on vacation :palm_tree:`.
-1. Select a value from the **Clear status after** dropdown list.
-1. Select **Set status**. Alternatively, you can select **Remove status** to remove your user status entirely.
-
-You can also set your current status from [your user settings](#access-your-user-settings) or by [using the API](../../api/users.md#set-your-user-status).
-
-If you select the **Busy** checkbox, remember to clear it when you become available again.
-
-## Set a busy status indicator
-
-To indicate to others that you are busy, you can set an indicator.
-
-To set the busy status indicator, either:
-
-- Set it directly:
- 1. On the left sidebar, select your avatar.
- 1. Select **Set status** or, if you have already set a status, **Edit status**.
- 1. Select the **Set yourself as busy** checkbox.
-
-- Set it on your profile:
- 1. On the left sidebar, select your avatar.
- 1. Select **Edit profile**.
- 1. In the **Current status** section, select the **Set yourself as busy** checkbox.
+1. Select **Set status**. If you've previously set a status, select **Edit status** instead.
+1. Optional. Enter a status message.
+1. Optional. Select the **Set yourself as busy** checkbox.
+1. Optional. Select a value from the **Clear status after** dropdown list.
+1. Select **Set status**.
- The busy status is displayed next to your name, every time your name is shown in the user interface.
+Your status is updated. You can also set your status from the [user settings](#access-your-user-settings) page or with the [Users API](../../api/users.md#set-your-user-status).
## Set your time zone