diff --git a/src/functions.js b/src/functions.js
index 3228b96..e8c173c 100644
--- a/src/functions.js
+++ b/src/functions.js
@@ -2121,7 +2121,7 @@ function image_attributes(){
 function show_convert_to_black_and_white() {
 	const $w = new $FormToolWindow("Convert to Black and White");
 	$w.addClass("convert-to-black-and-white");
-	$w.$main.append("<fieldset><legend>Threshold</legend><input type='range' min='0' max='1' step='0.01' value='0.5'></fieldset>");
+	$w.$main.append("<fieldset><legend>Threshold:</legend><input type='range' min='0' max='1' step='0.01' value='0.5'></fieldset>");
 	const $slider = $w.$main.find("input[type='range']");
 	const original_canvas = make_canvas(canvas);
 	let threshold;
@@ -2172,7 +2172,7 @@ function image_flip_and_rotate(){
 	`);
 
 	const $rotate_by_angle = $(E("div")).appendTo($fieldset);
-	$rotate_by_angle.css({paddingLeft: "30px"});
+	$rotate_by_angle.addClass("sub-options");
 	$rotate_by_angle.append(`
 		<label><input type="radio" name="rotate-by-angle" value="90" checked/>90°</label>
 		<label><input type="radio" name="rotate-by-angle" value="180"/>180°</label>
@@ -2249,6 +2249,7 @@ function image_flip_and_rotate(){
 
 function image_stretch_and_skew(){
 	const $w = new $FormToolWindow(localize("Stretch and Skew"));
+	$w.addClass("stretch-and-skew");
 
 	const $fieldset_stretch = $(E("fieldset")).appendTo($w.$main);
 	$fieldset_stretch.append(`<legend>${localize("Stretch")}</legend><table></table>`);
diff --git a/styles/layout.css b/styles/layout.css
index cddb82f..94534ce 100644
--- a/styles/layout.css
+++ b/styles/layout.css
@@ -610,9 +610,17 @@ html, body, .jspaint {
 	padding: 5px;
 }
 
+.stretch-and-skew .window-content,
+.flip-and-rotate .window-content,
+.convert-to-black-and-white .window-content {
+	direction: ltr;
+}
 .flip-and-rotate fieldset {
 	width: 200px;
 }
+.flip-and-rotate .sub-options {
+	padding-left: 30px;
+}
 
 /* Fix label ordering for RTL layout (display inline labels can get super out of order with the checkboxes/inputs - very confusing!) */
 .window-content label {
diff --git a/styles/layout.rtl.css b/styles/layout.rtl.css
index b5bbbe6..4912c96 100644
--- a/styles/layout.rtl.css
+++ b/styles/layout.rtl.css
@@ -610,12 +610,20 @@ html, body, .jspaint {
 	padding: 5px;
 }
 
+.stretch-and-skew .window-content,
+.flip-and-rotate .window-content,
+.convert-to-black-and-white .window-content {
+	direction: rtl;
+}
 .flip-and-rotate fieldset {
 	width: 200px;
 }
+.flip-and-rotate .sub-options {
+	padding-right: 30px;
+}
 
 /* Fix label ordering for RTL layout (display inline labels can get super out of order with the checkboxes/inputs - very confusing!) */
-.attributes-window label {
+.window-content label {
     display: inline-flex;
 	flex-direction: row;
 	direction: rtl;