diff --git a/module/config.mjs b/module/config.mjs
index 591fd84..56a0fb4 100644
--- a/module/config.mjs
+++ b/module/config.mjs
@@ -34,8 +34,10 @@ export const skills = {
 
 export const defaultItemTier = `simple`;
 export const itemTiers = [
-	`simple`, `greater`,
-	`rare`, `legendary`
+	{ value: `simple`, label: `dotdungeon.rarity.simple` },
+	{ value: `greater`, label: `dotdungeon.rarity.greater` },
+	{ value: `rare`, label: `dotdungeon.rarity.rare` },
+	{ value: `legendary`, label: `dotdungeon.rarity.legendary` },
 ];
 
 export const syncMilestones = [
diff --git a/module/models/Item/CommonItemData.mjs b/module/models/Item/CommonItemData.mjs
index 534ce21..4fded0f 100644
--- a/module/models/Item/CommonItemData.mjs
+++ b/module/models/Item/CommonItemData.mjs
@@ -31,7 +31,7 @@ export class CommonItemData extends foundry.abstract.TypeDataModel {
 			tier: new fields.StringField({
 				initial: DOTDUNGEON.defaultItemTier,
 				nullable: false,
-				choices: DOTDUNGEON.itemTiers,
+				choices: DOTDUNGEON.itemTiers.map(tier => tier.value),
 			}),
 			/*
 			If this property is set to true, the item will be shown in the combat tab
diff --git a/styles/v3/elements/select.scss b/styles/v3/elements/select.scss
new file mode 100644
index 0000000..720eaa7
--- /dev/null
+++ b/styles/v3/elements/select.scss
@@ -0,0 +1,25 @@
+@use "../mixins/material";
+
+.dotdungeon.style-v3 > .window-content {
+	select {
+		outline: none;
+		border: none;
+		@include material.elevate(3);
+		padding: 4px 8px;
+		color: white;
+		transition: all 200ms ease-in-out;
+
+		&:hover {
+			@include material.elevate(4);
+		}
+
+		&:focus-visible {
+			@include material.elevate(6);
+		}
+	}
+
+	option {
+		background: var(--surface);
+		color: var(--on-surface);
+	}
+}
diff --git a/styles/v3/elements/utilities.scss b/styles/v3/elements/utilities.scss
index f76318a..2a3cb42 100644
--- a/styles/v3/elements/utilities.scss
+++ b/styles/v3/elements/utilities.scss
@@ -2,4 +2,8 @@
 	.grow {
 		flex-grow: 1;
 	}
+
+	.text-center {
+		text-align: center;
+	}
 }
diff --git a/styles/v3/index.scss b/styles/v3/index.scss
index b0689d6..ef4eda9 100644
--- a/styles/v3/index.scss
+++ b/styles/v3/index.scss
@@ -5,6 +5,7 @@
 /* Element-Styling */
 @use "./elements/utilities.scss";
 @use "./elements/button.scss";
+@use "./elements/select.scss";
 @use "./elements/text-input.scss";
 @use "./elements/number-input.scss";
 @use "./elements/textarea.scss";
diff --git a/templates/items/untyped/v2/tabs/details.v2.untyped.hbs b/templates/items/untyped/v2/tabs/details.v2.untyped.hbs
index e99d875..e86e96e 100644
--- a/templates/items/untyped/v2/tabs/details.v2.untyped.hbs
+++ b/templates/items/untyped/v2/tabs/details.v2.untyped.hbs
@@ -37,8 +37,20 @@
 			{{dd-empty-state system.usage_cost}}
 		{{/if}}
 	</div>
-	<div class="tier panel">
-		Item Rarity
+	<div class="tier panel--row">
+		Rarity
+		<div class="grow"></div>
+		{{#if meta.isEditable}}
+			<select
+				class="text-center"
+				name="system.tier"
+				id="{{meta.idp}}-item-tier"
+			>
+				{{{ dd-options system.tier config.itemTiers localize=true }}}
+			</select>
+		{{else}}
+			{{dd-i18n (concat "dotdungeon.rarity." system.tier)}}
+		{{/if}}
 	</div>
 	{{#if meta.isEmbedded}}
 		<div class="location panel">