1 files changed, 8 insertions, 7 deletions

diff --git a/scene/gui/check_button.cpp b/scene/gui/check_button.cpp
index 35e3119473..f47547f2cc 100644
--- a/scene/gui/check_button.cpp
+++ b/scene/gui/check_button.cpp
@@ -34,13 +34,15 @@
 #include "servers/visual_server.h"
 
 Size2 CheckButton::get_icon_size() const {
-	Ref<Texture> on = Control::get_icon("on");
-	Ref<Texture> off = Control::get_icon("off");
+
+	Ref<Texture> on = Control::get_icon(is_disabled() ? "on_disabled" : "on");
+	Ref<Texture> off = Control::get_icon(is_disabled() ? "off_disabled" : "off");
 	Size2 tex_size = Size2(0, 0);
 	if (!on.is_null())
 		tex_size = Size2(on->get_width(), on->get_height());
 	if (!off.is_null())
 		tex_size = Size2(MAX(tex_size.width, off->get_width()), MAX(tex_size.height, off->get_height()));
+
 	return tex_size;
 }
 
@@ -49,9 +51,8 @@ Size2 CheckButton::get_minimum_size() const {
 	Size2 minsize = Button::get_minimum_size();
 	Size2 tex_size = get_icon_size();
 	minsize.width += tex_size.width;
-	if (get_text().length() > 0) {
+	if (get_text().length() > 0)
 		minsize.width += get_constant("hseparation");
-	}
 	Ref<StyleBox> sb = get_stylebox("normal");
 	minsize.height = MAX(minsize.height, tex_size.height + sb->get_margin(MARGIN_TOP) + sb->get_margin(MARGIN_BOTTOM));
 
@@ -67,15 +68,15 @@ void CheckButton::_notification(int p_what) {
 
 		RID ci = get_canvas_item();
 
-		Ref<Texture> on = Control::get_icon("on");
-		Ref<Texture> off = Control::get_icon("off");
+		Ref<Texture> on = Control::get_icon(is_disabled() ? "on_disabled" : "on");
+		Ref<Texture> off = Control::get_icon(is_disabled() ? "off_disabled" : "off");
 
 		Ref<StyleBox> sb = get_stylebox("normal");
 		Vector2 ofs;
 		Size2 tex_size = get_icon_size();
 
 		ofs.x = get_size().width - (tex_size.width + sb->get_margin(MARGIN_RIGHT));
-		ofs.y = (get_size().height - tex_size.height) / 2;
+		ofs.y = (get_size().height - tex_size.height) / 2 + get_constant("check_vadjust");
 
 		if (is_pressed())
 			on->draw(ci, ofs);