diff --git a/package-lock.json b/package-lock.json
index 35cd101..11b14cd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,6 +27,7 @@
 				"sass": "^1.54.0",
 				"svelte": "^4.2.15",
 				"svelte-check": "^3.4.3",
+				"svelte-feather-icons": "^4.1.0",
 				"svelte-preprocess": "^5.0.4",
 				"tslib": "^2.4.0",
 				"typesafe-event-emitter": "^1.1.0",
@@ -710,12 +711,12 @@
 			}
 		},
 		"node_modules/braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
 			"dev": true,
 			"dependencies": {
-				"fill-range": "^7.0.1"
+				"fill-range": "^7.1.1"
 			},
 			"engines": {
 				"node": ">=8"
@@ -956,9 +957,9 @@
 			}
 		},
 		"node_modules/fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
 			"dev": true,
 			"dependencies": {
 				"to-regex-range": "^5.0.1"
@@ -1630,6 +1631,24 @@
 				"svelte": "^3.55.0 || ^4.0.0-next.0 || ^4.0.0 || ^5.0.0-next.0"
 			}
 		},
+		"node_modules/svelte-feather-icons": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/svelte-feather-icons/-/svelte-feather-icons-4.1.0.tgz",
+			"integrity": "sha512-fcTL4VzEN4BoccQJjKiui0b9DWEsmO6zGpI0tQTJbthRtNrYheoU487zyA1BD8rj9kj6jbKGmGVo7zbSdRvMvA==",
+			"dev": true,
+			"dependencies": {
+				"svelte": "^3.38.2"
+			}
+		},
+		"node_modules/svelte-feather-icons/node_modules/svelte": {
+			"version": "3.59.2",
+			"resolved": "https://registry.npmjs.org/svelte/-/svelte-3.59.2.tgz",
+			"integrity": "sha512-vzSyuGr3eEoAtT/A6bmajosJZIUWySzY2CzB3w2pgPvnkUjGqlDnsNnA0PMO+mMAhuyMul6C2uuZzY6ELSkzyA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 8"
+			}
+		},
 		"node_modules/svelte-hmr": {
 			"version": "0.15.3",
 			"resolved": "https://registry.npmjs.org/svelte-hmr/-/svelte-hmr-0.15.3.tgz",
diff --git a/package.json b/package.json
index dd9f60b..611e7f5 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
 		"sass": "^1.54.0",
 		"svelte": "^4.2.15",
 		"svelte-check": "^3.4.3",
+		"svelte-feather-icons": "^4.1.0",
 		"svelte-preprocess": "^5.0.4",
 		"tslib": "^2.4.0",
 		"typesafe-event-emitter": "^1.1.0",
diff --git a/src/app.html b/src/app.html
index 952997e..75bcaf1 100644
--- a/src/app.html
+++ b/src/app.html
@@ -4,8 +4,6 @@
 		<meta charset="utf-8" />
 		<link rel="icon" href="favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
-
-		<script src="https://unpkg.com/feather-icons"></script>
 		
 		%sveltekit.head%
 	</head>
diff --git a/src/elf/fileTypes.ts b/src/elf/fileTypes.ts
index 848a1bc..20940fe 100644
--- a/src/elf/fileTypes.ts
+++ b/src/elf/fileTypes.ts
@@ -662,7 +662,7 @@ function generateTypedefFor(dataType: DataType, typedef: TypeDefinition): FileTy
 		
 		instantiate(): object {
 			let result = {}
-			result[VALUE_UUID] = ValueUuid()
+			result[VALUE_UUID] = ValueUuid('instantiate()')
 			result[DATA_TYPE] = dataType
 			
 			for (const [fieldName, type] of Object.entries(fieldTypes)) {
diff --git a/src/elf/parser.ts b/src/elf/parser.ts
index 9f85356..94fa95e 100644
--- a/src/elf/parser.ts
+++ b/src/elf/parser.ts
@@ -281,6 +281,8 @@ export default function parseElfBinary(dataType: DataType, arrayBuffer: ArrayBuf
 			let obj = objFromReader(reader, dataType) as Instance<T>
 			applyRelocations(obj, offset, relocations, symbolTable, stringSection, dataType, allowSkippingRelocations)
 			
+			obj[VALUE_UUID] = ValueUuid(DataType[dataType] + " " + obj[FILE_TYPES[dataType].identifyingField])
+			
 			result.push(obj)
 		}
 		
@@ -290,9 +292,9 @@ export default function parseElfBinary(dataType: DataType, arrayBuffer: ArrayBuf
 }
 
 function objFromReader(reader: BinaryReader, dataType: DataType): UuidTagged {
-	let result = {
-		[VALUE_UUID]: ValueUuid(),
-		[DATA_TYPE]: dataType,
+	// @ts-expect-error
+	let result: UuidTagged = {
+		[DATA_TYPE]: dataType
 	}
 	
 	for (const [fieldName, fieldType] of Object.entries(FILE_TYPES[dataType].typedef)) {
diff --git a/src/elf/util.ts b/src/elf/util.ts
index 952472c..bc47c17 100644
--- a/src/elf/util.ts
+++ b/src/elf/util.ts
@@ -55,7 +55,7 @@ export function duplicateObjectInBinary<T extends object>(binary: ElfBinary, dat
 		let clone = {...obj}
 		Object.setPrototypeOf(clone, Object.getPrototypeOf(obj))
 		
-		clone[VALUE_UUID] = ValueUuid()
+		clone[VALUE_UUID] = ValueUuid(`cloned ${DataType[dataType]} ${clone[FILE_TYPES[dataType].identifyingField]}`)
 		
 		if (incrementId && FILE_TYPES[dataType].identifyingField == "id") {
 			// @ts-ignore
diff --git a/src/elf/valueIdentifier.ts b/src/elf/valueIdentifier.ts
index d7c78cc..e38bd0d 100644
--- a/src/elf/valueIdentifier.ts
+++ b/src/elf/valueIdentifier.ts
@@ -10,6 +10,6 @@ export interface UuidTagged {
 	[DATA_TYPE]: DataType
 }
 
-export function ValueUuid() {
-	return Symbol()
+export function ValueUuid(label: string) {
+	return Symbol(`UUID: ${label}`)
 }
diff --git a/src/lib/editor/fileEditor/cardListEditor/BasicObjectArray.svelte b/src/lib/editor/fileEditor/cardListEditor/BasicObjectArray.svelte
index 2a21536..d1cee96 100644
--- a/src/lib/editor/fileEditor/cardListEditor/BasicObjectArray.svelte
+++ b/src/lib/editor/fileEditor/cardListEditor/BasicObjectArray.svelte
@@ -12,23 +12,29 @@
     import { toReadableString } from "$lib/util";
     import { showModal } from "$lib/modal/modal";
     import FieldOptionAlert from "$lib/modals/FieldOptionAlert.svelte";
-
+	
+	const INITIAL_COUNT_SHOWN = 60
+	
 	export let binary: ElfBinary
 	export let objects: UuidTagged[]
-	export let referenceObjects: UuidTagged[]
 	export let dataType: DataType
+	export let indices: Set<number> = undefined
 	export let highlightedFields: WeakMap<object, string[]> = undefined
 	
 	let objectEditors: ObjectEditor[] = []
 	let areEditorsOpen: boolean[] = []
-	let countShown = 60
+	let countShown = INITIAL_COUNT_SHOWN
 	
 	let debouncer: Debouncer
 	
-	$: objectSlice = objects.slice(0, countShown)
+	$: objectSlice = indices
+		? [...indices].slice(0, countShown).map(i => objects[i])
+		: objects.slice(0, countShown)
 	
 	$: if (objects && debouncer) debouncer.reset()
 	
+	$: if (indices) countShown = INITIAL_COUNT_SHOWN
+	
 	onMount(() => {
 		let isDebug = !!parseInt(PUBLIC_DEBUG)
 		
@@ -45,7 +51,6 @@
 		}
 	})
 	
-	
 	export function scrollIntoView(object?: UuidTagged) {
 		let index = object ? objects.indexOf(object) : objects.length - 1
 		
@@ -93,7 +98,7 @@
 	
 	function titleOf(obj: any) {
 		let { displayName, identifyingField } = FILE_TYPES[dataType]
-		let index = referenceObjects.indexOf(obj)
+		let index = objects.indexOf(obj)
 		return `${displayName} ${index}: ${obj[identifyingField]}`
 	}
 	
@@ -104,7 +109,7 @@
 	}
 </script>
 
-<Debouncer bind:this={debouncer} requiredDelaySeconds={2} autoStart={true} on:finished={() => countShown += 80} />
+<Debouncer bind:this={debouncer} requiredDelaySeconds={1} autoStart={true} on:finished={() => countShown += 80} />
 
 {#each objectSlice as obj, i (obj[VALUE_UUID])}
 	<ObjectEditor bind:this={objectEditors[i]} bind:obj={obj} bind:open={areEditorsOpen[i]}
diff --git a/src/lib/editor/fileEditor/cardListEditor/FileToolbar.svelte b/src/lib/editor/fileEditor/cardListEditor/FileToolbar.svelte
index 6d8a05b..c8b4b10 100644
--- a/src/lib/editor/fileEditor/cardListEditor/FileToolbar.svelte
+++ b/src/lib/editor/fileEditor/cardListEditor/FileToolbar.svelte
@@ -3,6 +3,7 @@
     import SearchBar from "../../search/SearchBar.svelte";
     import type { SearchIndex } from "../../search/searchIndex";
     import { nonnativeButton } from "$lib/nonnativeButton";
+    import { PlusIcon, XIcon } from "svelte-feather-icons";
 	
 	export let searchIndex: SearchIndex
 	export let searchTerm: string = ""
@@ -13,11 +14,11 @@
 
 <div class="toolbar">
 	<div class="card btn" use:nonnativeButton={() => dispatch('add')}>
-		<div class="icon"><i data-feather="plus"></i></div>
+		<div class="icon"><PlusIcon /></div>
 		<span>Add new Object</span>
 	</div>
 	<div class="card btn" use:nonnativeButton={() => dispatch('clear')}>
-		<div class="icon"><i data-feather="x"></i></div>
+		<div class="icon"><XIcon /></div>
 		Delete all Objects
 	</div>
 	<SearchBar index={searchIndex} bind:searchTerm={searchTerm} bind:results={searchResults} />
diff --git a/src/lib/editor/fileEditor/cardListEditor/InnerIndexPageEditor.svelte b/src/lib/editor/fileEditor/cardListEditor/InnerIndexPageEditor.svelte
index 061c4b2..838e322 100644
--- a/src/lib/editor/fileEditor/cardListEditor/InnerIndexPageEditor.svelte
+++ b/src/lib/editor/fileEditor/cardListEditor/InnerIndexPageEditor.svelte
@@ -5,6 +5,7 @@
     import { nonnativeButton } from "$lib/nonnativeButton";
     import { OpenWindowEvent } from "$lib/editor/events";
     import type { ElfBinary } from "paper-mario-elfs/elfBinary";
+    import { ExternalLinkIcon } from "svelte-feather-icons";
 
 	const dispatch = createEventDispatcher()
 	
@@ -22,11 +23,6 @@
 		editorElements.forEach(editor => editor.open = true)
 	}
 	
-	onMount(() => {
-		// @ts-ignore
-		feather.replace()
-	})
-	
 	$: items = Object.entries(dataTypeExtensions(DataTypeExtension.ComplexEditorCategory, dataType))
 </script>
 
@@ -39,7 +35,7 @@
 				dataType,
 			}))
 		}}>
-			<i data-feather="external-link" class="icon-link"></i>
+			<ExternalLinkIcon class="icon-link" />
 			<div style="user-select: none">
 				{label ?? name}
 			</div>
@@ -53,7 +49,7 @@
 		max-width: 56rem;
 		height: 20px;
 		
-		.icon-link {
+		:global(.icon-link) {
 			float: left;
 			margin-top: -2px;
 			margin-right: 6px;
diff --git a/src/lib/editor/fileEditor/cardListEditor/LinearEditor.svelte b/src/lib/editor/fileEditor/cardListEditor/LinearEditor.svelte
index 912726f..decc1a0 100644
--- a/src/lib/editor/fileEditor/cardListEditor/LinearEditor.svelte
+++ b/src/lib/editor/fileEditor/cardListEditor/LinearEditor.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { afterUpdate } from "svelte";
 	import type { ElfBinary } from "paper-mario-elfs/elfBinary";
-	import type { DataType } from "paper-mario-elfs/dataType";
+	import { DataType } from "paper-mario-elfs/dataType";
 	import { FILE_TYPES } from "paper-mario-elfs/fileTypes";
 	import { Symbol } from "paper-mario-elfs/types";
 	import type { SearchIndex } from "$lib/editor/search/searchIndex";
@@ -22,27 +22,14 @@
 	let addingNewObject = false
 	let searchTerm = ""
 	let searchResults: SearchIndex
-	let searchResultObjects: UuidTagged[]
-	
-	let searchResultObjectBuffer: UuidTagged[]
 	
 	$: objects = overrideObjects ?? binary.data[FILE_TYPES[dataType].dataDivision]
 	$: index = createIndex(objects)
 	
 	$: if (tabVisible) initialized = true
 	
-	$: highlightedFields = searchResults && new WeakMap(
-		searchResultObjects.map(obj => [
-			obj, 
-			searchResults.filter(result => result.obj == obj).map(result => result.field),
-		]))
-	
-	$: if (searchResults) {
-		searchResultObjects = []
-		searchResultObjectBuffer = [...new Set(searchResults.map(result => result.obj))]
-	} else {
-		searchResultObjects = null
-	}
+	$: highlightedFields = searchResults && getHighlightedFields(searchResults)
+	
 	
 	export function collapseAll() {
 		arrayComponent.collapseAll()
@@ -55,11 +42,13 @@
 	function createIndex(objects: UuidTagged[]) {
 		let index: SearchIndex = []
 		
-		for (const obj of objects) {
+		for (let i = 0; i < objects.length; i++) {
+			const obj = objects[i]
+			
 			for (const key in obj) {
 				if (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] == 'string') {
 					index.push({
-						obj,
+						index: i,
 						field: key,
 						value: obj[key],
 					})
@@ -71,19 +60,29 @@
 	}
 	
 	afterUpdate(() => {
-		// @ts-ignore
-		feather.replace()
-		
 		if (addingNewObject) {
 			addingNewObject = false
 			arrayComponent.scrollIntoView(objects[objects.length - 1])
 		}
+	})
+	
+	function getHighlightedFields(searchResults: SearchIndex) {
+		let highlightedFields: WeakMap<UuidTagged, string[]> = new WeakMap()
 		
-		if (searchResultObjectBuffer) {
-			searchResultObjects = searchResultObjectBuffer
-			searchResultObjectBuffer = null
+		for (const index of new Set(searchResults.map(result => result.index))) {
+			let fields: string[] = []
+			
+			for (const result of searchResults) {
+				if (result.index == index) {
+					fields.push(result.field)
+				}
+			}
+			
+			highlightedFields.set(objects[index], fields)
 		}
-	})
+		
+		return highlightedFields
+	}
 	
 	function addObject() {
 		objects.push(createObject(dataType))
@@ -155,14 +154,11 @@
 
 {#if initialized}
 <div class="editor">
-	<!-- TODO: if objects contain symbol references, it's important that there is always one object left -->
-	<!-- Ask for confirmation in this case when pressing Delete All -->
-	<!-- TODO: do the same on delete button in object editors -->
 	<FileToolbar on:add={addObject} on:clear={deleteAll} searchIndex={index} bind:searchTerm={searchTerm} bind:searchResults={searchResults} />
 	
 	<div class="listing" style="--content-height: {objects?.length * 60 + 80}px;">
 		{#if searchResults}
-			<div class="resultlabel">Showing {searchResultObjects.length} results
+			<div class="resultlabel">Showing {searchResults.length} results
 				(out of {objects.length} objects):</div>
 		{/if}
 		
@@ -171,8 +167,8 @@
 		{/if}
 		
 		<BasicObjectArray on:open on:createContent={e => handleCreateContent(e.detail)}
-			bind:this={arrayComponent} binary={binary} dataType={dataType} referenceObjects={objects}
-			objects={searchResults ? searchResultObjects : objects} highlightedFields={highlightedFields} />
+			bind:this={arrayComponent} bind:objects={objects} binary={binary} dataType={dataType}
+			highlightedFields={highlightedFields} indices={searchResults && new Set(searchResults.map(result => result.index))} />
 	</div>
 	
 	<!-- TODO: use a dedicated special elf editor instead -->
diff --git a/src/lib/editor/fileEditor/welcomeScreen/FileTree.svelte b/src/lib/editor/fileEditor/welcomeScreen/FileTree.svelte
index 198569f..f828a3d 100644
--- a/src/lib/editor/fileEditor/welcomeScreen/FileTree.svelte
+++ b/src/lib/editor/fileEditor/welcomeScreen/FileTree.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
     import type { FileSystem } from "$lib/save/vfs";
-    import { waitAnimationFrame } from "$lib/util";
     import path from "path-browserify";
     import { afterUpdate, createEventDispatcher, onMount } from "svelte";
     import areaNames from "./areaNames.json"
+    import { ChevronDownIcon } from "svelte-feather-icons";
 
     interface FsItem {
         path: string
@@ -51,21 +51,11 @@
         getRomfsList().then(async list => {
             fileTree = list
             console.log('updated romfs list')
-            
-            await waitAnimationFrame()
-            
-            // @ts-ignore
-            feather.replace()
         })
     }
     
     $: localStorage.setItem('romfs_list_cache', JSON.stringify(fileTree))
     
-    onMount(() => {
-        // @ts-ignore
-        feather.replace()
-    })
-    
     afterUpdate(() => {
         showMoreVisible = treeElement?.getBoundingClientRect().height >= 400
     })
@@ -178,7 +168,7 @@
                 class:collapsed={item.isCollapsed} class:file={item.isFile} class="fs-item"
                 class:invisible={!itemsVisible[i]} role="menuitem" tabindex="0">
                 {#if !item.isFile}
-                    <i data-feather="chevron-down" class="arrow"></i>
+                    <ChevronDownIcon class="arrow" />
                 {/if}
                 <span>{item.name}</span>
                 {#if item.intuitiveName}
@@ -232,13 +222,13 @@
         text-align: center;
     }
     
-    .arrow {
+    :global(.arrow) {
         float: left;
         height: 20px;
         transform: translateY(1px);
     }
     
-    .collapsed .arrow {
+    .collapsed :global(.arrow) {
         transform: translateY(1px) rotateZ(-90deg);
     }
     
diff --git a/src/lib/editor/objectEditor/ButtonStrip.svelte b/src/lib/editor/objectEditor/ButtonStrip.svelte
index ec6baea..0dfd972 100644
--- a/src/lib/editor/objectEditor/ButtonStrip.svelte
+++ b/src/lib/editor/objectEditor/ButtonStrip.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { createEventDispatcher } from "svelte";
+    import { CopyIcon, XIcon } from "svelte-feather-icons";
 	
 	const dispatch = createEventDispatcher()
 </script>
@@ -7,10 +8,10 @@
 <div class="buttons">
     <button class="icon duplicate" on:click|stopPropagation={() => {
         dispatch('duplicate')
-    }}><i data-feather="copy"></i></button>
+    }}><CopyIcon /></button>
     <button class="icon delete" on:click|stopPropagation={() => {
         dispatch('delete')
-    }}><i data-feather="x"></i></button>
+    }}><XIcon /></button>
 </div>
 
 <style>
diff --git a/src/lib/editor/objectEditor/FieldIcons.svelte b/src/lib/editor/objectEditor/FieldIcons.svelte
index 16f1b49..0741f57 100644
--- a/src/lib/editor/objectEditor/FieldIcons.svelte
+++ b/src/lib/editor/objectEditor/FieldIcons.svelte
@@ -6,6 +6,7 @@
 	import { toReadableString } from "$lib/util";
     import { createEventDispatcher, onMount } from "svelte";
     import { nonnativeButton } from "$lib/nonnativeButton";
+    import { InfoIcon, MoreHorizontalIcon } from "svelte-feather-icons";
 	
     const dispatch = createEventDispatcher()
     
@@ -20,21 +21,16 @@
         })
     }
     
-    onMount(() => {
-        // @ts-ignore
-        feather.replace()
-    })
-    
     $: fieldDescription = FILE_TYPES[dataType].metadata[fieldName]?.description?.trim()
 </script>
 
 <div class="buttons" class:shown={shown}>
     <div class="button description" class:hidden={fieldDescription == undefined} use:nonnativeButton={showDescription}>
-        <i data-feather="info" class="icon-field"></i>
+        <InfoIcon class="icon-field" />
     </div>
     
     <div class="button options" use:nonnativeButton={() => dispatch('showMenu', { fieldName, dataType })}>
-        <i data-feather="more-horizontal" class="icon-field"></i>
+        <MoreHorizontalIcon class="icon-field" />
     </div>
 </div>
 
@@ -58,7 +54,7 @@
         
         &:hover { color: #777a80 }
         
-        .icon-field {
+        :global(.icon-field) {
             width: 18px;
             height: 18px;
             transform: translateY(1px);
diff --git a/src/lib/editor/objectEditor/ObjectEditor.svelte b/src/lib/editor/objectEditor/ObjectEditor.svelte
index 337ec29..805b2f7 100644
--- a/src/lib/editor/objectEditor/ObjectEditor.svelte
+++ b/src/lib/editor/objectEditor/ObjectEditor.svelte
@@ -12,8 +12,7 @@
 	import ButtonStrip from './ButtonStrip.svelte';
 	import FieldIcons from './FieldIcons.svelte';
 	import ObjectEditorTailExpander from './ObjectEditorTailExpander.svelte';
-	import { showModal } from "$lib/modal/modal";
-	import FieldOptionAlert from "$lib/modals/FieldOptionAlert.svelte";
+    import { ChevronDownIcon } from "svelte-feather-icons";
 	
 	// TODO: try using event maps
 	const dispatch = createEventDispatcher()
@@ -60,9 +59,6 @@
 	}
 	
 	onMount(() => {
-		// @ts-ignore
-		feather.replace()
-		
 		window.addEventListener('scroll', viewportCheck)
 		window.addEventListener('mousemove', onMouseMove)
 		
@@ -124,7 +120,7 @@
 	<div class="title" class:rotated={open}
 		on:click={onTitleClick} on:keypress={keyPress} tabindex="0" role="button">
 		
-		<i data-feather="chevron-down" class="icon-arrow"></i><span class="titleLabel">{title}</span>
+		<ChevronDownIcon class="icon-arrow" /><span class="titleLabel">{title}</span>
 		
 		{#if showButtons}
 			<ButtonStrip on:duplicate on:delete></ButtonStrip>
@@ -188,14 +184,14 @@
 		user-select: none;
 		height: 20px;
 		
-		.icon-arrow {
+		:global(.icon-arrow) {
 			float: left;
 			
 			margin-top: -1px;
 			margin-right: 1px;
 		}
 		
-		&.rotated .icon-arrow {
+		&.rotated :global(.icon-arrow) {
 			transform: rotate(180deg);
 		}
 		
diff --git a/src/lib/editor/objectEditor/ObjectEditorTailExpander.svelte b/src/lib/editor/objectEditor/ObjectEditorTailExpander.svelte
index 79463bd..c00dc2a 100644
--- a/src/lib/editor/objectEditor/ObjectEditorTailExpander.svelte
+++ b/src/lib/editor/objectEditor/ObjectEditorTailExpander.svelte
@@ -3,12 +3,12 @@
 	import type { DataType } from "paper-mario-elfs/dataType";
     import { FILE_TYPES } from "paper-mario-elfs/fileTypes";
     import type { UuidTagged } from "paper-mario-elfs/valueIdentifier";
-    import { afterUpdate } from "svelte";
 	
     import { toReadableString } from "$lib/util";
     import { nonnativeButton } from "$lib/nonnativeButton";
 	
     import ObjectEditor from "./ObjectEditor.svelte";
+    import { ChevronDownIcon } from "svelte-feather-icons";
 
 	export let dataType: DataType
 	export let visible: boolean
@@ -16,32 +16,19 @@
 	export let binary: ElfBinary = undefined
 	
 	let isOpen: boolean = false
-	let replace = false
 		
 	$: childField = FILE_TYPES[dataType].childField ?? undefined
 	$: childFieldLabel = FILE_TYPES[dataType].childFieldLabel ?? undefined
 	
 	$: childContent = "children" in child ? child.children as unknown[] : "item" in child ? child.item as object : child
 	
-	
 	$: childDataType = dataType ? FILE_TYPES[dataType].childTypes[childField] : undefined
-	
-	$: if (isOpen) replace = true
-	
-	// TODO: do this in ObjectEditor instead and disable it while loading a file for loading times using getContext
-	afterUpdate(() => {
-		if (replace) {
-			// @ts-ignore
-			feather.replace()
-			replace = false
-		}
-	})
 </script>
 
 	<div class="child_container" class:invisible={!visible}>
 		<div class="showChildren" use:nonnativeButton={() => isOpen = !isOpen}>
 			<div class:rotated={isOpen}>
-				<i data-feather="chevron-down" class="icon-children-arrow"></i>
+				<ChevronDownIcon class="icon-children-arrow" />
 			</div>
 			<span>{toReadableString(childFieldLabel ?? childField)}</span>
 		</div>
@@ -84,7 +71,7 @@
 				transform: rotate(180deg);
 			}
 			
-			.icon-children-arrow {
+			:global(.icon-children-arrow) {
 				width: 29px;
 				height: 29px;
 				stroke-width: 1.8px;
diff --git a/src/lib/editor/search/SearchBar.svelte b/src/lib/editor/search/SearchBar.svelte
index f37acd1..84838eb 100644
--- a/src/lib/editor/search/SearchBar.svelte
+++ b/src/lib/editor/search/SearchBar.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import fuzzysort from "fuzzysort"
     import type { IndexValue, SearchIndex } from "./searchIndex";
+    import { SearchIcon } from "svelte-feather-icons";
     
     export let index: SearchIndex
     export let searchTerm: string = ""
@@ -19,7 +20,7 @@
 
 <!-- svelte-ignore a11y-no-static-element-interactions -->
 <div class="card search" on:click={() => searchInput.focus()} on:keydown={() => searchInput.focus()}>
-    <div class="icon"><i data-feather="search"></i></div>
+    <div class="icon"><SearchIcon /></div>
     &nbsp;
     <input type="text" class="input" placeholder="Search" size="1"
         bind:this={searchInput} bind:value={searchTerm}>
diff --git a/src/lib/editor/search/searchIndex.ts b/src/lib/editor/search/searchIndex.ts
index b3635c7..e3c9f08 100644
--- a/src/lib/editor/search/searchIndex.ts
+++ b/src/lib/editor/search/searchIndex.ts
@@ -1,9 +1,7 @@
-import type { UuidTagged } from "paper-mario-elfs/valueIdentifier";
-
 export interface IndexValue {
-    obj: UuidTagged,
-    field: string,
-    value: string,
+    index: number
+    field: string
+    value: string
 }
 
 export type SearchIndex = IndexValue[]
diff --git a/src/lib/editor/windowing/EditorTabBar.svelte b/src/lib/editor/windowing/EditorTabBar.svelte
index 32a5ecc..553f12d 100644
--- a/src/lib/editor/windowing/EditorTabBar.svelte
+++ b/src/lib/editor/windowing/EditorTabBar.svelte
@@ -5,6 +5,7 @@
     import { type Tab, tabWasAccepted, globalDraggedTab } from "../globalDragging";
     import { browser } from "$app/environment";
     import logging from "$lib/logging";
+    import { XIcon } from "svelte-feather-icons";
 
 	export let tabs: Tab[]
 	export let activeIndex: number
@@ -51,9 +52,6 @@
 	onMount(() => {
 		document.addEventListener('mousemove', onMouseMove)
 		document.addEventListener('mouseup', onMouseUp)
-		
-		// @ts-ignore
-		feather.replace()
 	})
 	
 	onDestroy(() => {
@@ -79,9 +77,6 @@
 	function afterDetached() {
 		console.log('afterDetached happening', debugIndex)
 		
-		// @ts-ignore
-		feather.replace()
-		
 		if ($tabWasAccepted) {
 			console.log('tab was accepted', debugIndex, $tabWasAccepted)
 			tabs = excludeFromArrayPure(tabs, $tabWasAccepted)
@@ -219,7 +214,7 @@
 		<li class="active">
 			<span class="tabName">Welcome</span>
 			<div class="close_button disabled white-x" role="button" aria-disabled="true">
-				<i data-feather="x" class="icon-close"></i>
+				<XIcon class="icon-close" />
 			</div>
 		</li>
 	{/if}
@@ -235,7 +230,7 @@
 			<!-- svelte-ignore a11y-no-static-element-interactions -- nonnativeButton gives it a role="button" -->
 			<div class="close_button" class:white-x={state == 'default' && immediateActiveIndex == i}
 				on:mousedown|stopPropagation={noop} use:nonnativeButton={() => dispatch('closeTab', tab)}>
-				<i data-feather="x" class="icon-close"></i>
+				<XIcon class="icon-close" />
 			</div>
 		</li>
 	{/each}
@@ -245,7 +240,7 @@
 		
 		<!-- decoration only -->
 		<div class="close_button dummy_close_button white-x">
-			<i data-feather="x" class="icon-close"></i>
+			<XIcon class="icon-close" />
 		</div>
 	</li>
 </ul>
@@ -323,7 +318,7 @@
 			color: #828282;
 		}
 		
-		.icon-close {
+		:global(.icon-close) {
 			width: 100%;
 			height: 100%;
 			stroke-width: 2.5px;
diff --git a/src/lib/editor/windowing/EditorWindow.svelte b/src/lib/editor/windowing/EditorWindow.svelte
index cd0ce03..956dff1 100644
--- a/src/lib/editor/windowing/EditorWindow.svelte
+++ b/src/lib/editor/windowing/EditorWindow.svelte
@@ -11,6 +11,7 @@
     import { OpenWindowEvent } from "../events";
     import Page from "../fileEditor/Page.svelte";
     import WelcomeScreen from "../fileEditor/welcomeScreen/WelcomeScreen.svelte";
+    import { ChevronLeftIcon, ChevronRightIcon, ChevronUpIcon } from "svelte-feather-icons";
 	
 	interface ContentComponent {
 		collapseAll(): void
@@ -228,19 +229,19 @@ Do you want to close those too?`,
 		<div class="card dockArea dockLeft" on:mouseup={() => onDockMouseUp('left')}
 			class:hidden={!dockAreaShown || disableSideDocking}>
 			
-			<i data-feather="chevron-left" class="icon-dock"></i>
+			<ChevronLeftIcon class="icon-dock" />
 		</div>
 		
 		<div class="card dockArea dockRight" on:mouseup={() => onDockMouseUp('right')}
 			class:hidden={!dockAreaShown || disableSideDocking}>
 			
-			<i data-feather="chevron-right" class="icon-dock"></i>
+			<ChevronRightIcon class="icon-dock" />
 		</div>
 		
 		<div class="card dockArea dockUp" on:mouseup={() => onDockMouseUp('origin')}
 			class:hidden={!dockAreaShown || tabs.includes($globalDraggedTab.tab)}>
 			
-			<i data-feather="chevron-up" class="icon-dock"></i>
+			<ChevronUpIcon class="icon-dock" />
 		</div>
 	</div>
 	
@@ -303,7 +304,7 @@ Do you want to close those too?`,
 				pointer-events: none;
 			}
 			
-			.icon-dock {
+			:global(.icon-dock) {
 				width: 100%;
 				height: 100%;
 			}
diff --git a/src/lib/menu/fileMenu.ts b/src/lib/menu/fileMenu.ts
index 39bfcc2..87f7976 100644
--- a/src/lib/menu/fileMenu.ts
+++ b/src/lib/menu/fileMenu.ts
@@ -225,10 +225,8 @@ function parseYamlItems(dataType: DataType, yamlItems: unknown[],
 		if (!(typeof item == 'object'))
 			throw new Error(`Invalid yaml file, object ${i} in '${dataDivision}' is invalid`)
 		
-		let obj: UuidTagged = {
-			[VALUE_UUID]: ValueUuid(),
-			[DATA_TYPE]: dataType,
-		}
+		// @ts-expect-error
+		let obj: UuidTagged = {}
 		
 		for (const [fieldName, fieldType] of Object.entries(FILE_TYPES[dataType].typedef)) {
 			let yamlValue: unknown
@@ -336,6 +334,9 @@ in '${dataDivision}' object ${i} but got ${yamlValue}`)
 			}
 		}
 		
+		obj[VALUE_UUID] = ValueUuid(`yaml ${DataType[dataType]} ${obj[FILE_TYPES[dataType].identifyingField]}`)
+		obj[DATA_TYPE] = dataType
+		
 		elfItems.push(obj)
 	}
 	
diff --git a/src/lib/modal/Alert.svelte b/src/lib/modal/Alert.svelte
index 15ccac1..bb05635 100644
--- a/src/lib/modal/Alert.svelte
+++ b/src/lib/modal/Alert.svelte
@@ -3,6 +3,7 @@
 	import { hideActiveModal } from "./modal";
     import { nonnativeButton } from "$lib/nonnativeButton";
     import { HTML_FOCUSABLE_ELEMENTS } from "$lib/util";
+    import { XIcon } from "svelte-feather-icons";
 	
 	export let title: string
 	
@@ -97,9 +98,6 @@
 	}
 	
 	onMount(() => {
-		// @ts-ignore
-		feather.replace()
-		
 		document.addEventListener('keydown', onKeydown)
 		
 		// try focusing the first focusable element in the alert
@@ -129,7 +127,7 @@
 
 <div class="alert" bind:this={alertDiv}>
 	<div class="closeButton" use:nonnativeButton={close}>
-		<i data-feather="x"></i>
+		<XIcon />
 	</div>
 	
 	<h2>{title}</h2>
diff --git a/src/lib/util.ts b/src/lib/util.ts
index fb7fe26..a8f2191 100644
--- a/src/lib/util.ts
+++ b/src/lib/util.ts
@@ -141,10 +141,10 @@ export async function compress(buffer: ArrayBuffer, compressionRatio = 5): Promi
 	})
 }
 
-export function createFileTab(fileName: string, filePath: string, binary: ElfBinary, dataType: DataType, isCompressed: boolean): Tab {
+export function createFileTab(name: string, filePath: string, binary: ElfBinary, dataType: DataType, isCompressed: boolean): Tab {
 	return {
-		id: Symbol(),
-		name: fileName,
+		id: Symbol(`TabID ${name}`),
+		name: name,
 		children: [],
 		isCompressed,
 		content: {