diff --git a/devuser_guide/content/dev_guide/chat/communities.md b/devuser_guide/content/dev_guide/chat/communities.md
index 0200536e53..6b6863354d 100644
--- a/devuser_guide/content/dev_guide/chat/communities.md
+++ b/devuser_guide/content/dev_guide/chat/communities.md
@@ -20,6 +20,22 @@ toc: true
 ### Creating Channels
 #### Public Channels
 #### Private Channels
+### Categories
+
+key source file: [`ui/app/AppLayouts/Chat/CommunityComponents/CategoryList.qml`](https://github.com/status-im/status-desktop/blob/3f56db35bac7cc3b0f3769ef1afbd5060b10d03f/ui/app/AppLayouts/Chat/CommunityComponents/CategoryList.qml)
+
+key source file: [`ui/app/AppLayouts/Chat/CommunityComponents/CreateCategoryPopup.qml`](https://github.com/status-im/status-desktop/blob/e5b42b3fb568b955fb05fbf34673aec0eb5adda8/ui/app/AppLayouts/Chat/CommunityComponents/CreateCategoryPopup.qml)
+
+key source file: [`src/app/chat/views/category_list.nim`](https://github.com/status-im/status-desktop/blob/3f56db35bac7cc3b0f3769ef1afbd5060b10d03f/src/app/chat/views/category_list.nim)
+
+key source file: [`src/app/chat/views/communities.nim`](https://github.com/status-im/status-desktop/blob/3f56db35bac7cc3b0f3769ef1afbd5060b10d03f/src/app/chat/views/communities.nim)
+
+key source file: [`src/app/chat/views/communities.nim`](https://github.com/status-im/status-desktop/blob/3f56db35bac7cc3b0f3769ef1afbd5060b10d03f/src/app/chat/views/communities.nim)
+
+status-go: [Community categories #2228](https://github.com/status-im/status-go/pull/2228)
+
+Channels within a community might be organized in categories. Only the community admin might create/edit/delete a category. An admin can create/edit a category and add channels to it as long as those categories have not been assigned before (`categoryId == ""`). Deleting a category will remove the `categoryId` from any chat assigned to the category being deleted. Creating a channel in a category works by calling `wakuext_reorderCommunityChat` after the chat is created, then the `Chat` is immediatly assigned a `categoryId`.
+
 ### Transfer ownership
 ### Share Community
 ### See Members
diff --git a/devuser_guide/content/docs/chat/communities.md b/devuser_guide/content/docs/chat/communities.md
index 844a1fd86b..8bc32c6f96 100644
--- a/devuser_guide/content/docs/chat/communities.md
+++ b/devuser_guide/content/docs/chat/communities.md
@@ -62,6 +62,26 @@ toc: true
 
 ![url_bar](/images/communities/new_channel.png)
 
+### Creating Categories
+
+![url_bar](/images/communities/category_menu.png)
+
+![url_bar](/images/communities/category_popup.png)
+
+![url_bar](/images/communities/category_list.png)
+
+### Editing Categories
+
+![url_bar](/images/communities/category_menu_context.png)
+
+![url_bar](/images/communities/category_popup_edit.png)
+
+### Delete Categories
+
+![url_bar](/images/communities/category_menu_context.png)
+
+![url_bar](/images/communities/category_delete_confirm.png)
+
 ### Transfer ownership
 
 ![url_bar](/images/communities/transfer_ownership.png)
diff --git a/devuser_guide/static/images/communities/category_delete_confirm.png b/devuser_guide/static/images/communities/category_delete_confirm.png
new file mode 100644
index 0000000000..1b0cede01c
Binary files /dev/null and b/devuser_guide/static/images/communities/category_delete_confirm.png differ
diff --git a/devuser_guide/static/images/communities/category_list.png b/devuser_guide/static/images/communities/category_list.png
new file mode 100644
index 0000000000..b9bc91cb8b
Binary files /dev/null and b/devuser_guide/static/images/communities/category_list.png differ
diff --git a/devuser_guide/static/images/communities/category_menu.png b/devuser_guide/static/images/communities/category_menu.png
new file mode 100644
index 0000000000..58850a0e45
Binary files /dev/null and b/devuser_guide/static/images/communities/category_menu.png differ
diff --git a/devuser_guide/static/images/communities/category_menu_context.png b/devuser_guide/static/images/communities/category_menu_context.png
new file mode 100644
index 0000000000..2e449e714a
Binary files /dev/null and b/devuser_guide/static/images/communities/category_menu_context.png differ
diff --git a/devuser_guide/static/images/communities/category_popup.png b/devuser_guide/static/images/communities/category_popup.png
new file mode 100644
index 0000000000..c1db6b7648
Binary files /dev/null and b/devuser_guide/static/images/communities/category_popup.png differ
diff --git a/devuser_guide/static/images/communities/category_popup_edit.png b/devuser_guide/static/images/communities/category_popup_edit.png
new file mode 100644
index 0000000000..833b261032
Binary files /dev/null and b/devuser_guide/static/images/communities/category_popup_edit.png differ
diff --git a/ui/app/AppLayouts/Chat/CommunityComponents/CreateCategoryPopup.qml b/ui/app/AppLayouts/Chat/CommunityComponents/CreateCategoryPopup.qml
index 3c7345fa76..e69b22cad8 100644
--- a/ui/app/AppLayouts/Chat/CommunityComponents/CreateCategoryPopup.qml
+++ b/ui/app/AppLayouts/Chat/CommunityComponents/CreateCategoryPopup.qml
@@ -135,6 +135,7 @@ ModalPopup {
 
             Separator {
                 id: sep2
+                visible: isEdit
                 anchors.left: parent.left
                 anchors.right: parent.right
                 anchors.top: communityChannelList.bottom
@@ -145,6 +146,7 @@ ModalPopup {
 
             Item {
                 id: deleteCategory
+                visible: isEdit
                 anchors.top: sep2.bottom
                 anchors.topMargin: Style.current.padding
                 width: deleteBtn.width + deleteTxt.width + Style.current.padding