diff --git a/src/Tools/Eraser.gd b/src/Tools/Eraser.gd
index 144aa2d86..7a07595c2 100644
--- a/src/Tools/Eraser.gd
+++ b/src/Tools/Eraser.gd
@@ -98,5 +98,5 @@ func _on_Opacity_value_changed(value: float) -> void:
 
 func update_config() -> void:
 	.update_config()
-	$OpacitySpinBox.value = _strength * 255
-	$OpacitySlider.value = _strength * 255
+	$Opacity/OpacitySpinBox.value = _strength * 255
+	$Opacity/OpacitySlider.value = _strength * 255
diff --git a/src/Tools/Eraser.tscn b/src/Tools/Eraser.tscn
index 7caea7200..cf4d0adb7 100644
--- a/src/Tools/Eraser.tscn
+++ b/src/Tools/Eraser.tscn
@@ -6,18 +6,22 @@
 [node name="ToolOptions" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
 
-[node name="OpacityLabel" type="Label" parent="." index="3"]
-margin_top = 74.0
+[node name="Opacity" type="VBoxContainer" parent="." index="4"]
+margin_top = 102.0
 margin_right = 116.0
-margin_bottom = 88.0
+margin_bottom = 164.0
+
+[node name="OpacityLabel" type="Label" parent="Opacity" index="0"]
+margin_right = 116.0
+margin_bottom = 14.0
 text = "Opacity:"
 align = 1
 
-[node name="OpacitySpinBox" type="SpinBox" parent="." index="4"]
+[node name="OpacitySpinBox" type="SpinBox" parent="Opacity" index="1"]
 margin_left = 21.0
-margin_top = 92.0
+margin_top = 18.0
 margin_right = 95.0
-margin_bottom = 116.0
+margin_bottom = 42.0
 mouse_default_cursor_shape = 2
 size_flags_horizontal = 4
 max_value = 255.0
@@ -27,28 +31,24 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="OpacitySlider" type="HSlider" parent="." index="5"]
+[node name="OpacitySlider" type="HSlider" parent="Opacity" index="2"]
 margin_left = 12.0
-margin_top = 120.0
+margin_top = 46.0
 margin_right = 104.0
-margin_bottom = 136.0
+margin_bottom = 62.0
 rect_min_size = Vector2( 92, 0 )
 mouse_default_cursor_shape = 2
 size_flags_horizontal = 4
 max_value = 255.0
 value = 255.0
 
-[node name="PixelPerfect" parent="." index="6"]
-margin_top = 140.0
-margin_bottom = 164.0
-
-[node name="EmptySpacer" parent="." index="8"]
+[node name="EmptySpacer" parent="." index="6"]
 margin_top = 168.0
 margin_bottom = 180.0
 
-[node name="Mirror" parent="." index="9"]
+[node name="Mirror" parent="." index="7"]
 margin_top = 184.0
 margin_bottom = 201.0
 
-[connection signal="value_changed" from="OpacitySpinBox" to="." method="_on_Opacity_value_changed"]
-[connection signal="value_changed" from="OpacitySlider" to="." method="_on_Opacity_value_changed"]
+[connection signal="value_changed" from="Opacity/OpacitySpinBox" to="." method="_on_Opacity_value_changed"]
+[connection signal="value_changed" from="Opacity/OpacitySlider" to="." method="_on_Opacity_value_changed"]