diff --git a/src/UI/Timeline/AnimationTimeline.tscn b/src/UI/Timeline/AnimationTimeline.tscn
index 23a4add70..3a709109a 100644
--- a/src/UI/Timeline/AnimationTimeline.tscn
+++ b/src/UI/Timeline/AnimationTimeline.tscn
@@ -219,6 +219,7 @@ anchor_bottom = 0.5
 offset_top = -11.0
 offset_right = 22.0
 offset_bottom = 11.0
+grow_vertical = 2
 size_flags_horizontal = 0
 size_flags_vertical = 0
 texture = ExtResource("2")
@@ -861,22 +862,22 @@ size_flags_horizontal = 3
 
 [node name="OnionSkinningSettings" type="Popup" parent="."]
 position = Vector2i(0, 24)
-size = Vector2i(288, 207)
+size = Vector2i(296, 211)
 unresizable = false
 borderless = false
 
-[node name="OnionSkinningButtons" type="VBoxContainer" parent="OnionSkinningSettings"]
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
+[node name="MarginContainer" type="MarginContainer" parent="OnionSkinningSettings"]
+offset_right = 16.0
+offset_bottom = 4.0
 
-[node name="OnionSkinningPast" type="Label" parent="OnionSkinningSettings/OnionSkinningButtons"]
+[node name="OnionSkinningButtons" type="VBoxContainer" parent="OnionSkinningSettings/MarginContainer"]
+layout_mode = 2
+
+[node name="OnionSkinningPast" type="Label" parent="OnionSkinningSettings/MarginContainer/OnionSkinningButtons"]
 layout_mode = 2
 text = "Past Frames"
 
-[node name="PastOnionSkinning" parent="OnionSkinningSettings/OnionSkinningButtons" instance=ExtResource("9")]
+[node name="PastOnionSkinning" parent="OnionSkinningSettings/MarginContainer/OnionSkinningButtons" instance=ExtResource("9")]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 1
@@ -885,11 +886,11 @@ value = 1.0
 allow_greater = true
 suffix = "Frames"
 
-[node name="OnionSkinningFuture" type="Label" parent="OnionSkinningSettings/OnionSkinningButtons"]
+[node name="OnionSkinningFuture" type="Label" parent="OnionSkinningSettings/MarginContainer/OnionSkinningButtons"]
 layout_mode = 2
 text = "Future Frames"
 
-[node name="FutureOnionSkinning" parent="OnionSkinningSettings/OnionSkinningButtons" instance=ExtResource("9")]
+[node name="FutureOnionSkinning" parent="OnionSkinningSettings/MarginContainer/OnionSkinningButtons" instance=ExtResource("9")]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 1
@@ -898,23 +899,23 @@ value = 1.0
 allow_greater = true
 suffix = "Frames"
 
-[node name="BlueRedMode" type="CheckBox" parent="OnionSkinningSettings/OnionSkinningButtons"]
+[node name="BlueRedMode" type="CheckBox" parent="OnionSkinningSettings/MarginContainer/OnionSkinningButtons"]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 0
 mouse_default_cursor_shape = 2
 text = "Color mode"
 
-[node name="GridContainer" type="GridContainer" parent="OnionSkinningSettings/OnionSkinningButtons"]
+[node name="GridContainer" type="GridContainer" parent="OnionSkinningSettings/MarginContainer/OnionSkinningButtons"]
 layout_mode = 2
 theme_override_constants/h_separation = 8
 columns = 2
 
-[node name="PastPlacementLabel" type="Label" parent="OnionSkinningSettings/OnionSkinningButtons/GridContainer"]
+[node name="PastPlacementLabel" type="Label" parent="OnionSkinningSettings/MarginContainer/OnionSkinningButtons/GridContainer"]
 layout_mode = 2
 text = "Show past frames:"
 
-[node name="PastPlacement" type="OptionButton" parent="OnionSkinningSettings/OnionSkinningButtons/GridContainer"]
+[node name="PastPlacement" type="OptionButton" parent="OnionSkinningSettings/MarginContainer/OnionSkinningButtons/GridContainer"]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
@@ -925,11 +926,11 @@ popup/item_0/id = 0
 popup/item_1/text = "Below canvas"
 popup/item_1/id = 1
 
-[node name="FuturePlacementLabel" type="Label" parent="OnionSkinningSettings/OnionSkinningButtons/GridContainer"]
+[node name="FuturePlacementLabel" type="Label" parent="OnionSkinningSettings/MarginContainer/OnionSkinningButtons/GridContainer"]
 layout_mode = 2
 text = "Show future frames:"
 
-[node name="FuturePlacement" type="OptionButton" parent="OnionSkinningSettings/OnionSkinningButtons/GridContainer"]
+[node name="FuturePlacement" type="OptionButton" parent="OnionSkinningSettings/MarginContainer/OnionSkinningButtons/GridContainer"]
 unique_name_in_owner = true
 layout_mode = 2
 mouse_default_cursor_shape = 2
@@ -984,8 +985,8 @@ script = ExtResource("12")
 [connection signal="timeout" from="AnimationTimer" to="." method="_on_AnimationTimer_timeout"]
 [connection signal="close_requested" from="OnionSkinningSettings" to="." method="_on_onion_skinning_settings_close_requested"]
 [connection signal="visibility_changed" from="OnionSkinningSettings" to="." method="_on_onion_skinning_settings_visibility_changed"]
-[connection signal="value_changed" from="OnionSkinningSettings/OnionSkinningButtons/PastOnionSkinning" to="." method="_on_PastOnionSkinning_value_changed"]
-[connection signal="value_changed" from="OnionSkinningSettings/OnionSkinningButtons/FutureOnionSkinning" to="." method="_on_FutureOnionSkinning_value_changed"]
-[connection signal="toggled" from="OnionSkinningSettings/OnionSkinningButtons/BlueRedMode" to="." method="_on_BlueRedMode_toggled"]
-[connection signal="item_selected" from="OnionSkinningSettings/OnionSkinningButtons/GridContainer/PastPlacement" to="." method="_on_PastPlacement_item_selected"]
-[connection signal="item_selected" from="OnionSkinningSettings/OnionSkinningButtons/GridContainer/FuturePlacement" to="." method="_on_FuturePlacement_item_selected"]
+[connection signal="value_changed" from="OnionSkinningSettings/MarginContainer/OnionSkinningButtons/PastOnionSkinning" to="." method="_on_PastOnionSkinning_value_changed"]
+[connection signal="value_changed" from="OnionSkinningSettings/MarginContainer/OnionSkinningButtons/FutureOnionSkinning" to="." method="_on_FutureOnionSkinning_value_changed"]
+[connection signal="toggled" from="OnionSkinningSettings/MarginContainer/OnionSkinningButtons/BlueRedMode" to="." method="_on_BlueRedMode_toggled"]
+[connection signal="item_selected" from="OnionSkinningSettings/MarginContainer/OnionSkinningButtons/GridContainer/PastPlacement" to="." method="_on_PastPlacement_item_selected"]
+[connection signal="item_selected" from="OnionSkinningSettings/MarginContainer/OnionSkinningButtons/GridContainer/FuturePlacement" to="." method="_on_FuturePlacement_item_selected"]