diff --git a/public/language/en-GB/users.json b/public/language/en-GB/users.json
index 0da5fb8e49..a7bac35cda 100644
--- a/public/language/en-GB/users.json
+++ b/public/language/en-GB/users.json
@@ -1,4 +1,5 @@
 {
+	"all-users": "All Users",
 	"latest_users": "Latest Users",
 	"top_posters": "Top Posters",
 	"most_reputation": "Most Reputation",
diff --git a/public/scss/generics.scss b/public/scss/generics.scss
index d298f520c4..a4e1a25852 100644
--- a/public/scss/generics.scss
+++ b/public/scss/generics.scss
@@ -20,7 +20,7 @@
 	}
 }
 
-.category-dropdown-container.right .category-dropdown-menu {
+.dropdown-right .dropdown-menu {
 	--bs-position: end;
 }
 
diff --git a/public/src/modules/categoryFilter.js b/public/src/modules/categoryFilter.js
index b1593a5dec..c870c936df 100644
--- a/public/src/modules/categoryFilter.js
+++ b/public/src/modules/categoryFilter.js
@@ -9,7 +9,7 @@ define('categoryFilter', ['categorySearch', 'api', 'hooks'], function (categoryS
 		}
 		options = options || {};
 		options.states = options.states || ['watching', 'notwatching', 'ignoring'];
-		options.template = 'partials/category-filter';
+		options.template = 'partials/category/filter-dropdown-left';
 
 		hooks.fire('action:category.filter.options', { el: el, options: options });
 
@@ -91,7 +91,7 @@ define('categoryFilter', ['categorySearch', 'api', 'hooks'], function (categoryS
 			renderButton();
 		}
 		function renderButton(category) {
-			app.parseAndTranslate('partials/category-filter-content', {
+			app.parseAndTranslate('partials/category/filter-dropdown-content', {
 				selectedCategory: category,
 			}, function (html) {
 				el.find('button').replaceWith($('<div/>').html(html).find('button'));
diff --git a/public/src/modules/categorySelector.js b/public/src/modules/categorySelector.js
index c0a36931a3..1713c28747 100644
--- a/public/src/modules/categorySelector.js
+++ b/public/src/modules/categorySelector.js
@@ -13,7 +13,7 @@ define('categorySelector', [
 		const onSelect = options.onSelect || function () {};
 
 		options.states = options.states || ['watching', 'notwatching', 'ignoring'];
-		options.template = 'partials/category-selector';
+		options.template = 'partials/category/selector-dropdown-left';
 		hooks.fire('action:category.selector.options', { el: el, options: options });
 
 		categorySearch.init(el, options);
diff --git a/src/views/admin/manage/admins-mods.tpl b/src/views/admin/manage/admins-mods.tpl
index 30e7e64ede..442c0b590c 100644
--- a/src/views/admin/manage/admins-mods.tpl
+++ b/src/views/admin/manage/admins-mods.tpl
@@ -35,7 +35,7 @@
 
 		<!-- IMPORT partials/breadcrumbs.tpl -->
 		<div class="mb-3">
-		<!-- IMPORT admin/partials/category-selector.tpl -->
+		<!-- IMPORT admin/partials/category/selector-dropdown-left.tpl -->
 		</div>
 		{{{ if !categoryMods.length }}}
 		<div><p class="alert alert-info">[[admin/manage/admins-mods:no-sub-categories]]</p></div>
diff --git a/src/views/admin/manage/categories.tpl b/src/views/admin/manage/categories.tpl
index 501c38a3e3..799e638d8d 100644
--- a/src/views/admin/manage/categories.tpl
+++ b/src/views/admin/manage/categories.tpl
@@ -2,7 +2,7 @@
 <div class="row">
     <div class="col-lg-12">
         <div class="category btn-group">
-            <!-- IMPORT admin/partials/category-selector.tpl -->
+            <!-- IMPORT admin/partials/category/selector-dropdown-left.tpl -->
         </div>
         <div class="btn-group">
             <button id="collapse-all" class="btn btn-outline-secondary">[[admin/manage/categories:collapse-all]]</button>
diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl
index 72186578b5..bc119bb051 100644
--- a/src/views/admin/manage/category.tpl
+++ b/src/views/admin/manage/category.tpl
@@ -1,7 +1,7 @@
 <div class="category" data-cid="{category.cid}">
 	<div class="row mb-3">
 		<div class="d-flex col-12 justify-content-end">
-			<!-- IMPORT admin/partials/category-selector-right.tpl -->
+			<!-- IMPORT admin/partials/category/selector-dropdown-right.tpl -->
 		</div>
 	</div>
 
diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl
index f91aa3b826..91946fade8 100644
--- a/src/views/admin/manage/group.tpl
+++ b/src/views/admin/manage/group.tpl
@@ -105,7 +105,7 @@
 							<input id="memberPostCids" type="text" class="form-control" value="{group.memberPostCids}">
 						</div>
 						<div class="col-md-3 member-post-cids-selector">
-							<!-- IMPORT admin/partials/category-selector.tpl -->
+							<!-- IMPORT admin/partials/category/selector-dropdown-right.tpl -->
 						</div>
 					</div>
 				</div>
@@ -146,7 +146,9 @@
 			<hr />
 			<div class="edit-privileges-selector">
 				<label class="form-label" class="float-start">[[admin/manage/privileges:edit-privileges]]</label>
-				<!-- IMPORT admin/partials/category-selector.tpl -->
+				<div>
+					<!-- IMPORT admin/partials/category/selector-dropdown-right.tpl -->
+				</div>
 			</div>
 		</div>
 	</form>
diff --git a/src/views/admin/manage/privileges.tpl b/src/views/admin/manage/privileges.tpl
index 67da1d7649..5e515b0f23 100644
--- a/src/views/admin/manage/privileges.tpl
+++ b/src/views/admin/manage/privileges.tpl
@@ -8,7 +8,7 @@
 
 				<div class="lead mb-3">
 					[[admin/manage/categories:privileges.category-selector]]
-					<!-- IMPORT admin/partials/category-selector.tpl -->
+					<!-- IMPORT admin/partials/category/selector-dropdown-left.tpl -->
 				</div>
 
 				<div class="privilege-table-container">
diff --git a/src/views/admin/partials/categories/create.tpl b/src/views/admin/partials/categories/create.tpl
index 78f103a00d..60a4bc3ab9 100644
--- a/src/views/admin/partials/categories/create.tpl
+++ b/src/views/admin/partials/categories/create.tpl
@@ -5,12 +5,12 @@
 	</div>
 	<div class="mb-3" id="parentCidGroup">
 		<label class="form-label" for="parentCid">[[admin/manage/categories:optional-parent-category]]</label>
-		<!-- IMPORT admin/partials/category-selector.tpl -->
+		<!-- IMPORT admin/partials/category/selector-dropdown-left.tpl -->
 	</div>
 
 	<div class="mb-3" id="cloneFromCidGroup">
 		<label class="form-label" for="cloneFromCid">[[admin/manage/categories:optional-clone-settings]]</label>
-		<!-- IMPORT admin/partials/category-selector.tpl -->
+		<!-- IMPORT admin/partials/category/selector-dropdown-left.tpl -->
 		<label>
 			<input id="cloneChildren" name="cloneChildren" type="checkbox">
 			<strong>[[admin/manage/categories:clone-children]]</strong>
diff --git a/src/views/admin/partials/category-selector-right.tpl b/src/views/admin/partials/category-selector-right.tpl
deleted file mode 100644
index 9e4dfeaf4b..0000000000
--- a/src/views/admin/partials/category-selector-right.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div component="category-selector" class="btn-group right category-dropdown-container bottom-sheet">
-<!-- IMPORT admin/partials/category-selector-content.tpl -->
-</div>
\ No newline at end of file
diff --git a/src/views/admin/partials/category-selector-content.tpl b/src/views/admin/partials/category/selector-dropdown-content.tpl
similarity index 100%
rename from src/views/admin/partials/category-selector-content.tpl
rename to src/views/admin/partials/category/selector-dropdown-content.tpl
diff --git a/src/views/admin/partials/category-selector.tpl b/src/views/admin/partials/category/selector-dropdown-left.tpl
similarity index 51%
rename from src/views/admin/partials/category-selector.tpl
rename to src/views/admin/partials/category/selector-dropdown-left.tpl
index 30ae9d96d4..c462f6c4d7 100644
--- a/src/views/admin/partials/category-selector.tpl
+++ b/src/views/admin/partials/category/selector-dropdown-left.tpl
@@ -1,3 +1,3 @@
 <div component="category-selector" class="btn-group bottom-sheet">
-<!-- IMPORT admin/partials/category-selector-content.tpl -->
+<!-- IMPORT admin/partials/category/selector-dropdown-content.tpl -->
 </div>
\ No newline at end of file
diff --git a/src/views/admin/partials/category/selector-dropdown-right.tpl b/src/views/admin/partials/category/selector-dropdown-right.tpl
new file mode 100644
index 0000000000..dda6493b82
--- /dev/null
+++ b/src/views/admin/partials/category/selector-dropdown-right.tpl
@@ -0,0 +1,3 @@
+<div component="category-selector" class="btn-group dropdown-right category-dropdown-container bottom-sheet">
+<!-- IMPORT admin/partials/category/selector-dropdown-content.tpl -->
+</div>
\ No newline at end of file
diff --git a/src/views/modals/move-topic.tpl b/src/views/modals/move-topic.tpl
index 1d7cb24883..06ff2b4f16 100644
--- a/src/views/modals/move-topic.tpl
+++ b/src/views/modals/move-topic.tpl
@@ -6,7 +6,7 @@
 		<p>
 			[[topic:move_topic_instruction]]
 		</p>
-		<!-- IMPORT partials/category-selector-right.tpl -->
+		<!-- IMPORT partials/category/selector-dropdown-right.tpl -->
 	</div>
 	<div class="card-footer text-end">
 		<button type="button" class="btn btn-sm btn-outline-secondary" id="move_topic_cancel">[[global:buttons.close]]</button>
diff --git a/src/views/partials/category/filter-dropdown-left.tpl b/src/views/partials/category/filter-dropdown-left.tpl
new file mode 100644
index 0000000000..2bc3373f10
--- /dev/null
+++ b/src/views/partials/category/filter-dropdown-left.tpl
@@ -0,0 +1,3 @@
+<div component="category/dropdown" class="btn-group category-dropdown-container bottom-sheet">
+	<!-- IMPORT partials/category/filter-dropdown-content.tpl -->
+ </div>
\ No newline at end of file
diff --git a/src/views/partials/category/filter-dropdown-right.tpl b/src/views/partials/category/filter-dropdown-right.tpl
new file mode 100644
index 0000000000..8be56907cc
--- /dev/null
+++ b/src/views/partials/category/filter-dropdown-right.tpl
@@ -0,0 +1,3 @@
+<div component="category/dropdown" class="btn-group dropdown-right category-dropdown-container bottom-sheet">
+	<!-- IMPORT partials/category/filter-dropdown-content.tpl -->
+ </div>
\ No newline at end of file
diff --git a/src/views/partials/category/selector-dropdown-left.tpl b/src/views/partials/category/selector-dropdown-left.tpl
new file mode 100644
index 0000000000..d046496999
--- /dev/null
+++ b/src/views/partials/category/selector-dropdown-left.tpl
@@ -0,0 +1,3 @@
+<div component="category-selector" class="btn-group category-dropdown-container bottom-sheet">
+	<!-- IMPORT partials/category/selector-dropdown-content.tpl -->
+</div>
\ No newline at end of file
diff --git a/src/views/partials/category/selector-dropdown-right.tpl b/src/views/partials/category/selector-dropdown-right.tpl
new file mode 100644
index 0000000000..55f916f6ad
--- /dev/null
+++ b/src/views/partials/category/selector-dropdown-right.tpl
@@ -0,0 +1,3 @@
+<div component="category-selector" class="btn-group dropdown-right category-dropdown-container bottom-sheet">
+	<!-- IMPORT partials/category/selector-dropdown-content.tpl -->
+</div>
\ No newline at end of file
diff --git a/src/views/partials/users/filter-dropdown-left.tpl b/src/views/partials/users/filter-dropdown-left.tpl
new file mode 100644
index 0000000000..3a5afc7f03
--- /dev/null
+++ b/src/views/partials/users/filter-dropdown-left.tpl
@@ -0,0 +1,3 @@
+<div class="dropdown bottom-sheet {{{ if !users.length }}}hidden{{{ end }}}">
+	<!-- IMPORT partials/users/filter-dropdown-content.tpl -->
+</div>
\ No newline at end of file
diff --git a/src/views/partials/users/filter-dropdown-right.tpl b/src/views/partials/users/filter-dropdown-right.tpl
new file mode 100644
index 0000000000..c9ace029a9
--- /dev/null
+++ b/src/views/partials/users/filter-dropdown-right.tpl
@@ -0,0 +1,3 @@
+<div class="dropdown dropdown-right bottom-sheet {{{ if !users.length }}}hidden{{{ end }}}">
+	<!-- IMPORT partials/users/filter-dropdown-content.tpl -->
+</div>
\ No newline at end of file
diff --git a/src/views/post-queue.tpl b/src/views/post-queue.tpl
index c1c80d6323..2ccd913bb1 100644
--- a/src/views/post-queue.tpl
+++ b/src/views/post-queue.tpl
@@ -2,7 +2,7 @@
 <div class="btn-toolbar justify-content-end">
 	{{{ if (!singlePost && posts.length) }}}
 	<div class="me-2">
-	<!-- IMPORT partials/category-filter-right.tpl -->
+	<!-- IMPORT partials/category/filter-dropdown-right.tpl -->
 	</div>
 	<div class="btn-group bottom-sheet" component="post-queue/bulk-actions">
 		<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" autocomplete="off" aria-haspopup="true" aria-expanded="false">