diff --git a/addons/escoria-core/design/esc_background.svg b/addons/escoria-core/design/esc_background.svg
new file mode 100644
index 00000000..01762fa6
--- /dev/null
+++ b/addons/escoria-core/design/esc_background.svg
@@ -0,0 +1,17 @@
+
+
\ No newline at end of file
diff --git a/addons/escoria-core/design/esc_inventory_item.svg b/addons/escoria-core/design/esc_inventory_item.svg
new file mode 100644
index 00000000..a043c53a
--- /dev/null
+++ b/addons/escoria-core/design/esc_inventory_item.svg
@@ -0,0 +1,27 @@
+
+
\ No newline at end of file
diff --git a/addons/escoria-core/design/esc_item.svg b/addons/escoria-core/design/esc_item.svg
new file mode 100644
index 00000000..86e28f06
--- /dev/null
+++ b/addons/escoria-core/design/esc_item.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/addons/escoria-core/design/esc_location.svg b/addons/escoria-core/design/esc_location.svg
new file mode 100644
index 00000000..56d3c5bb
--- /dev/null
+++ b/addons/escoria-core/design/esc_location.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/addons/escoria-core/design/esc_player.svg b/addons/escoria-core/design/esc_player.svg
new file mode 100644
index 00000000..9a58d5ea
--- /dev/null
+++ b/addons/escoria-core/design/esc_player.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/addons/escoria-core/design/esc_room.svg b/addons/escoria-core/design/esc_room.svg
new file mode 100644
index 00000000..917cbb6f
--- /dev/null
+++ b/addons/escoria-core/design/esc_room.svg
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/addons/escoria-core/design/esc_terrain.svg b/addons/escoria-core/design/esc_terrain.svg
new file mode 100644
index 00000000..51be6a06
--- /dev/null
+++ b/addons/escoria-core/design/esc_terrain.svg
@@ -0,0 +1,14 @@
+
+
\ No newline at end of file
diff --git a/addons/escoria-core/logo/escoria-logo-small.png b/addons/escoria-core/design/escoria-logo-small.png
similarity index 100%
rename from addons/escoria-core/logo/escoria-logo-small.png
rename to addons/escoria-core/design/escoria-logo-small.png
diff --git a/addons/escoria-core/logo/escoria-logo.png b/addons/escoria-core/design/escoria-logo.png
similarity index 100%
rename from addons/escoria-core/logo/escoria-logo.png
rename to addons/escoria-core/design/escoria-logo.png
diff --git a/addons/escoria-core/logo/escoria-logo.svg b/addons/escoria-core/design/escoria-logo.svg
similarity index 100%
rename from addons/escoria-core/logo/escoria-logo.svg
rename to addons/escoria-core/design/escoria-logo.svg
diff --git a/addons/escoria-core/design/icons.sketch b/addons/escoria-core/design/icons.sketch
new file mode 100644
index 00000000..c3ef6646
Binary files /dev/null and b/addons/escoria-core/design/icons.sketch differ
diff --git a/addons/escoria-core/game/core-scripts/behaviors/esc_movable.gd b/addons/escoria-core/game/core-scripts/behaviors/esc_movable.gd
index c46cee17..42b66552 100644
--- a/addons/escoria-core/game/core-scripts/behaviors/esc_movable.gd
+++ b/addons/escoria-core/game/core-scripts/behaviors/esc_movable.gd
@@ -1,6 +1,5 @@
# Node that performs the moving (walk, teleport, terrain scaling...) actions on
# its parent node.
-tool
extends Node
class_name ESCMovable
diff --git a/addons/escoria-core/game/core-scripts/esc_background.gd b/addons/escoria-core/game/core-scripts/esc_background.gd
index e468bcaa..2b9845af 100644
--- a/addons/escoria-core/game/core-scripts/esc_background.gd
+++ b/addons/escoria-core/game/core-scripts/esc_background.gd
@@ -10,7 +10,7 @@
# receive no input.
tool
extends TextureRect
-class_name ESCBackground
+class_name ESCBackground, "res://addons/escoria-core/design/esc_background.svg"
# The background was double clicked
diff --git a/addons/escoria-core/game/core-scripts/esc_game.gd b/addons/escoria-core/game/core-scripts/esc_game.gd
index 86794b58..5ecff4d4 100644
--- a/addons/escoria-core/game/core-scripts/esc_game.gd
+++ b/addons/escoria-core/game/core-scripts/esc_game.gd
@@ -1,7 +1,6 @@
# A base class for ESC game scenes
# An extending class can be used in the project settings and is responsible
# for managing very basic game features and controls
-tool
extends Node2D
class_name ESCGame
diff --git a/addons/escoria-core/game/core-scripts/esc_inventory_item.gd b/addons/escoria-core/game/core-scripts/esc_inventory_item.gd
index 6c638b47..1f5f0569 100644
--- a/addons/escoria-core/game/core-scripts/esc_inventory_item.gd
+++ b/addons/escoria-core/game/core-scripts/esc_inventory_item.gd
@@ -1,6 +1,7 @@
# The inventory representation of an ESC item if pickable
extends TextureButton
-class_name ESCInventoryItem
+class_name ESCInventoryItem, \
+ "res://addons/escoria-core/design/esc_inventory_item.svg"
# Signal emitted when the item was left clicked
diff --git a/addons/escoria-core/game/core-scripts/esc_item.gd b/addons/escoria-core/game/core-scripts/esc_item.gd
index 3518e820..563539ae 100644
--- a/addons/escoria-core/game/core-scripts/esc_item.gd
+++ b/addons/escoria-core/game/core-scripts/esc_item.gd
@@ -1,7 +1,7 @@
# ESCItem is a Sprite that defines an item, potentially interactive
tool
extends Area2D
-class_name ESCItem
+class_name ESCItem, "res://addons/escoria-core/design/esc_item.svg"
# Emitted when the mouse has entered this item
diff --git a/addons/escoria-core/game/core-scripts/esc_location.gd b/addons/escoria-core/game/core-scripts/esc_location.gd
index 8de89f48..e1cfa6cf 100644
--- a/addons/escoria-core/game/core-scripts/esc_location.gd
+++ b/addons/escoria-core/game/core-scripts/esc_location.gd
@@ -1,7 +1,7 @@
# A simple node extending Position2D with a global ID so that it can be
# referenced in ESC Scripts.
extends Position2D
-class_name ESCLocation
+class_name ESCLocation, "res://addons/escoria-core/design/esc_location.svg"
# The global ID of this item
diff --git a/addons/escoria-core/game/core-scripts/esc_player.gd b/addons/escoria-core/game/core-scripts/esc_player.gd
index c3abba5a..0b66e6ea 100644
--- a/addons/escoria-core/game/core-scripts/esc_player.gd
+++ b/addons/escoria-core/game/core-scripts/esc_player.gd
@@ -1,7 +1,7 @@
# A playable character
tool
extends ESCItem
-class_name ESCPlayer
+class_name ESCPlayer, "res://addons/escoria-core/design/esc_player.svg"
# The node that references the camera position
diff --git a/addons/escoria-core/game/core-scripts/esc_room.gd b/addons/escoria-core/game/core-scripts/esc_room.gd
index 6d912958..16747042 100644
--- a/addons/escoria-core/game/core-scripts/esc_room.gd
+++ b/addons/escoria-core/game/core-scripts/esc_room.gd
@@ -1,7 +1,7 @@
# A room in an Escora based game
tool
extends Node2D
-class_name ESCRoom
+class_name ESCRoom, "res://addons/escoria-core/design/esc_room.svg"
# Debugging displays for a room
diff --git a/addons/escoria-core/game/core-scripts/esc_terrain.gd b/addons/escoria-core/game/core-scripts/esc_terrain.gd
index 9c19cd89..17ca0ce9 100644
--- a/addons/escoria-core/game/core-scripts/esc_terrain.gd
+++ b/addons/escoria-core/game/core-scripts/esc_terrain.gd
@@ -1,7 +1,7 @@
# A walkable Terrains
tool
extends Navigation2D
-class_name ESCTerrain
+class_name ESCTerrain, "res://addons/escoria-core/design/esc_terrain.svg"
# Visualize scales or the lightmap for debugging purposes
diff --git a/addons/escoria-core/game/scenes/dialogs/dialog_player.gd b/addons/escoria-core/game/scenes/dialogs/dialog_player.gd
index ce746edd..63eb1206 100644
--- a/addons/escoria-core/game/scenes/dialogs/dialog_player.gd
+++ b/addons/escoria-core/game/scenes/dialogs/dialog_player.gd
@@ -1,5 +1,4 @@
# Escoria dialog player
-tool
extends ResourcePreloader
class_name ESCDialogsPlayer
diff --git a/addons/escoria-core/logo/escoria-logo.svg.import b/addons/escoria-core/logo/escoria-logo.svg.import
deleted file mode 100644
index 360a4cac..00000000
--- a/addons/escoria-core/logo/escoria-logo.svg.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/escoria-logo.svg-57c45ba33015e24cb2a3cf19c461f16b.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://addons/escoria-core/logo/escoria-logo.svg"
-dest_files=[ "res://.import/escoria-logo.svg-57c45ba33015e24cb2a3cf19c461f16b.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
diff --git a/addons/escoria-core/template_scenes/dialog_scenes/dialog_box_inset.gd b/addons/escoria-core/template_scenes/dialog_scenes/dialog_box_inset.gd
index 4282781d..a7b5f7cf 100644
--- a/addons/escoria-core/template_scenes/dialog_scenes/dialog_box_inset.gd
+++ b/addons/escoria-core/template_scenes/dialog_scenes/dialog_box_inset.gd
@@ -1,5 +1,4 @@
# A dialog GUI showing a dialog box and character portraits
-tool
extends PanelContainer
diff --git a/addons/escoria-core/template_scenes/verbs_menu_scumm9.gd b/addons/escoria-core/template_scenes/verbs_menu_scumm9.gd
index bc188187..2e9a9c4a 100644
--- a/addons/escoria-core/template_scenes/verbs_menu_scumm9.gd
+++ b/addons/escoria-core/template_scenes/verbs_menu_scumm9.gd
@@ -1,4 +1,3 @@
-tool
extends Control
func _ready():
diff --git a/addons/escoria-ui-9verbs/game.gd b/addons/escoria-ui-9verbs/game.gd
index 0e792142..2b902688 100644
--- a/addons/escoria-ui-9verbs/game.gd
+++ b/addons/escoria-ui-9verbs/game.gd
@@ -1,4 +1,3 @@
-tool
extends ESCGame
"""
diff --git a/addons/escoria-ui-9verbs/plugin.gd b/addons/escoria-ui-9verbs/plugin.gd
index 5027ca30..d787b823 100644
--- a/addons/escoria-ui-9verbs/plugin.gd
+++ b/addons/escoria-ui-9verbs/plugin.gd
@@ -5,5 +5,5 @@ extends EditorPlugin
# Setup Escoria
func _enter_tree():
- ProjectSettings.set_setting("escoria/ui/tooltip_follows_mouse", false)
- ProjectSettings.set_setting("escoria/ui/game_scene", "res://addons/escoria-ui-9verbs/game.tscn")
+ ProjectSettings.set_setting("escoria/ui/tooltip_follows_mouse", false)
+ ProjectSettings.set_setting("escoria/ui/game_scene", "res://addons/escoria-ui-9verbs/game.tscn")
diff --git a/addons/escoria-ui-9verbs/verbs_menu.gd b/addons/escoria-ui-9verbs/verbs_menu.gd
index b316d215..a45f5990 100644
--- a/addons/escoria-ui-9verbs/verbs_menu.gd
+++ b/addons/escoria-ui-9verbs/verbs_menu.gd
@@ -1,4 +1,3 @@
-tool
extends Control
"""
diff --git a/addons/escoria-ui-simplemouse/game.gd b/addons/escoria-ui-simplemouse/game.gd
index 0fa4b70c..3ce595b6 100644
--- a/addons/escoria-ui-simplemouse/game.gd
+++ b/addons/escoria-ui-simplemouse/game.gd
@@ -1,4 +1,3 @@
-tool
extends ESCGame
"""
diff --git a/addons/escoria-ui-simplemouse/plugin.gd b/addons/escoria-ui-simplemouse/plugin.gd
index aa9b7f40..770a84f7 100644
--- a/addons/escoria-ui-simplemouse/plugin.gd
+++ b/addons/escoria-ui-simplemouse/plugin.gd
@@ -5,5 +5,5 @@ extends EditorPlugin
# Setup Escoria
func _enter_tree():
- ProjectSettings.set_setting("escoria/ui/tooltip_follows_mouse", true)
- ProjectSettings.set_setting("escoria/ui/game_scene", "res://addons/escoria-ui-simplemouse/game.tscn")
+ ProjectSettings.set_setting("escoria/ui/tooltip_follows_mouse", true)
+ ProjectSettings.set_setting("escoria/ui/game_scene", "res://addons/escoria-ui-simplemouse/game.tscn")
diff --git a/addons/escoria-ui-simplemouse/verbs_mouseicons.gd b/addons/escoria-ui-simplemouse/verbs_mouseicons.gd
index c5bdce2f..3c653538 100644
--- a/addons/escoria-ui-simplemouse/verbs_mouseicons.gd
+++ b/addons/escoria-ui-simplemouse/verbs_mouseicons.gd
@@ -1,4 +1,3 @@
-tool
extends Control
diff --git a/docs/api/ESCLogger.md b/docs/api/ESCLogger.md
index 42c31951..bc26fade 100644
--- a/docs/api/ESCLogger.md
+++ b/docs/api/ESCLogger.md
@@ -13,7 +13,7 @@ Logging framework for Escoria
### LOG\_DEBUG
```gdscript
-const LOG_ERROR: int = 0
+const LOG_WARNING: int = 1
```
Valid log levels
@@ -21,7 +21,7 @@ Valid log levels
### LOG\_ERROR
```gdscript
-const LOG_ERROR: int = 0
+const LOG_WARNING: int = 1
```
Valid log levels
@@ -29,7 +29,7 @@ Valid log levels
### LOG\_INFO
```gdscript
-const LOG_ERROR: int = 0
+const LOG_WARNING: int = 1
```
Valid log levels
@@ -37,7 +37,7 @@ Valid log levels
### LOG\_WARNING
```gdscript
-const LOG_ERROR: int = 0
+const LOG_WARNING: int = 1
```
Valid log levels
diff --git a/project.godot b/project.godot
index b0d2c63b..f8c3ca2a 100644
--- a/project.godot
+++ b/project.godot
@@ -503,7 +503,7 @@ _global_script_class_icons={
"ESCAnimationName": "",
"ESCAnimationPlayer": "",
"ESCAnimationResource": "",
-"ESCBackground": "",
+"ESCBackground": "res://addons/escoria-core/design/esc_background.svg",
"ESCBackgroundMusic": "",
"ESCBackgroundSound": "",
"ESCBaseCommand": "",
@@ -528,24 +528,24 @@ _global_script_class_icons={
"ESCGroup": "",
"ESCInputsManager": "",
"ESCInventory": "",
-"ESCInventoryItem": "",
+"ESCInventoryItem": "res://addons/escoria-core/design/esc_inventory_item.svg",
"ESCInventoryManager": "",
-"ESCItem": "",
-"ESCLocation": "",
+"ESCItem": "res://addons/escoria-core/design/esc_item.svg",
+"ESCLocation": "res://addons/escoria-core/design/esc_location.svg",
"ESCLogger": "",
"ESCMovable": "",
"ESCObject": "",
"ESCObjectManager": "",
-"ESCPlayer": "",
+"ESCPlayer": "res://addons/escoria-core/design/esc_player.svg",
"ESCResourceCache": "",
-"ESCRoom": "",
+"ESCRoom": "res://addons/escoria-core/design/esc_room.svg",
"ESCSaveGame": "",
"ESCSaveManager": "",
"ESCSaveSettings": "",
"ESCScheduledEvent": "",
"ESCScript": "",
"ESCStatement": "",
-"ESCTerrain": "",
+"ESCTerrain": "res://addons/escoria-core/design/esc_terrain.svg",
"ESCTooltip": "",
"ESCUtils": "",
"ESCWalkContext": "",