diff --git a/HEADS b/HEADS
index 4121341..4a88d32 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"3.2": "f15f5b45781eb3de8e5811400f654e3e49580149", "3.x": "a76316c0f06ef63f9b818d1ee8fd8771f73e4f3f"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "pandemonium_engine": {"master": "54643bc1fc76248bc03d5ecdaaaa4c10616a2f61"}}
\ No newline at end of file
+{"engine": {"3.2": "f15f5b45781eb3de8e5811400f654e3e49580149", "3.x": "a76316c0f06ef63f9b818d1ee8fd8771f73e4f3f"}, "world_generator": {"master": "d12ab222a2387e20164b3e7c6236983223ca88ef"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "pandemonium_engine": {"master": "47e2a193c4d1ef86028ea02cbe267d7e9fcac3bb"}}
\ No newline at end of file
diff --git a/game/addons/data_manager/plugin.gd b/game/addons/data_manager/plugin.gd
index c1347d7..9fde282 100644
--- a/game/addons/data_manager/plugin.gd
+++ b/game/addons/data_manager/plugin.gd
@@ -2,9 +2,9 @@ tool
 extends EditorPlugin
 
 const DataManagerAddonSettings = preload("res://addons/data_manager/resources/data_manager_addon_settings.gd")
-
 const _main_panel : PackedScene = preload("res://addons/data_manager/panels/MainPanel.tscn")
-const _script_icon : Texture = preload("res://addons/data_manager/icons/icon_multi_line.png")
+
+var _script_icon : Texture = null
 
 var settings : DataManagerAddonSettings = null
 
@@ -34,6 +34,9 @@ func make_visible(visible):
 		_main_panel_instance.hide()
 
 func get_plugin_icon():
+	if !_script_icon:
+		_script_icon = get_editor_interface().get_base_control().get_theme_icon("ThemeSelectAll", "EditorIcons")
+		
 	return _script_icon
 
 func get_plugin_name():
diff --git a/game/addons/data_manager/previews/ControlPreview.tscn b/game/addons/data_manager/previews/ControlPreview.tscn
index fb2d460..aa1afa5 100644
--- a/game/addons/data_manager/previews/ControlPreview.tscn
+++ b/game/addons/data_manager/previews/ControlPreview.tscn
@@ -17,6 +17,6 @@ container_path = NodePath("Viewport")
 
 [node name="Viewport" type="Viewport" parent="."]
 size = Vector2( 500, 500 )
-own_world = true
+own_world_3d = true
 handle_input_locally = false
 render_target_update_mode = 3
diff --git a/game/addons/data_manager/previews/Node2DPreview.tscn b/game/addons/data_manager/previews/Node2DPreview.tscn
index 563a1c3..3f0299a 100644
--- a/game/addons/data_manager/previews/Node2DPreview.tscn
+++ b/game/addons/data_manager/previews/Node2DPreview.tscn
@@ -17,7 +17,7 @@ container_path = NodePath("Viewport")
 
 [node name="Viewport" type="Viewport" parent="."]
 size = Vector2( 500, 500 )
-own_world = true
+own_world_3d = true
 handle_input_locally = false
 render_target_update_mode = 3
 
diff --git a/game/addons/data_manager/previews/SpatialPreview.tscn b/game/addons/data_manager/previews/SpatialPreview.tscn
index 018e5d5..81de3f9 100644
--- a/game/addons/data_manager/previews/SpatialPreview.tscn
+++ b/game/addons/data_manager/previews/SpatialPreview.tscn
@@ -17,7 +17,7 @@ container_path = NodePath("Viewport")
 [node name="Viewport" type="Viewport" parent="."]
 size = Vector2( 60, 60 )
 size_override_stretch = true
-own_world = true
+own_world_3d = true
 handle_input_locally = false
 render_target_update_mode = 3
 
diff --git a/game/addons/data_manager/resources/data_manager_addon_settings.gd b/game/addons/data_manager/resources/data_manager_addon_settings.gd
index 9e032ee..2701bc8 100644
--- a/game/addons/data_manager/resources/data_manager_addon_settings.gd
+++ b/game/addons/data_manager/resources/data_manager_addon_settings.gd
@@ -223,8 +223,9 @@ func save_to_project_settings() -> void:
 	ProjectSettings.set("addons/data_manager/folder_settings", get_as_json())
 	
 func load_from_project_settings() -> void:
-	var d : String = ProjectSettings.get("addons/data_manager/folder_settings")
-	
-	if d != "":
-		set_from_json(d)
+	if ProjectSettings.has_setting("addons/data_manager/folder_settings"):
+		var d : String = ProjectSettings.get("addons/data_manager/folder_settings")
+		
+		if d != "":
+			set_from_json(d)