6 files changed, 30 insertions, 30 deletions
diff --git a/frontend/src/lib/Enums.ts b/frontend/src/lib/Enums.ts
index 292ed7d..c557cfa 100644
--- a/frontend/src/lib/Enums.ts
+++ b/frontend/src/lib/Enums.ts
@@ -62,8 +62,8 @@ export const ArchiveSortLabel: Record<ArchiveSort, string> = {
 	[ArchiveSort.Path]: 'Path',
 	[ArchiveSort.Size]: 'File Size',
 	[ArchiveSort.CreatedAt]: 'Created At',
-	[ArchiveSort.PageCount]: 'Page Count',
-	[ArchiveSort.Random]: 'Random'
+	[ArchiveSort.Random]: 'Random',
+	[ArchiveSort.PageCount]: '# Pages'
 };
 
 export const ComicSortLabel: Record<ComicSort, string> = {
@@ -72,37 +72,37 @@ export const ComicSortLabel: Record<ComicSort, string> = {
 	[ComicSort.Date]: 'Date',
 	[ComicSort.CreatedAt]: 'Created At',
 	[ComicSort.UpdatedAt]: 'Updated At',
-	[ComicSort.TagCount]: 'Tag Count',
-	[ComicSort.ArtistCount]: 'Artist Count',
-	[ComicSort.CharacterCount]: 'Character Count',
-	[ComicSort.CircleCount]: 'Circle Count',
-	[ComicSort.WorldCount]: 'World Count',
-	[ComicSort.PageCount]: 'Page Count',
-	[ComicSort.Random]: 'Random'
+	[ComicSort.Random]: 'Random',
+	[ComicSort.ArtistCount]: '# Artists',
+	[ComicSort.CharacterCount]: '# Characters',
+	[ComicSort.CircleCount]: '# Circles',
+	[ComicSort.PageCount]: '# Pages',
+	[ComicSort.TagCount]: '# Tags',
+	[ComicSort.WorldCount]: '# Worlds'
 };
 
 export const ArtistSortLabel: Record<ArtistSort, string> = {
 	[ArtistSort.Name]: 'Name',
 	[ArtistSort.CreatedAt]: 'Created At',
 	[ArtistSort.UpdatedAt]: 'Updated At',
-	[ArtistSort.ComicCount]: 'Comic Count',
-	[ArtistSort.Random]: 'Random'
+	[ArtistSort.Random]: 'Random',
+	[ArtistSort.ComicCount]: '# Count'
 };
 
 export const CharacterSortLabel: Record<CharacterSort, string> = {
 	[CharacterSort.Name]: 'Name',
 	[CharacterSort.CreatedAt]: 'Created At',
 	[CharacterSort.UpdatedAt]: 'Updated At',
-	[CharacterSort.ComicCount]: 'Comic Count',
-	[CharacterSort.Random]: 'Random'
+	[CharacterSort.Random]: 'Random',
+	[CharacterSort.ComicCount]: '# Comics'
 };
 
 export const CircleSortLabel: Record<CircleSort, string> = {
 	[CircleSort.Name]: 'Name',
 	[CircleSort.CreatedAt]: 'Created At',
 	[CircleSort.UpdatedAt]: 'Updated At',
-	[CircleSort.ComicCount]: 'Comic Count',
-	[CircleSort.Random]: 'Random'
+	[CircleSort.Random]: 'Random',
+	[CircleSort.ComicCount]: '# Comics'
 };
 
 export const NamespaceSortLabel: Record<NamespaceSort, string> = {
@@ -110,25 +110,25 @@ export const NamespaceSortLabel: Record<NamespaceSort, string> = {
 	[NamespaceSort.SortName]: 'Sort Name',
 	[NamespaceSort.CreatedAt]: 'Created At',
 	[NamespaceSort.UpdatedAt]: 'Updated At',
-	[NamespaceSort.TagCount]: 'Tag Count',
-	[NamespaceSort.Random]: 'Random'
+	[NamespaceSort.Random]: 'Random',
+	[NamespaceSort.TagCount]: '# Tags'
 };
 
 export const TagSortLabel: Record<TagSort, string> = {
 	[TagSort.Name]: 'Name',
 	[TagSort.CreatedAt]: 'Created At',
-	[TagSort.ComicCount]: 'Comic Count',
-	[TagSort.NamespaceCount]: 'Namespace Count',
 	[TagSort.UpdatedAt]: 'Updated At',
-	[TagSort.Random]: 'Random'
+	[TagSort.Random]: 'Random',
+	[TagSort.ComicCount]: '# Comics',
+	[TagSort.NamespaceCount]: '# Namespaces'
 };
 
 export const WorldSortLabel: Record<WorldSort, string> = {
 	[WorldSort.Name]: 'Name',
 	[WorldSort.CreatedAt]: 'Created At',
 	[WorldSort.UpdatedAt]: 'Updated At',
-	[WorldSort.ComicCount]: 'Comic Count',
-	[WorldSort.Random]: 'Random'
+	[WorldSort.Random]: 'Random',
+	[WorldSort.ComicCount]: '# Comics'
 };
 
 export const UpdateModeLabel: Record<UpdateMode, string> = {
diff --git a/frontend/src/lib/filter/components/Filter.svelte b/frontend/src/lib/filter/components/Filter.svelte
index 8264771..cf7252b 100644
--- a/frontend/src/lib/filter/components/Filter.svelte
+++ b/frontend/src/lib/filter/components/Filter.svelte
@@ -27,7 +27,7 @@
 			{#if filter instanceof Association}
 				<button
 					type="button"
-					title="matches all"
+					title="match all"
 					class:active={filter.mode === 'all'}
 					class="btn-xs hover:bg-slate-700 [&.active]:bg-indigo-800"
 					onclick={() => (filter.mode = 'all')}
@@ -36,7 +36,7 @@
 				</button>
 				<button
 					type="button"
-					title="matches any of"
+					title="match any"
 					class:active={filter.mode === 'any'}
 					class="btn-xs hover:bg-slate-700 [&.active]:bg-indigo-800"
 					onclick={() => (filter.mode = 'any')}
@@ -45,7 +45,7 @@
 				</button>
 				<button
 					type="button"
-					title="matches exactly"
+					title="match exactly"
 					class:active={filter.mode === 'exact'}
 					class="btn-xs hover:bg-slate-700 [&.active]:bg-indigo-800"
 					onclick={() => (filter.mode = 'exact')}
@@ -56,7 +56,7 @@
 			{/if}
 			<button
 				type="button"
-				title="empty"
+				title="match empty"
 				class:active={filter.empty}
 				class="btn-xs hover:bg-slate-700 [&.active]:bg-indigo-800"
 				onclick={() => (filter.empty = !filter.empty)}
diff --git a/frontend/src/lib/toolbar/FilterBookmarked.svelte b/frontend/src/lib/toolbar/FilterBookmarked.svelte
index 76403ec..44895c6 100644
--- a/frontend/src/lib/toolbar/FilterBookmarked.svelte
+++ b/frontend/src/lib/toolbar/FilterBookmarked.svelte
@@ -17,7 +17,7 @@
 <button
 	class:toggled={bookmarked}
 	class="btn-slate"
-	title="Filter bookmarked"
+	title="Toggle bookmarks"
 	onclick={toggle}
 	use:accelerator={'b'}
 >
diff --git a/frontend/src/lib/toolbar/FilterFavourites.svelte b/frontend/src/lib/toolbar/FilterFavourites.svelte
index 5e9beb7..cdb497c 100644
--- a/frontend/src/lib/toolbar/FilterFavourites.svelte
+++ b/frontend/src/lib/toolbar/FilterFavourites.svelte
@@ -16,7 +16,7 @@
 <button
 	class:toggled={favourite}
 	class="btn-slate"
-	title="Filter favourites"
+	title="Toggle favourites"
 	onclick={toggle}
 	use:accelerator={'f'}
 >
diff --git a/frontend/src/lib/toolbar/FilterOrganized.svelte b/frontend/src/lib/toolbar/FilterOrganized.svelte
index 9fc9d21..d01a4f0 100644
--- a/frontend/src/lib/toolbar/FilterOrganized.svelte
+++ b/frontend/src/lib/toolbar/FilterOrganized.svelte
@@ -22,7 +22,7 @@
 	type="button"
 	class:toggled={organized !== undefined}
 	class="btn-slate"
-	title="Filter organized"
+	title="Toggle organized"
 	onclick={toggle}
 	use:accelerator={'z'}
 >
diff --git a/frontend/src/lib/toolbar/SelectSort.svelte b/frontend/src/lib/toolbar/SelectSort.svelte
index a7d56c7..cbcbd0e 100644
--- a/frontend/src/lib/toolbar/SelectSort.svelte
+++ b/frontend/src/lib/toolbar/SelectSort.svelte
@@ -40,7 +40,7 @@
 </script>
 
 <div class="rounded-group flex flex-row">
-	<select class="btn-slate" value={sort.on} {onchange} title="Sort on...">
+	<select class="btn-slate appearance-none" value={sort.on} {onchange} title="Sort by...">
 		{#each Object.entries(labels) as [value, label] (value)}
 			<option {value}>{label}</option>
 		{/each}