diff --git a/Main.tscn b/Main.tscn
index 475675f4d..ecfe7ca7c 100644
--- a/Main.tscn
+++ b/Main.tscn
@@ -818,6 +818,7 @@ margin_right = 16.0
 margin_bottom = 462.0
 rect_min_size = Vector2( 16, 0 )
 focus_mode = 0
+mouse_default_cursor_shape = 15
 size_flags_horizontal = 0
 size_flags_vertical = 3
 custom_styles/hover = ExtResource( 12 )
diff --git a/Prefabs/FrameButton.tscn b/Prefabs/FrameButton.tscn
index c8cda0a6e..bcdb6a745 100644
--- a/Prefabs/FrameButton.tscn
+++ b/Prefabs/FrameButton.tscn
@@ -1,7 +1,6 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://Themes & Styles/Main Theme.tres" type="Theme" id=1]
-[ext_resource path="res://Scripts/FrameButton.gd" type="Script" id=2]
+[ext_resource path="res://Scripts/FrameButton.gd" type="Script" id=1]
 
 [node name="Frame" type="VBoxContainer"]
 margin_right = 32.0
@@ -14,10 +13,9 @@ rect_min_size = Vector2( 36, 36 )
 mouse_default_cursor_shape = 2
 size_flags_horizontal = 0
 size_flags_vertical = 0
-theme = ExtResource( 1 )
 toggle_mode = true
 button_mask = 3
-script = ExtResource( 2 )
+script = ExtResource( 1 )
 
 [node name="FrameTexture" type="TextureRect" parent="FrameButton"]
 margin_left = 2.0
diff --git a/Prefabs/LayerContainer.tscn b/Prefabs/LayerContainer.tscn
index ff213f8c8..e1765e9e9 100644
--- a/Prefabs/LayerContainer.tscn
+++ b/Prefabs/LayerContainer.tscn
@@ -1,16 +1,14 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://Themes & Styles/Main Theme.tres" type="Theme" id=1]
-[ext_resource path="res://Scripts/LayerContainer.gd" type="Script" id=2]
-[ext_resource path="res://Assets/Graphics/Layers/layer_visible.png" type="Texture" id=3]
+[ext_resource path="res://Scripts/LayerContainer.gd" type="Script" id=1]
+[ext_resource path="res://Assets/Graphics/Layers/layer_visible.png" type="Texture" id=2]
 
 [node name="LayerContainer" type="Button"]
 margin_right = 160.0
 margin_bottom = 42.0
 rect_min_size = Vector2( 160, 42 )
-theme = ExtResource( 1 )
 toggle_mode = true
-script = ExtResource( 2 )
+script = ExtResource( 1 )
 __meta__ = {
 "_edit_horizontal_guides_": [  ]
 }
@@ -24,7 +22,7 @@ hint_tooltip = "LAYERVISIBILITY_HT"
 mouse_default_cursor_shape = 2
 size_flags_horizontal = 0
 size_flags_vertical = 4
-texture_normal = ExtResource( 3 )
+texture_normal = ExtResource( 2 )
 
 [node name="HBoxContainer" type="HBoxContainer" parent="."]
 anchor_left = 0.5
@@ -47,8 +45,8 @@ stretch_mode = 6
 
 [node name="Label" type="Label" parent="HBoxContainer"]
 margin_left = 36.0
-margin_top = 8.0
-margin_right = 75.0
+margin_top = 9.0
+margin_right = 82.0
 margin_bottom = 23.0
 text = "Layer 0"
 align = 1