4 files changed, 15 insertions, 3 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp
index ccc658b0aa..92e740889d 100644
--- a/scene/gui/control.cpp
+++ b/scene/gui/control.cpp
@@ -2286,7 +2286,7 @@ void Control::set_theme(const Ref<Theme> &p_theme) {
 	}
 
 	if (data.theme.is_valid()) {
-		data.theme->connect("changed", this, "_theme_changed");
+		data.theme->connect("changed", this, "_theme_changed", varray(), CONNECT_DEFERRED);
 	}
 }
 
diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp
index b6e647d1af..cc2d5dd6ea 100644
--- a/scene/gui/dialogs.cpp
+++ b/scene/gui/dialogs.cpp
@@ -35,6 +35,7 @@
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_node.h"
+#include "editor/editor_scale.h"
 #include "scene/main/viewport.h" // Only used to check for more modals when dimming the editor.
 #endif
 
diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp
index de8df4215d..f9214c3b1e 100644
--- a/scene/gui/option_button.cpp
+++ b/scene/gui/option_button.cpp
@@ -35,8 +35,9 @@ Size2 OptionButton::get_minimum_size() const {
 
 	Size2 minsize = Button::get_minimum_size();
 
-	if (has_icon("arrow"))
+	if (has_icon("arrow")) {
 		minsize.width += Control::get_icon("arrow")->get_width() + get_constant("hseparation");
+	}
 
 	return minsize;
 }
@@ -73,6 +74,12 @@ void OptionButton::_notification(int p_what) {
 			Point2 ofs(size.width - arrow->get_width() - get_constant("arrow_margin"), int(Math::abs((size.height - arrow->get_height()) / 2)));
 			arrow->draw(ci, ofs, clr);
 		} break;
+		case NOTIFICATION_THEME_CHANGED: {
+
+			if (has_icon("arrow")) {
+				_set_internal_margin(MARGIN_RIGHT, Control::get_icon("arrow")->get_width());
+			}
+		} break;
 		case NOTIFICATION_VISIBILITY_CHANGED: {
 
 			if (!is_visible_in_tree()) {
@@ -327,7 +334,7 @@ void OptionButton::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_get_items"), &OptionButton::_get_items);
 
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "items", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL), "_set_items", "_get_items");
-	// "selected" property must come after "items", otherwise GH-10213 occurs
+	// "selected" property must come after "items", otherwise GH-10213 occurs.
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "selected"), "_select_int", "get_selected");
 	ADD_SIGNAL(MethodInfo("item_selected", PropertyInfo(Variant::INT, "id")));
 	ADD_SIGNAL(MethodInfo("item_focused", PropertyInfo(Variant::INT, "id")));
@@ -339,6 +346,9 @@ OptionButton::OptionButton() {
 	set_toggle_mode(true);
 	set_text_align(ALIGN_LEFT);
 	set_action_mode(ACTION_MODE_BUTTON_PRESS);
+	if (has_icon("arrow")) {
+		_set_internal_margin(MARGIN_RIGHT, Control::get_icon("arrow")->get_width());
+	}
 
 	popup = memnew(PopupMenu);
 	popup->hide();
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 9bcacd6ee3..2c4c7bdebe 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -1946,6 +1946,7 @@ void TextEdit::indent_right() {
 
 	// Ignore if the cursor is not past the first column.
 	if (is_selection_active() && get_selection_to_column() == 0) {
+		selection_offset = 0;
 		end_line--;
 	}