diff --git a/docs/changelog.md b/docs/changelog.md
index be00654f..3cff9916 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Changing the application language does not require a restart now
 - Improved translations: Spanish, Brasilian Portuguese
 - Improved UI auto scaling, especially for Windows and OSX
+- Updated to Godot 3.5.2
 
 ## [0.5.0] - 2022-06-12
 
diff --git a/lorien/UI/Dialogs/KeyBindingsList.gd b/lorien/UI/Components/KeyBindingsList.gd
similarity index 99%
rename from lorien/UI/Dialogs/KeyBindingsList.gd
rename to lorien/UI/Components/KeyBindingsList.gd
index ad7af8b3..a2f32d4f 100644
--- a/lorien/UI/Dialogs/KeyBindingsList.gd
+++ b/lorien/UI/Components/KeyBindingsList.gd
@@ -21,6 +21,7 @@ func _compare_second_element(a: Array, b: Array) -> bool:
 func _populate_input_list() -> void:
 	for c in _grid.get_children():
 		_grid.remove_child(c)
+		c.queue_free()
 	
 	var collected_keybinding_args := []
 	for action in Utils.bindable_actions():
diff --git a/lorien/UI/Dialogs/KeyBindingsLine.tscn b/lorien/UI/Dialogs/KeyBindingsLine.tscn
deleted file mode 100644
index 0d43f7d4..00000000
--- a/lorien/UI/Dialogs/KeyBindingsLine.tscn
+++ /dev/null
@@ -1,38 +0,0 @@
-[gd_scene load_steps=4 format=2]
-
-[ext_resource path="res://UI/Dialogs/KeyBindingsLineName.gd" type="Script" id=1]
-[ext_resource path="res://UI/Dialogs/KeyBindingsLineBindings.gd" type="Script" id=2]
-[ext_resource path="res://UI/Dialogs/KeyBindingsLineAddButton.gd" type="Script" id=3]
-
-[node name="KeyBindingsLine" type="GridContainer"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-columns = 3
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="Name" type="Label" parent="."]
-margin_top = 3.0
-margin_right = 38.0
-margin_bottom = 17.0
-text = "Name
-"
-valign = 1
-max_lines_visible = 1
-script = ExtResource( 1 )
-
-[node name="Bindings" type="HBoxContainer" parent="."]
-margin_left = 42.0
-margin_right = 42.0
-margin_bottom = 20.0
-script = ExtResource( 2 )
-
-[node name="AddButton" type="Button" parent="."]
-margin_left = 46.0
-margin_right = 66.0
-margin_bottom = 20.0
-text = "+"
-script = ExtResource( 3 )
-
-[connection signal="pressed" from="AddButton" to="AddButton" method="_on_AddButton_pressed"]
diff --git a/lorien/UI/Dialogs/SettingsDialog.tscn b/lorien/UI/Dialogs/SettingsDialog.tscn
index c49c107c..640d7ece 100644
--- a/lorien/UI/Dialogs/SettingsDialog.tscn
+++ b/lorien/UI/Dialogs/SettingsDialog.tscn
@@ -3,7 +3,7 @@
 [ext_resource path="res://UI/Themes/theme_dark.tres" type="Theme" id=1]
 [ext_resource path="res://UI/Dialogs/SettingsDialog.gd" type="Script" id=2]
 [ext_resource path="res://UI/Components/DelayedSpinBox.gd" type="Script" id=3]
-[ext_resource path="res://UI/Dialogs/KeyBindingsList.gd" type="Script" id=4]
+[ext_resource path="res://UI/Components/KeyBindingsList.gd" type="Script" id=4]
 [ext_resource path="res://UI/Dialogs/AddKeyDialog.tscn" type="PackedScene" id=5]
 
 [sub_resource type="StyleBoxEmpty" id=1]
@@ -13,7 +13,6 @@
 [sub_resource type="StyleBoxEmpty" id=3]
 
 [node name="SettingsDialog" type="WindowDialog"]
-visible = true
 margin_right = 520.0
 margin_bottom = 250.0
 rect_min_size = Vector2( 520, 270 )
@@ -46,7 +45,6 @@ __meta__ = {
 }
 
 [node name="General" type="Control" parent="MarginContainer/TabContainer"]
-visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_top = 27.0
@@ -436,6 +434,7 @@ text = "SETTINGS_RESTART_NOTICE"
 align = 1
 
 [node name="Keybindings" type="Control" parent="MarginContainer/TabContainer"]
+visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_top = 27.0