diff --git a/ElectronicObserver.Avalonia/Assets/Form/EquipmentUpgradePlanner.png b/ElectronicObserver.Avalonia/Assets/Form/EquipmentUpgradePlanner.png
new file mode 100644
index 000000000..51f141662
Binary files /dev/null and b/ElectronicObserver.Avalonia/Assets/Form/EquipmentUpgradePlanner.png differ
diff --git a/ElectronicObserver.Avalonia/Assets/Form/EventLockPlanner.png b/ElectronicObserver.Avalonia/Assets/Form/EventLockPlanner.png
new file mode 100644
index 000000000..3ebdf6204
Binary files /dev/null and b/ElectronicObserver.Avalonia/Assets/Form/EventLockPlanner.png differ
diff --git a/ElectronicObserver.Avalonia/Assets/Form/ExpeditionRecord.png b/ElectronicObserver.Avalonia/Assets/Form/ExpeditionRecord.png
new file mode 100644
index 000000000..1f6d9118e
Binary files /dev/null and b/ElectronicObserver.Avalonia/Assets/Form/ExpeditionRecord.png differ
diff --git a/ElectronicObserver.Avalonia/Assets/Form/KancolleProgress.png b/ElectronicObserver.Avalonia/Assets/Form/KancolleProgress.png
new file mode 100644
index 000000000..45f2c1130
Binary files /dev/null and b/ElectronicObserver.Avalonia/Assets/Form/KancolleProgress.png differ
diff --git a/ElectronicObserver.Avalonia/Assets/Form/QuestTrackerM.png b/ElectronicObserver.Avalonia/Assets/Form/QuestTrackerM.png
new file mode 100644
index 000000000..6d6cd61c7
Binary files /dev/null and b/ElectronicObserver.Avalonia/Assets/Form/QuestTrackerM.png differ
diff --git a/ElectronicObserver.Avalonia/Assets/Form/SortieRecord.png b/ElectronicObserver.Avalonia/Assets/Form/SortieRecord.png
new file mode 100644
index 000000000..eedec40e3
Binary files /dev/null and b/ElectronicObserver.Avalonia/Assets/Form/SortieRecord.png differ
diff --git a/ElectronicObserver/Common/IconContentIcon.xaml b/ElectronicObserver/Common/IconContentIcon.xaml
index 6699f92a8..2d1c57adb 100644
--- a/ElectronicObserver/Common/IconContentIcon.xaml
+++ b/ElectronicObserver/Common/IconContentIcon.xaml
@@ -87,6 +87,13 @@
 				<markup:Case Label="{x:Static resource:IconContent.FormExpeditionCheck}" Value="{StaticResource Form.ExpeditionCheck}" />
 				<markup:Case Label="{x:Static resource:IconContent.FormFleetPreset}" Value="{StaticResource Form.FleetPreset}" />
 
+				<markup:Case Label="{x:Static resource:IconContent.FormEventLockPlanner}" Value="{StaticResource Form.EventLockPlanner}" />
+				<markup:Case Label="{x:Static resource:IconContent.FormExpeditionRecord}" Value="{StaticResource Form.ExpeditionRecord}" />
+				<markup:Case Label="{x:Static resource:IconContent.FormSortieRecord}" Value="{StaticResource Form.SortieRecord}" />
+				<markup:Case Label="{x:Static resource:IconContent.FormEquipmentUpgradePlanner}" Value="{StaticResource Form.EquipmentUpgradePlanner}" />
+				<markup:Case Label="{x:Static resource:IconContent.FormKanColleProgress}" Value="{StaticResource Form.KanColleProgress}" />
+				<markup:Case Label="{x:Static resource:IconContent.FormQuestTrackerManager}" Value="{StaticResource Form.QuestTrackerManager}" />
+
 				<markup:Case Label="{x:Static resource:IconContent.FleetNoShip}" Value="{StaticResource Fleet.NoShip}" />
 				<markup:Case Label="{x:Static resource:IconContent.FleetDocking}" Value="{StaticResource Fleet.Docking}" />
 				<markup:Case Label="{x:Static resource:IconContent.FleetSortieDamaged}" Value="{StaticResource Fleet.SortieDamaged}" />
@@ -129,6 +136,7 @@
 				<markup:Case Label="{x:Static resource:IconContent.ShipStateExpedition}" Value="{StaticResource ShipState.Expedition}" />
 				<markup:Case Label="{x:Static resource:IconContent.ShipStateRepair}" Value="{StaticResource ShipState.Repair}" />
 				<markup:Case Label="{x:Static resource:IconContent.ShipStateSunk}" Value="{StaticResource ShipState.Sunk}" />
+				
 			</markup:Switch>
 		</Image.Source>
 	</Image>
diff --git a/ElectronicObserver/FormMainWpf.xaml b/ElectronicObserver/FormMainWpf.xaml
index f88e90231..8d260f38b 100644
--- a/ElectronicObserver/FormMainWpf.xaml
+++ b/ElectronicObserver/FormMainWpf.xaml
@@ -557,7 +557,7 @@
 					Header="{Binding FormMain.SortieRecordViewer}"
 					>
 					<MenuItem.Icon>
-						<common:IconContentIcon Type="FormEquipmentList" />
+						<common:IconContentIcon Type="FormSortieRecord"/>
 					</MenuItem.Icon>
 				</MenuItem>
 				<MenuItem
@@ -566,7 +566,7 @@
 					Header="{Binding FormMain.ExpeditionRecordViewer}"
 					>
 					<MenuItem.Icon>
-						<common:IconContentIcon Type="FormEquipmentList" />
+						<common:IconContentIcon Type="FormExpeditionRecord" />
 					</MenuItem.Icon>
 				</MenuItem>
 				<MenuItem
@@ -694,7 +694,7 @@
 					Header="{Binding FormMain.StripMenu_Tool_KancolleProgress}"
 					>
 					<MenuItem.Icon>
-						<common:IconContentIcon Type="FormEquipmentList" />
+						<common:IconContentIcon Type="FormKanColleProgress" />
 					</MenuItem.Icon>
 				</MenuItem>
 				<MenuItem
@@ -708,17 +708,17 @@
 				</MenuItem>
 				<MenuItem Command="{Binding OpenQuestTrackerManagerCommand}" Header="{Binding FormMain.StripMenu_Tool_QuestTrackerManager}">
 					<MenuItem.Icon>
-						<common:IconContentIcon Type="FormQuest" />
+						<common:IconContentIcon Type="FormQuestTrackerManager" />
 					</MenuItem.Icon>
 				</MenuItem>
 				<MenuItem Command="{Binding OpenEventLockPlannerCommand}" Header="{Binding FormMain.EventLockPlannerTitle}">
 					<MenuItem.Icon>
-						<common:IconContentIcon Type="FormQuest" />
+						<common:IconContentIcon Type="FormEventLockPlanner" />
 					</MenuItem.Icon>
 				</MenuItem>
 				<MenuItem Command="{Binding OpenEquipmentUpgradePlannerCommand}" Header="{Binding FormMain.EquipmentUpgradePlannerTitle}">
 					<MenuItem.Icon>
-						<common:IconContentIcon Type="FormQuest" />
+						<common:IconContentIcon Type="FormEquipmentUpgradePlanner" />
 					</MenuItem.Icon>
 				</MenuItem>
 				<MenuItem Command="{Binding OpenAutoRefreshCommand}" Header="{Binding FormMain.AutoRefreshTitle}">
diff --git a/ElectronicObserver/Icons.xaml b/ElectronicObserver/Icons.xaml
index 383210069..58c1204cb 100644
--- a/ElectronicObserver/Icons.xaml
+++ b/ElectronicObserver/Icons.xaml
@@ -131,6 +131,13 @@
 	<BitmapImage x:Key="Form.ShipGroup" UriSource="pack://siteoforigin:,,,/Assets/Form/ShipGroup.png" />
 	<BitmapImage x:Key="Form.WindowCapture" UriSource="pack://siteoforigin:,,,/Assets/Form/WindowCapture.png" />
 
+	<BitmapImage x:Key="Form.EventLockPlanner" UriSource="pack://siteoforigin:,,,/Assets/Form/EventLockPlanner.png" />
+	<BitmapImage x:Key="Form.ExpeditionRecord" UriSource="pack://siteoforigin:,,,/Assets/Form/ExpeditionRecord.png" />
+	<BitmapImage x:Key="Form.SortieRecord" UriSource="pack://siteoforigin:,,,/Assets/Form/SortieRecord.png" />
+	<BitmapImage x:Key="Form.EquipmentUpgradePlanner" UriSource="pack://siteoforigin:,,,/Assets/Form/EquipmentUpgradePlanner.png" />
+	<BitmapImage x:Key="Form.KanColleProgress" UriSource="pack://siteoforigin:,,,/Assets/Form/KanColleProgress.png" />
+	<BitmapImage x:Key="Form.QuestTrackerManager" UriSource="pack://siteoforigin:,,,/Assets/Form/QuestTrackerM.png" />
+
 	<BitmapImage x:Key="Fleet.AnchorageRepairing" UriSource="pack://siteoforigin:,,,/Assets/Fleet/AnchorageRepairing.png" />
 	<BitmapImage x:Key="Fleet.Combined" UriSource="pack://siteoforigin:,,,/Assets/Fleet/Combined.png" />
 	<BitmapImage x:Key="Fleet.Damaged" UriSource="pack://siteoforigin:,,,/Assets/Fleet/Damaged.png" />
diff --git a/ElectronicObserver/Resource/ResourceManager.cs b/ElectronicObserver/Resource/ResourceManager.cs
index e442e4992..08443babc 100644
--- a/ElectronicObserver/Resource/ResourceManager.cs
+++ b/ElectronicObserver/Resource/ResourceManager.cs
@@ -791,4 +791,10 @@ public enum IconContent
 	ShipStateExpedition,
 	ShipStateRepair,
 	ShipStateSunk,
+	FormEventLockPlanner,
+	FormExpeditionRecord,
+	FormSortieRecord,
+	FormEquipmentUpgradePlanner,
+	FormKanColleProgress,
+	FormQuestTrackerManager,
 }