diff --git a/public/assets/icons/increase-size-option.svg b/public/assets/icons/increase-size-option.svg
new file mode 100644
index 0000000..76cad03
--- /dev/null
+++ b/public/assets/icons/increase-size-option.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="438.529px" height="438.529px" viewBox="0 0 438.529 438.529" style="enable-background:new 0 0 438.529 438.529;"
+	 xml:space="preserve">
+<g>
+	<g>
+		<path d="M180.156,225.828c-1.903-1.902-4.093-2.854-6.567-2.854c-2.475,0-4.665,0.951-6.567,2.854l-94.787,94.787l-41.112-41.117
+			c-3.617-3.61-7.895-5.421-12.847-5.421c-4.952,0-9.235,1.811-12.851,5.421c-3.617,3.621-5.424,7.905-5.424,12.854v127.907
+			c0,4.948,1.807,9.229,5.424,12.847c3.619,3.613,7.902,5.424,12.851,5.424h127.906c4.949,0,9.23-1.811,12.847-5.424
+			c3.615-3.617,5.424-7.898,5.424-12.847s-1.809-9.233-5.424-12.854l-41.112-41.104l94.787-94.793
+			c1.902-1.903,2.853-4.086,2.853-6.564c0-2.478-0.953-4.66-2.853-6.57L180.156,225.828z"/>
+		<path d="M433.11,5.424C429.496,1.807,425.212,0,420.263,0H292.356c-4.948,0-9.227,1.807-12.847,5.424
+			c-3.614,3.615-5.421,7.898-5.421,12.847s1.807,9.233,5.421,12.847l41.106,41.112l-94.786,94.787
+			c-1.901,1.906-2.854,4.093-2.854,6.567s0.953,4.665,2.854,6.567l32.552,32.548c1.902,1.903,4.086,2.853,6.563,2.853
+			s4.661-0.95,6.563-2.853l94.794-94.787l41.104,41.109c3.62,3.616,7.905,5.428,12.854,5.428s9.229-1.812,12.847-5.428
+			c3.614-3.614,5.421-7.898,5.421-12.847V18.268C438.53,13.315,436.734,9.04,433.11,5.424z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>
diff --git a/src/components/Effects.vue b/src/components/Effects.vue
index 76d18c6..fba077c 100644
--- a/src/components/Effects.vue
+++ b/src/components/Effects.vue
@@ -62,7 +62,7 @@ const createFogEffect = (scene: Phaser.Scene) => {
 const updateEffects = () => {
   const effects = zoneStore.zone?.zoneEffects || []
 
-  effects.forEach(effect => {
+  effects.forEach((effect) => {
     switch (effect.effect) {
       case 'light':
         updateLightEffect(effect.strength)
@@ -79,7 +79,7 @@ const updateEffects = () => {
 
 const updateLightEffect = (strength: number) => {
   if (!lightEffect.value) return
-  const darkness = 1 - (strength / 100)
+  const darkness = 1 - strength / 100
   lightEffect.value.clear()
   lightEffect.value.fillStyle(0x000000, darkness)
   lightEffect.value.fillRect(0, 0, window.innerWidth, window.innerHeight)
@@ -105,4 +105,6 @@ watch(() => zoneStore.zone?.zoneEffects, updateEffects, { deep: true })
 onBeforeUnmount(() => {
   if (sceneRef.value) sceneRef.value.scene.remove('effects')
 })
-</script>
\ No newline at end of file
+
+// @TODO : Fix resize issue
+</script>
diff --git a/src/components/gameMaster/GmPanel.vue b/src/components/gameMaster/GmPanel.vue
index b003e8b..d4ace4d 100644
--- a/src/components/gameMaster/GmPanel.vue
+++ b/src/components/gameMaster/GmPanel.vue
@@ -1,7 +1,6 @@
 <template>
   <Modal :isModalOpen="gameStore.uiSettings.isGmPanelOpen" @modal:close="() => gameStore.toggleGmPanel()" :modal-width="1000" :modal-height="650" :can-full-screen="true">
     <template #modalHeader>
-      <h3 class="m-0 font-medium shrink-0 text-white">GM Panel</h3>
       <div class="flex gap-1.5 flex-wrap">
         <button @mousedown.stop class="btn-cyan py-1.5 px-4 min-w-24">General</button>
         <button @mousedown.stop class="btn-cyan py-1.5 px-4 min-w-24">Users</button>
diff --git a/src/components/gameMaster/assetManager/AssetManager.vue b/src/components/gameMaster/assetManager/AssetManager.vue
index 24c5274..3d8ed22 100644
--- a/src/components/gameMaster/assetManager/AssetManager.vue
+++ b/src/components/gameMaster/assetManager/AssetManager.vue
@@ -22,8 +22,16 @@
         <span>NPC's</span>
         <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
       </a>
-      <a class="relative p-2.5 hover:cursor-pointer">
-        <span>Characters</span>
+      <a class="relative p-2.5 hover:cursor-pointer" :class="{ 'bg-cyan/80': selectedCategory === 'shops' }" @click="() => (selectedCategory = 'shops')">
+        <span>Shops</span>
+        <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
+      </a>
+      <a class="relative p-2.5 hover:cursor-pointer" :class="{ 'bg-cyan/80': selectedCategory === 'characterTypes' }" @click="() => (selectedCategory = 'characterTypes')">
+        <span>Character types</span>
+        <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
+      </a>
+      <a class="relative p-2.5 hover:cursor-pointer" :class="{ 'bg-cyan/80': selectedCategory === 'characterHair' }" @click="() => (selectedCategory = 'characterHair')">
+        <span>Character hair</span>
         <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
       </a>
       <a class="relative p-2.5 hover:cursor-pointer">
@@ -34,6 +42,10 @@
         <span>Pets</span>
         <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
       </a>
+      <a class="relative p-2.5 hover:cursor-pointer">
+        <span>Emoticons</span>
+        <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
+      </a>
     </div>
     <div class="absolute w-px bg-gray-500 h-full top-0 left-1/6"></div>
 
@@ -42,6 +54,7 @@
       <TileList v-if="selectedCategory === 'tiles'" />
       <ObjectList v-if="selectedCategory === 'objects'" />
       <SpriteList v-if="selectedCategory === 'sprites'" />
+      <CharacterTypeList v-if="selectedCategory === 'characterTypes'" />
     </div>
 
     <div class="absolute w-px bg-gray-500 h-full top-0 left-1/2"></div>
@@ -51,6 +64,7 @@
       <TileDetails v-if="selectedCategory === 'tiles' && assetManagerStore.selectedTile" />
       <ObjectDetails v-if="selectedCategory === 'objects' && assetManagerStore.selectedObject" />
       <SpriteDetails v-if="selectedCategory === 'sprites' && assetManagerStore.selectedSprite" />
+      <CharacterTypeDetails v-if="selectedCategory === 'characterTypes' && assetManagerStore.selectedCharacterType" />
     </div>
   </div>
 </template>
@@ -64,6 +78,8 @@ import ObjectList from '@/components/gameMaster/assetManager/partials/object/Obj
 import ObjectDetails from '@/components/gameMaster/assetManager/partials/object/ObjectDetails.vue'
 import SpriteList from '@/components/gameMaster/assetManager/partials/sprite/SpriteList.vue'
 import SpriteDetails from '@/components/gameMaster/assetManager/partials/sprite/SpriteDetails.vue'
+import CharacterTypeList from '@/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue'
+import CharacterTypeDetails from '@/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue'
 
 const assetManagerStore = useAssetManagerStore()
 const selectedCategory = ref('tiles')
diff --git a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
new file mode 100644
index 0000000..e4a133a
--- /dev/null
+++ b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeDetails.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="h-full overflow-auto">
+    <div class="m-2.5 p-2.5 block">
+      <form class="flex gap-2.5 flex-wrap" @submit.prevent="saveCharacterType">
+        <div class="form-field-full">
+          <label for="name">Name</label>
+          <input v-model="characterName" class="input-field" type="text" name="name" placeholder="Character Type Name" />
+        </div>
+        <div class="form-field-half">
+          <label for="gender">Gender</label>
+          <select v-model="characterGender" class="input-field" name="gender">
+            <option v-for="gender in genderOptions" :key="gender" :value="gender">{{ gender }}</option>
+          </select>
+        </div>
+        <div class="form-field-half">
+          <label for="race">Race</label>
+          <select v-model="characterRace" class="input-field" name="race">
+            <option v-for="race in raceOptions" :key="race" :value="race">{{ race }}</option>
+          </select>
+        </div>
+        <div class="form-field-full">
+          <label for="spriteId">Sprite ID</label>
+          <input v-model="characterSpriteId" class="input-field" type="text" name="spriteId" placeholder="Sprite ID" />
+        </div>
+        <button class="btn-cyan px-4 py-1.5 min-w-24" type="submit">Save</button>
+        <button class="btn-red px-4 py-1.5 min-w-24" type="button" @click.prevent="removeCharacterType">Remove</button>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { CharacterType, CharacterGender, CharacterRace } from '@/types'
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import { useGameStore } from '@/stores/gameStore'
+
+const gameStore = useGameStore()
+const assetManagerStore = useAssetManagerStore()
+
+const selectedCharacterType = computed(() => assetManagerStore.selectedCharacterType)
+
+const characterName = ref('')
+const characterGender = ref<CharacterGender>('MALE' as CharacterGender.MALE)
+const characterRace = ref<CharacterRace>('HUMAN' as CharacterRace.HUMAN)
+const characterSpriteId = ref('')
+
+const genderOptions: CharacterGender[] = ['MALE' as CharacterGender.MALE, 'FEMALE' as CharacterGender.FEMALE]
+const raceOptions: CharacterRace[] = ['HUMAN' as CharacterRace.HUMAN, 'ELF' as CharacterRace.ELF, 'DWARF' as CharacterRace.DWARF, 'ORC' as CharacterRace.ORC, 'GOBLIN' as CharacterRace.GOBLIN]
+
+if (!selectedCharacterType.value) {
+  console.error('No character type selected')
+}
+
+if (selectedCharacterType.value) {
+  characterName.value = selectedCharacterType.value.name
+  characterGender.value = selectedCharacterType.value.gender
+  characterRace.value = selectedCharacterType.value.race
+  characterSpriteId.value = selectedCharacterType.value.spriteId
+}
+
+function removeCharacterType() {
+  if (!selectedCharacterType.value) return
+
+  gameStore.connection?.emit('gm:characterType:remove', { id: selectedCharacterType.value.id }, (response: boolean) => {
+    if (!response) {
+      console.error('Failed to remove character type')
+      return
+    }
+    refreshCharacterTypeList()
+  })
+}
+
+function refreshCharacterTypeList(unsetSelectedCharacterType = true) {
+  gameStore.connection?.emit('gm:characterType:list', {}, (response: CharacterType[]) => {
+    assetManagerStore.setCharacterTypeList(response)
+
+    if (unsetSelectedCharacterType) {
+      assetManagerStore.setSelectedCharacterType(null)
+    }
+  })
+}
+
+function saveCharacterType() {
+  const characterTypeData = {
+    id: selectedCharacterType.value?.id,
+    name: characterName.value,
+    gender: characterGender.value,
+    race: characterRace.value,
+    spriteId: characterSpriteId.value
+  }
+
+  gameStore.connection?.emit('gm:characterType:update', characterTypeData, (response: boolean) => {
+    if (!response) {
+      console.error('Failed to save character type')
+      return
+    }
+    refreshCharacterTypeList(false)
+  })
+}
+
+watch(selectedCharacterType, (characterType: CharacterType | null) => {
+  if (!characterType) return
+  characterName.value = characterType.name
+  characterGender.value = characterType.gender
+  characterRace.value = characterType.race
+  characterSpriteId.value = characterType.spriteId
+})
+
+onMounted(() => {
+  if (!selectedCharacterType.value) return
+})
+
+onBeforeUnmount(() => {
+  assetManagerStore.setSelectedCharacterType(null)
+})
+</script>
diff --git a/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
new file mode 100644
index 0000000..168470a
--- /dev/null
+++ b/src/components/gameMaster/assetManager/partials/characterType/CharacterTypeList.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="relative p-2.5 flex items-center gap-x-2.5">
+    <input v-model="searchQuery" class="input-field flex-grow" placeholder="Search..." @input="handleSearch" />
+    <label for="create-character" class="bg-cyan/50 border border-solid border-white/25 rounded drop-shadow-20 p-2 inline-flex items-center justify-center hover:bg-cyan hover:cursor-pointer">
+      <button id="create-character" @click="createNewCharacterType">
+        <svg xmlns="http://www.w3.org/2000/svg" class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4" />
+        </svg>
+      </button>
+    </label>
+    <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
+  </div>
+  <div v-bind="containerProps" class="overflow-y-auto relative" @scroll="onScroll">
+    <div v-bind="wrapperProps" ref="elementToScroll">
+      <a v-for="{ data: characterType } in list" :key="characterType.id" class="relative p-2.5 cursor-pointer block" :class="{ 'bg-cyan/80': assetManagerStore.selectedCharacterType?.id === characterType.id }" @click="assetManagerStore.setSelectedCharacterType(characterType as CharacterType)">
+        <div class="flex items-center gap-2.5">
+          <span>{{ characterType.name }}</span>
+        </div>
+        <div class="absolute left-0 bottom-0 w-full h-px bg-gray-500"></div>
+      </a>
+    </div>
+    <button class="left-[calc(50%_-_60px)] fixed bottom-2.5 min-w-[unset] w-12 h-12 rounded-md bg-cyan/50 p-0 hover:bg-cyan" v-show="hasScrolled" @click="toTop">
+      <img class="absolute invert w-8 h-8 left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 rotate-180" src="/assets/icons/zoneEditor/chevron.svg" alt="" />
+    </button>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useGameStore } from '@/stores/gameStore'
+import { onMounted, ref, computed } from 'vue'
+import { useAssetManagerStore } from '@/stores/assetManagerStore'
+import type { CharacterType } from '@/types'
+import { useVirtualList } from '@vueuse/core'
+
+const gameStore = useGameStore()
+const assetManagerStore = useAssetManagerStore()
+
+const searchQuery = ref('')
+
+const hasScrolled = ref(false)
+const elementToScroll = ref()
+
+const handleSearch = () => {
+  // Trigger a re-render of the virtual list
+  virtualList.value?.scrollTo(0)
+}
+
+const createNewCharacterType = () => {
+  gameStore.connection?.emit('gm:characterType:create', {}, (response: boolean) => {
+    if (!response) {
+      console.error('Failed to create new character type')
+      return
+    }
+
+    gameStore.connection?.emit('gm:characterType:list', {}, (response: CharacterType[]) => {
+      assetManagerStore.setCharacterTypeList(response)
+    })
+  })
+}
+
+const filteredCharacterTypes = computed(() => {
+  if (!searchQuery.value) {
+    return assetManagerStore.characterTypeList
+  }
+  return assetManagerStore.characterTypeList.filter((character) => character.name.toLowerCase().includes(searchQuery.value.toLowerCase()))
+})
+
+const { list, containerProps, wrapperProps, scrollTo } = useVirtualList(filteredCharacterTypes, {
+  itemHeight: 48
+})
+
+const virtualList = ref({ scrollTo })
+
+const onScroll = () => {
+  let scrollTop = elementToScroll.value.style.marginTop.replace('px', '')
+
+  if (scrollTop > 80) {
+    hasScrolled.value = true
+  } else if (scrollTop <= 80) {
+    hasScrolled.value = false
+  }
+}
+
+function toTop() {
+  virtualList.value?.scrollTo(0)
+}
+
+onMounted(() => {
+  gameStore.connection?.emit('gm:characterType:list', {}, (response: CharacterType[]) => {
+    assetManagerStore.setCharacterTypeList(response)
+  })
+})
+</script>
diff --git a/src/components/gameMaster/zoneEditor/partials/ZoneSettings.vue b/src/components/gameMaster/zoneEditor/partials/ZoneSettings.vue
index c8daed8..7c884b0 100644
--- a/src/components/gameMaster/zoneEditor/partials/ZoneSettings.vue
+++ b/src/components/gameMaster/zoneEditor/partials/ZoneSettings.vue
@@ -82,9 +82,13 @@ watch(pvp, (value) => {
   zoneEditorStore.setZonePvp(value)
 })
 
-watch(zoneEffects, (value) => {
-  zoneEditorStore.setZoneEffects(value)
-}, { deep: true })
+watch(
+  zoneEffects,
+  (value) => {
+    zoneEditorStore.setZoneEffects(value)
+  },
+  { deep: true }
+)
 
 const addEffect = () => {
   zoneEffects.value.push({
@@ -99,4 +103,4 @@ const addEffect = () => {
 const removeEffect = (index) => {
   zoneEffects.value.splice(index, 1)
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/utilities/Modal.vue b/src/components/utilities/Modal.vue
index 0076189..ba6ba80 100644
--- a/src/components/utilities/Modal.vue
+++ b/src/components/utilities/Modal.vue
@@ -8,7 +8,7 @@
         </div>
         <div class="flex gap-2.5">
           <button @click="toggleFullScreen" class="w-5 h-5 m-0 p-0 relative hover:scale-110 transition-transform duration-300 ease-in-out" v-if="canFullScreen">
-            <img :alt="isFullScreen ? 'exit full-screen' : 'full-screen'" draggable="false" :src="isFullScreen ? '/assets/icons/minimize.svg' : '/assets/icons/full-screen.svg'" class="w-3.5 h-3.5 invert" />
+            <img :alt="isFullScreen ? 'exit full-screen' : 'full-screen'" draggable="false" :src="isFullScreen ? '/assets/icons/minimize.svg' : '/assets/icons/increase-size-option.svg'" class="w-3.5 h-3.5 invert" />
           </button>
           <button @click="close" v-if="closable" class="w-3.5 h-3.5 m-0 p-0 relative hover:rotate-180 transition-transform duration-300 ease-in-out">
             <img alt="close" draggable="false" src="/assets/icons/close-button-white.svg" class="w-full h-full" />
diff --git a/src/composables/zoneComposable.ts b/src/composables/zoneComposable.ts
index ce87011..0879d64 100644
--- a/src/composables/zoneComposable.ts
+++ b/src/composables/zoneComposable.ts
@@ -83,7 +83,9 @@ export const sortByIsometricDepth = <T extends { positionX: number; positionY: n
   })
 }
 
-export const clearAssets = (scene: Phaser.Scene) => {}
+export const clearAssets = (scene: Phaser.Scene) => {
+  scene.load.destroy()
+}
 
 export const loadAssets = (scene: Phaser.Scene): Promise<void> => {
   return new Promise((resolve) => {
diff --git a/src/stores/assetManagerStore.ts b/src/stores/assetManagerStore.ts
index b1f2c5a..72c9c69 100644
--- a/src/stores/assetManagerStore.ts
+++ b/src/stores/assetManagerStore.ts
@@ -1,6 +1,6 @@
 import { ref } from 'vue'
 import { defineStore } from 'pinia'
-import type { Tile, Object, Sprite } from '@/types'
+import type { Tile, Object, Sprite, CharacterType } from '@/types'
 
 export const useAssetManagerStore = defineStore('assetManager', () => {
   const tileList = ref<Tile[]>([])
@@ -12,6 +12,9 @@ export const useAssetManagerStore = defineStore('assetManager', () => {
   const spriteList = ref<Sprite[]>([])
   const selectedSprite = ref<Sprite | null>(null)
 
+  const characterTypeList = ref<CharacterType[]>([])
+  const selectedCharacterType = ref<CharacterType | null>(null)
+
   function setTileList(tiles: Tile[]) {
     tileList.value = tiles
   }
@@ -36,6 +39,14 @@ export const useAssetManagerStore = defineStore('assetManager', () => {
     selectedSprite.value = sprite
   }
 
+  function setCharacterTypeList(characterTypes: CharacterType[]) {
+    characterTypeList.value = characterTypes
+  }
+
+  function setSelectedCharacterType(characterType: CharacterType | null) {
+    selectedCharacterType.value = characterType
+  }
+
   return {
     tileList,
     selectedTile,
@@ -43,11 +54,15 @@ export const useAssetManagerStore = defineStore('assetManager', () => {
     selectedObject,
     spriteList,
     selectedSprite,
+    characterTypeList,
+    selectedCharacterType,
     setTileList,
     setSelectedTile,
     setObjectList,
+    setCharacterTypeList,
     setSelectedObject,
     setSpriteList,
-    setSelectedSprite
+    setSelectedSprite,
+    setSelectedCharacterType
   }
 })
diff --git a/src/types.ts b/src/types.ts
index 0a7d20e..a784736 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -136,8 +136,8 @@ export type CharacterType = {
   gender: CharacterGender
   race: CharacterRace
   characters: Character[]
-  spriteId: string
-  sprite: Sprite
+  spriteId?: string
+  sprite?: Sprite
   createdAt: Date
   updatedAt: Date
 }