diff --git a/src/routes/(app)/database/characters/[id]/edit/+page.svelte b/src/routes/(app)/database/characters/[id]/edit/+page.svelte
index 5dc9ccbe..eaf05826 100644
--- a/src/routes/(app)/database/characters/[id]/edit/+page.svelte
+++ b/src/routes/(app)/database/characters/[id]/edit/+page.svelte
@@ -16,7 +16,8 @@
 	import CharacterUncapSection from '$lib/features/database/characters/sections/CharacterUncapSection.svelte'
 	import CharacterTaxonomySection from '$lib/features/database/characters/sections/CharacterTaxonomySection.svelte'
 	import CharacterStatsSection from '$lib/features/database/characters/sections/CharacterStatsSection.svelte'
-	import CharacterImagesSection from '$lib/features/database/characters/sections/CharacterImagesSection.svelte'
+	import DetailsContainer from '$lib/components/ui/DetailsContainer.svelte'
+	import DetailItem from '$lib/components/ui/DetailItem.svelte'
 	import { getCharacterImage } from '$lib/utils/images'
 
 	// Types
@@ -63,7 +64,10 @@
 		flb: false,
 		ulb: false,
 		transcendence: false,
-		special: false
+		special: false,
+		releaseDate: '',
+		flbDate: '',
+		ulbDate: ''
 	})
 
 	// Populate edit data when character loads
@@ -89,7 +93,10 @@
 				flb: character.uncap?.flb || false,
 				ulb: character.uncap?.ulb || false,
 				transcendence: character.uncap?.transcendence || false,
-				special: character.special || false
+				special: character.special || false,
+				releaseDate: character.releaseDate || '',
+				flbDate: character.flbDate || '',
+				ulbDate: character.ulbDate || ''
 			}
 		}
 	})
@@ -121,7 +128,10 @@
 				max_atk_flb: editData.maxAtkFlb,
 				flb: editData.flb,
 				ulb: editData.ulb,
-				special: editData.special
+				special: editData.special,
+				release_date: editData.releaseDate || null,
+				flb_date: editData.flbDate || null,
+				ulb_date: editData.ulbDate || null
 			}
 
 			await entityAdapter.updateCharacter(character.id, payload)
@@ -168,13 +178,30 @@
 				<CharacterTaxonomySection {character} {editMode} bind:editData />
 				<CharacterStatsSection {character} {editMode} bind:editData />
 
-				{#if character?.id && character?.granblueId}
-					<CharacterImagesSection
-						characterId={character.id}
-						granblueId={character.granblueId}
-						canEdit={true}
+				<DetailsContainer title="Dates">
+					<DetailItem
+						label="Release Date"
+						bind:value={editData.releaseDate}
+						editable={true}
+						type="date"
 					/>
-				{/if}
+					{#if editData.flb}
+						<DetailItem
+							label="FLB Date"
+							bind:value={editData.flbDate}
+							editable={true}
+							type="date"
+						/>
+					{/if}
+					{#if editData.ulb}
+						<DetailItem
+							label="ULB Date"
+							bind:value={editData.ulbDate}
+							editable={true}
+							type="date"
+						/>
+					{/if}
+				</DetailsContainer>
 			</section>
 		</DetailScaffold>
 	{:else}
diff --git a/src/routes/(app)/database/summons/[id]/edit/+page.svelte b/src/routes/(app)/database/summons/[id]/edit/+page.svelte
index 5041ab60..32ade2bc 100644
--- a/src/routes/(app)/database/summons/[id]/edit/+page.svelte
+++ b/src/routes/(app)/database/summons/[id]/edit/+page.svelte
@@ -106,16 +106,16 @@
 				transcendence: summon.uncap?.transcendence || false,
 				subaura: summon.subaura || false,
 				limit: false,
-				releaseDate: '',
-				flbDate: '',
-				ulbDate: '',
-				transcendenceDate: '',
-				wikiEn: '',
-				wikiJa: '',
-				gamewith: '',
-				kamigame: '',
-				nicknamesEn: [],
-				nicknamesJp: []
+				releaseDate: summon.releaseDate || '',
+				flbDate: summon.flbDate || '',
+				ulbDate: summon.ulbDate || '',
+				transcendenceDate: summon.transcendenceDate || '',
+				wikiEn: summon.wiki?.en || '',
+				wikiJa: summon.wiki?.ja || '',
+				gamewith: summon.gamewith || '',
+				kamigame: summon.kamigame || '',
+				nicknamesEn: summon.nicknames?.en || [],
+				nicknamesJp: summon.nicknames?.ja || []
 			}
 		}
 	})
@@ -224,16 +224,14 @@
 						label="Release Date"
 						bind:value={editData.releaseDate}
 						editable={true}
-						type="text"
-						placeholder="YYYY-MM-DD"
+						type="date"
 					/>
 					{#if editData.flb}
 						<DetailItem
 							label="FLB Date"
 							bind:value={editData.flbDate}
 							editable={true}
-							type="text"
-							placeholder="YYYY-MM-DD"
+							type="date"
 						/>
 					{/if}
 					{#if editData.ulb}
@@ -241,8 +239,7 @@
 							label="ULB Date"
 							bind:value={editData.ulbDate}
 							editable={true}
-							type="text"
-							placeholder="YYYY-MM-DD"
+							type="date"
 						/>
 					{/if}
 					{#if editData.transcendence}
@@ -250,8 +247,7 @@
 							label="Transcendence Date"
 							bind:value={editData.transcendenceDate}
 							editable={true}
-							type="text"
-							placeholder="YYYY-MM-DD"
+							type="date"
 						/>
 					{/if}
 				</DetailsContainer>
diff --git a/src/routes/(app)/database/weapons/[id]/edit/+page.svelte b/src/routes/(app)/database/weapons/[id]/edit/+page.svelte
index a7a4e97f..2ea5ca40 100644
--- a/src/routes/(app)/database/weapons/[id]/edit/+page.svelte
+++ b/src/routes/(app)/database/weapons/[id]/edit/+page.svelte
@@ -111,17 +111,17 @@
 				extra: false,
 				limit: false,
 				ax: weapon.ax || false,
-				releaseDate: '',
-				flbDate: '',
-				ulbDate: '',
-				transcendenceDate: '',
-				wikiEn: '',
-				wikiJa: '',
-				gamewith: '',
-				kamigame: '',
-				nicknamesEn: [],
-				nicknamesJp: [],
-				recruits: ''
+				releaseDate: weapon.releaseDate || '',
+				flbDate: weapon.flbDate || '',
+				ulbDate: weapon.ulbDate || '',
+				transcendenceDate: weapon.transcendenceDate || '',
+				wikiEn: weapon.wiki?.en || '',
+				wikiJa: weapon.wiki?.ja || '',
+				gamewith: weapon.gamewith || '',
+				kamigame: weapon.kamigame || '',
+				nicknamesEn: weapon.nicknames?.en || [],
+				nicknamesJp: weapon.nicknames?.ja || [],
+				recruits: weapon.recruits || ''
 			}
 		}
 	})
@@ -233,16 +233,14 @@
 						label="Release Date"
 						bind:value={editData.releaseDate}
 						editable={true}
-						type="text"
-						placeholder="YYYY-MM-DD"
+						type="date"
 					/>
 					{#if editData.flb}
 						<DetailItem
 							label="FLB Date"
 							bind:value={editData.flbDate}
 							editable={true}
-							type="text"
-							placeholder="YYYY-MM-DD"
+							type="date"
 						/>
 					{/if}
 					{#if editData.ulb}
@@ -250,8 +248,7 @@
 							label="ULB Date"
 							bind:value={editData.ulbDate}
 							editable={true}
-							type="text"
-							placeholder="YYYY-MM-DD"
+							type="date"
 						/>
 					{/if}
 					{#if editData.transcendence}
@@ -259,8 +256,7 @@
 							label="Transcendence Date"
 							bind:value={editData.transcendenceDate}
 							editable={true}
-							type="text"
-							placeholder="YYYY-MM-DD"
+							type="date"
 						/>
 					{/if}
 				</DetailsContainer>