diff --git a/Changelog.md b/Changelog.md
index f6362eae4..b240085b8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [v0.7] - Unreleased
 This update has been brought to you by the contributions of:
+
 Martin Novák (novhack), luiq54, Schweini07, Marco Galli (Gaarco), Matheus Pesegoginski (MatheusPese), sapient-cogbag
 
 ### Added
diff --git a/Main.tscn b/Main.tscn
index b4bb99e40..a5c0650b4 100644
--- a/Main.tscn
+++ b/Main.tscn
@@ -779,6 +779,7 @@ margin_top = 65.0
 margin_right = 114.0
 margin_bottom = 88.0
 rect_min_size = Vector2( 92, 0 )
+mouse_default_cursor_shape = 2
 size_flags_horizontal = 4
 text = "Fit to frame"
 
@@ -788,6 +789,7 @@ margin_top = 92.0
 margin_right = 114.0
 margin_bottom = 115.0
 rect_min_size = Vector2( 92, 0 )
+mouse_default_cursor_shape = 2
 size_flags_horizontal = 4
 text = "100% Zoom"
 
@@ -1074,6 +1076,7 @@ margin_top = 65.0
 margin_right = 114.0
 margin_bottom = 88.0
 rect_min_size = Vector2( 92, 0 )
+mouse_default_cursor_shape = 2
 size_flags_horizontal = 4
 text = "Fit to frame"
 
@@ -1083,6 +1086,7 @@ margin_top = 92.0
 margin_right = 114.0
 margin_bottom = 115.0
 rect_min_size = Vector2( 92, 0 )
+mouse_default_cursor_shape = 2
 size_flags_horizontal = 4
 text = "100% Zoom"
 
diff --git a/Prefabs/Dialogs/CreateNewImage.tscn b/Prefabs/Dialogs/CreateNewImage.tscn
index e990224b2..e38a17058 100644
--- a/Prefabs/Dialogs/CreateNewImage.tscn
+++ b/Prefabs/Dialogs/CreateNewImage.tscn
@@ -48,6 +48,7 @@ text = "Templates:"
 margin_left = 114.0
 margin_right = 189.0
 margin_bottom = 20.0
+mouse_default_cursor_shape = 2
 toggle_mode = false
 text = "Default"
 items = [ "Default", null, false, 0, null ]
@@ -64,6 +65,7 @@ margin_left = 114.0
 margin_top = 24.0
 margin_right = 189.0
 margin_bottom = 48.0
+mouse_default_cursor_shape = 2
 __meta__ = {
 "_edit_use_anchors_": false
 }
diff --git a/Prefabs/Dialogs/ExportDialog.tscn b/Prefabs/Dialogs/ExportDialog.tscn
index 9b8b90302..604dc5256 100644
--- a/Prefabs/Dialogs/ExportDialog.tscn
+++ b/Prefabs/Dialogs/ExportDialog.tscn
@@ -76,6 +76,7 @@ margin_left = 48.0
 margin_right = 516.0
 margin_bottom = 24.0
 rect_min_size = Vector2( 100, 0 )
+mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 min_value = 1.0
 page = 1.0
@@ -106,6 +107,7 @@ __meta__ = {
 margin_left = 81.0
 margin_right = 264.0
 margin_bottom = 24.0
+mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 text = "Rows"
 items = [ "Rows", null, false, 0, null, "Columns", null, false, 1, null ]
@@ -122,6 +124,7 @@ text = "Columns:"
 margin_left = 332.0
 margin_right = 516.0
 margin_bottom = 24.0
+mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 min_value = 1.0
 max_value = 1000.0
@@ -137,6 +140,7 @@ margin_bottom = 386.0
 margin_right = 516.0
 margin_bottom = 24.0
 rect_min_size = Vector2( 0, 24 )
+mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 text = "All frames as multiple files"
 items = [ "All frames as multiple files", null, false, 0, null, "All frames as a single file animation", null, false, 1, null ]
@@ -159,6 +163,7 @@ valign = 1
 margin_left = 86.0
 margin_right = 265.0
 margin_bottom = 24.0
+mouse_default_cursor_shape = 2
 size_flags_horizontal = 7
 color = Color( 1, 1, 1, 1 )
 edit_alpha = false
@@ -175,6 +180,7 @@ margin_left = 336.0
 margin_right = 516.0
 margin_bottom = 24.0
 rect_min_size = Vector2( 100, 0 )
+mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 text = "Forward"
 items = [ "Forward", null, false, 0, null, "Backwards", null, false, 1, null, "Ping-Pong", null, false, 2, null ]
@@ -205,6 +211,7 @@ align = 2
 margin_left = 50.0
 margin_right = 235.0
 margin_bottom = 24.0
+mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 min_value = 10.0
 max_value = 1000.0
@@ -226,6 +233,7 @@ align = 2
 margin_left = 330.0
 margin_right = 516.0
 margin_bottom = 24.0
+mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 text = "Nearest"
 align = 2
@@ -260,6 +268,7 @@ align = 2
 margin_left = 457.0
 margin_right = 516.0
 margin_bottom = 24.0
+mouse_default_cursor_shape = 2
 text = "Browse"
 
 [node name="File" type="HBoxContainer" parent="VBoxContainer"]
@@ -286,6 +295,7 @@ margin_left = 380.0
 margin_right = 516.0
 margin_bottom = 24.0
 rect_min_size = Vector2( 130, 0 )
+mouse_default_cursor_shape = 8
 disabled = true
 text = ".png; PNG Image"
 items = [ ".png; PNG Image", null, false, 0, null, ".gif; GIF Image", null, false, 1, null ]
@@ -305,8 +315,8 @@ window_title = "Open a Directory"
 resizable = true
 mode = 2
 access = 2
-current_dir = "/home/novhack/Pixelorama"
-current_path = "/home/novhack/Pixelorama/"
+current_dir = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama"
+current_path = "C:/Users/Overloaded/Dropbox/Orama Founding Members/εταιρικα αρχεια/Godot Projects/Pixelorama/"
 
 [node name="PathValidationAlert" type="AcceptDialog" parent="Popups"]
 margin_left = 8.0
diff --git a/Prefabs/Dialogs/PreferencesDialog.tscn b/Prefabs/Dialogs/PreferencesDialog.tscn
index 80cd049a2..43ea7ef95 100644
--- a/Prefabs/Dialogs/PreferencesDialog.tscn
+++ b/Prefabs/Dialogs/PreferencesDialog.tscn
@@ -450,10 +450,11 @@ margin_right = 49.0
 margin_bottom = 17.0
 text = "Preset: "
 
-[node name="OptionButton" type="OptionButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/HBoxContainer"]
+[node name="PresetOptionButton" type="OptionButton" parent="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/HBoxContainer"]
 margin_left = 53.0
 margin_right = 314.0
 margin_bottom = 20.0
+mouse_default_cursor_shape = 2
 size_flags_horizontal = 3
 text = "Default"
 items = [ "Default", null, false, 0, null, "Custom", null, false, 1, null ]
@@ -675,6 +676,6 @@ __meta__ = {
 [connection signal="value_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions/ImageDefaultWidth" to="." method="_on_ImageDefaultWidth_value_changed"]
 [connection signal="value_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions/ImageDefaultHeight" to="." method="_on_ImageDefaultHeight_value_changed"]
 [connection signal="color_changed" from="HSplitContainer/ScrollContainer/VBoxContainer/Image/ImageOptions/DefaultFillColor" to="." method="_on_DefaultBackground_color_changed"]
-[connection signal="item_selected" from="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/HBoxContainer/OptionButton" to="." method="_on_OptionButton_item_selected"]
+[connection signal="item_selected" from="HSplitContainer/ScrollContainer/VBoxContainer/Shortcuts/HBoxContainer/PresetOptionButton" to="." method="_on_PresetOptionButton_item_selected"]
 [connection signal="confirmed" from="Popups/ShortcutSelector" to="." method="_on_ShortcutSelector_confirmed"]
 [connection signal="popup_hide" from="Popups/ShortcutSelector" to="." method="_on_ShortcutSelector_popup_hide"]
diff --git a/Scripts/Dialogs/AboutDialog.gd b/Scripts/Dialogs/AboutDialog.gd
index b2d1e6f4f..e1fde47ce 100644
--- a/Scripts/Dialogs/AboutDialog.gd
+++ b/Scripts/Dialogs/AboutDialog.gd
@@ -28,7 +28,7 @@ func _ready() -> void:
 	contributors.create_item(contributor_root).set_text(0, "  Noah Burck (haonkrub)")
 	contributors.create_item(contributor_root).set_text(0, "  luiq54")
 	contributors.create_item(contributor_root).set_text(0, "  Matheus Pesegoginski (MatheusPese)")
-	contributors.create_item(contributor_root).set_text(0, "  sapient-cogbag")
+	contributors.create_item(contributor_root).set_text(0, "  sapient_cogbag")
 
 	var donors_root := donors.create_item()
 	donors.create_item(donors_root).set_text(0, "  pcmxms")
diff --git a/Scripts/Dialogs/PreferencesDialog.gd b/Scripts/Dialogs/PreferencesDialog.gd
index 51257f576..1f94d8873 100644
--- a/Scripts/Dialogs/PreferencesDialog.gd
+++ b/Scripts/Dialogs/PreferencesDialog.gd
@@ -127,8 +127,8 @@ func _ready() -> void:
 			custom_shortcuts_preset[action] = saved_input_event
 
 	var shortcuts_preset = Global.config_cache.get_value("shortcuts", "shortcuts_preset", 0)
-	shortcuts.get_node("HBoxContainer/OptionButton").select(shortcuts_preset)
-	_on_OptionButton_item_selected(shortcuts_preset)
+	shortcuts.get_node("HBoxContainer/PresetOptionButton").select(shortcuts_preset)
+	_on_PresetOptionButton_item_selected(shortcuts_preset)
 
 
 func _input(event : InputEvent) -> void:
@@ -353,6 +353,10 @@ func toggle_shortcut_buttons(enabled : bool) -> void:
 	for shortcut_grid_item in shortcuts.get_node("Shortcuts").get_children():
 		if shortcut_grid_item is Button:
 			shortcut_grid_item.disabled = not enabled
+			if shortcut_grid_item.disabled:
+				shortcut_grid_item.mouse_default_cursor_shape = Control.CURSOR_FORBIDDEN
+			else:
+				shortcut_grid_item.mouse_default_cursor_shape = Control.CURSOR_POINTING_HAND
 
 
 func set_action_shortcut(action : String, old_input : InputEventKey, new_input : InputEventKey) -> void:
@@ -443,7 +447,7 @@ func _on_ShortcutSelector_popup_hide() -> void:
 	$Popups/ShortcutSelector/EnteredShortcut.text = ""
 
 
-func _on_OptionButton_item_selected(id : int) -> void:
+func _on_PresetOptionButton_item_selected(id : int) -> void:
 	# Only custom preset which is modifiable
 	toggle_shortcut_buttons(true if id == 1 else false)
 	match id:
@@ -463,3 +467,4 @@ func _on_ShortcutSelector_confirmed() -> void:
 		Global.config_cache.save("user://cache.ini")
 		shortcuts.get_node("Shortcuts/" + action_being_edited).text = OS.get_scancode_string(new_input_event.get_scancode_with_modifiers())
 		$Popups/ShortcutSelector.hide()
+