diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml
index e0543a27e0..151c4b72c8 100644
--- a/indra/newview/skins/default/xui/pl/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml
@@ -19,14 +19,53 @@
 	<check_box label="Awatara" name="JoystickAvatarEnabled"/>
 	<check_box label="Budow." name="JoystickBuildEnabled"/>
 	<check_box label="Kamerę latając" name="JoystickFlycamEnabled"/>
-	<stat_view label="Monitor Joysticka" name="axis_view">
-		<stat_bar label="Oś 0" name="axis0"/>
-		<stat_bar label="Oś 1" name="axis1"/>
-		<stat_bar label="Oś 2" name="axis2"/>
-		<stat_bar label="Oś 3" name="axis3"/>
-		<stat_bar label="Oś 4" name="axis4"/>
-		<stat_bar label="Oś 5" name="axis5"/>
-	</stat_view>
+	<text name="joystick_monitor_label">
+		Monitor joysticka
+	</text>
+	<icon name="button_light_0" tool_tip="Przycisk joysticka 0" />
+	<icon name="button_light_1" tool_tip="Przycisk joysticka 1" />
+	<icon name="button_light_2" tool_tip="Przycisk joysticka 2" />
+	<icon name="button_light_3" tool_tip="Przycisk joysticka 3" />
+	<icon name="button_light_4" tool_tip="Przycisk joysticka 4" />
+	<icon name="button_light_5" tool_tip="Przycisk joysticka 5" />
+	<icon name="button_light_6" tool_tip="Przycisk joysticka 6" />
+	<icon name="button_light_7" tool_tip="Przycisk joysticka 7" />
+	<icon name="button_light_8" tool_tip="Przycisk joysticka 8" />
+	<icon name="button_light_9" tool_tip="Przycisk joysticka 9" />
+	<icon name="button_light_10" tool_tip="Przycisk joysticka 10" />
+	<icon name="button_light_11" tool_tip="Przycisk joysticka 11" />
+	<icon name="button_light_12" tool_tip="Przycisk joysticka 12" />
+	<icon name="button_light_13" tool_tip="Przycisk joysticka 13" />
+	<icon name="button_light_14" tool_tip="Przycisk joysticka 14" />
+	<icon name="button_light_15" tool_tip="Przycisk joysticka 15" />
+	<scroll_container name="joystick_monitor_axes_scroller">
+		<container_view name="joystick_monitor_axes_container">
+			<stat_view name="axis_view_0">
+				<stat_bar label="Oś 0" name="axis0" />
+			</stat_view>
+			<stat_view name="axis_view_1">
+				<stat_bar label="Oś 1" name="axis1" />
+			</stat_view>
+			<stat_view name="axis_view_2">
+				<stat_bar label="Oś 2" name="axis2" />
+			</stat_view>
+			<stat_view name="axis_view_3">
+				<stat_bar label="Oś 3" name="axis3" />
+			</stat_view>
+			<stat_view name="axis_view_4">
+				<stat_bar label="Oś 4" name="axis4" />
+			</stat_view>
+			<stat_view name="axis_view_5">
+				<stat_bar label="Oś 5" name="axis5" />
+			</stat_view>
+			<stat_view name="axis_view_6">
+				<stat_bar label="Oś 6" name="axis6" />
+			</stat_view>
+			<stat_view name="axis_view_7">
+				<stat_bar label="Oś 7" name="axis7" />
+			</stat_view>
+		</container_view>
+	</scroll_container>
 	<text name="XScale">
 		Skala X
 	</text>
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index 36538e0b64..38ae7cf730 100644
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -86,7 +86,7 @@
 		<combo_box.item label="Siatka: Lokalna" name="Local"/>
 		<combo_box.item label="Siatka: Względna" name="Reference"/>
 	</combo_box>
-	<check_box label="Rozciągaj obie strony" name="checkbox uniform"/>
+	<check_box label="Rozciągaj obie strony" name="checkbox uniform" width="145" />
 	<check_box label="Rozciągaj tekstury" name="checkbox stretch textures"/>
 	<check_box label="Przyciągaj do siatki" name="checkbox snap to grid"/>
 	<check_box label="Edytuj oś jak gł. obiekt" name="checkbox actual root"/>