diff --git a/code/Editor/App/EditorForm.cpp b/code/Editor/App/EditorForm.cpp
index 69c3d01140..38b43d9338 100644
--- a/code/Editor/App/EditorForm.cpp
+++ b/code/Editor/App/EditorForm.cpp
@@ -59,7 +59,6 @@
 #include "Editor/App/DefaultObjectEditorFactory.h"
 #include "Editor/App/Document.h"
 #include "Editor/App/EditorForm.h"
-#include "Editor/App/EditorPageForm.h"
 #include "Editor/App/EditorPageSite.h"
 #include "Editor/App/EditorPluginSite.h"
 #include "Editor/App/LogView.h"
@@ -1143,13 +1142,13 @@ bool EditorForm::openEditor(db::Instance* instance)
 
 		const auto& icons = iconsGroup->getValues();
 
-		int32_t iconIndex = 2;
+		int32_t iconIndex = 0;
 		for (auto i = icons.begin(); i != icons.end(); ++i)
 		{
 			const TypeInfo* iconType = TypeInfo::find(i->first.c_str());
 			if (iconType && is_type_of(*iconType, type_of(object)))
 			{
-				iconIndex = PropertyInteger::get(i->second);
+				iconIndex = PropertyInteger::get(i->second) - 2;
 				break;
 			}
 		}
diff --git a/code/Editor/App/EditorPageForm.cpp b/code/Editor/App/EditorPageForm.cpp
deleted file mode 100644
index 5535178ae9..0000000000
--- a/code/Editor/App/EditorPageForm.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-#include "Editor/App/EditorPageForm.h"
-#include "Ui/FloodLayout.h"
-
-namespace traktor
-{
-	namespace editor
-	{
-
-T_IMPLEMENT_RTTI_CLASS(L"traktor.editor.EditorPageForm", EditorPageForm, ui::Form)
-
-bool EditorPageForm::create(ui::Widget* parent)
-{
-	if (!ui::Form::create(L"Editor Page", 1000_ut, 1000_ut, ui::Form::WsDefault, new ui::FloodLayout()))
-		return false;
-
-	return true;
-}
-
-void EditorPageForm::destroy()
-{
-	ui::Form::destroy();
-}
-
-	}
-}
diff --git a/code/Editor/App/EditorPageForm.h b/code/Editor/App/EditorPageForm.h
deleted file mode 100644
index 190ab160b5..0000000000
--- a/code/Editor/App/EditorPageForm.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-#pragma once
-
-#include "Ui/Form.h"
-
-namespace traktor
-{
-	namespace editor
-	{
-
-/*! \brief
- * \ingroup Editor
- */
-class EditorPageForm : public ui::Form
-{
-	T_RTTI_CLASS;
-
-public:
-	bool create(ui::Widget* parent);
-
-	virtual void destroy() override;
-};
-
-	}
-}
-