diff --git a/components/FilterBar/index.scss b/components/FilterBar/index.scss
index 3bb8821e..148094e9 100644
--- a/components/FilterBar/index.scss
+++ b/components/FilterBar/index.scss
@@ -78,7 +78,6 @@
     // background-position-x: 95%;
     // background-size: $unit * 1.5;
     background-color: var(--select-contained-bg);
-    color: $grey-55;
     font-size: $font-small;
     margin: 0;
     max-width: 200px;
diff --git a/components/common/Select/index.scss b/components/common/Select/index.scss
index 4d040c41..2560dbf3 100644
--- a/components/common/Select/index.scss
+++ b/components/common/Select/index.scss
@@ -21,9 +21,9 @@
 
   &:hover {
     background-color: var(--input-bg-hover);
-    color: var(--text-primary);
     cursor: pointer;
 
+    span:not(.SelectIcon),
     &[data-placeholder] > span:not(.SelectIcon) {
       color: var(--text-primary);
     }
@@ -70,6 +70,10 @@
       fill: var(--icon-secondary);
     }
   }
+
+  span:not(.SelectIcon) {
+    color: var(--text-secondary);
+  }
 }
 
 .Select {
diff --git a/components/raids/RaidCombobox/index.scss b/components/raids/RaidCombobox/index.scss
index 7f683c50..c2bfad10 100644
--- a/components/raids/RaidCombobox/index.scss
+++ b/components/raids/RaidCombobox/index.scss
@@ -185,7 +185,7 @@
   }
 }
 
-.SelectTrigger.Raid .Value.Empty {
+.SelectTrigger.Raid:not(.Highlighted) .Value.Empty {
   color: var(--text-tertiary);
 }
 
diff --git a/components/raids/RaidCombobox/index.tsx b/components/raids/RaidCombobox/index.tsx
index 084d770a..d032ee99 100644
--- a/components/raids/RaidCombobox/index.tsx
+++ b/components/raids/RaidCombobox/index.tsx
@@ -542,8 +542,15 @@ const RaidCombobox = (props: Props) => {
       className="Flush"
       open={open}
       onOpenChange={toggleOpen}
-      placeholder={t('raids.placeholder')}
-      trigger={{ className: 'Raid' }}
+      placeholder={
+        props.showAllRaidsOption ? t('raids.all') : t('raids.placeholder')
+      }
+      trigger={{
+        className: classNames({
+          Raid: true,
+          Highlighted: props.showAllRaidsOption,
+        }),
+      }}
       triggerTabIndex={props.tabIndex}
       value={renderTriggerContent()}
     >
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index e19e664e..41f9dfa8 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -419,6 +419,7 @@
     "katana": "Katana"
   },
   "raids": {
+    "all": "All battles",
     "placeholder": "Select a raid...",
     "sections": {
       "raids": "Raids",
diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json
index 01f04098..08170ab8 100644
--- a/public/locales/ja/common.json
+++ b/public/locales/ja/common.json
@@ -416,6 +416,7 @@
     "katana": "刀"
   },
   "raids": {
+    "all": "すべてのバトル",
     "placeholder": "バトルを選択...",
     "sections": {
       "raids": "マルチ",