diff --git a/components/admin/editors/weapon-editor.tsx b/components/admin/editors/weapon-editor.tsx
index a83b679..72f6e10 100644
--- a/components/admin/editors/weapon-editor.tsx
+++ b/components/admin/editors/weapon-editor.tsx
@@ -14,7 +14,7 @@ import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle }
 import { Field, FieldLabel } from "@/components/ui/field";
 import { Input } from "@/components/ui/input";
 import { WeaponComparisonCard, weaponComparisonPercent } from "@/components/weapon-comparison-card";
-import { rarityColor } from "@/lib/catalog/rarity";
+import { rarityGradientClass } from "@/lib/catalog/rarity";
 import { Textarea } from "@/components/ui/textarea";
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { useManualSave } from "@/hooks/use-manual-save";
@@ -308,15 +308,11 @@ export function WeaponEditor({ guide, weapons, characters, initial }: EditorBase
                               }}
                             >
                               <SelectTrigger
-                                className="border-white/30 text-white hover:border-white/60 [&_svg]:text-white"
-                                style={{ backgroundColor: rarityColor(selectedWeapon?.rarity ?? 1) }}
+                                className={cn("border-white/30 text-white hover:border-white/60 aria-expanded:border-white/60 [&_svg]:text-white", rarityGradientClass(selectedWeapon?.rarity ?? 1))}
                                 size="sm" aria-label={`ระดับขัดเกลาอาวุธอันดับ ${rowIndex + 1}`} aria-invalid={weaponIssue("groups", activeGroupIndex, "rows", rowIndex, "refinement")}>
                                 <SelectValue>{`R${row.refinement}`}</SelectValue>
                               </SelectTrigger>
-                              <SelectContent
-                                className="text-white [--color-accent:rgba(255,255,255,0.2)] [--color-accent-foreground:white]"
-                                style={{ backgroundColor: rarityColor(selectedWeapon?.rarity ?? 1) }}
-                              >
+                              <SelectContent>
                                 <SelectGroup>
                                   {["1", "2", "3", "4", "5", "1-5"].map((refinement) => (
                                     <SelectItem key={refinement} value={refinement}>R{refinement}</SelectItem>