diff --git a/maven/CodeNameOneBuildClient.jar b/maven/CodeNameOneBuildClient.jar
index a7b8a65b5c..369baa985a 100644
Binary files a/maven/CodeNameOneBuildClient.jar and b/maven/CodeNameOneBuildClient.jar differ
diff --git a/maven/designer/pom.xml b/maven/designer/pom.xml
index 20487dd185..d41c565341 100644
--- a/maven/designer/pom.xml
+++ b/maven/designer/pom.xml
@@ -65,12 +65,6 @@
             <version>1.1</version>
         </dependency>
         
-        <!-- https://mvnrepository.com/artifact/xalan/xalan -->
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-            <version>2.7.3</version>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/com.vaadin.external.flute/flute -->
         <dependency>
             <groupId>com.vaadin.external.flute</groupId>
@@ -206,4 +200,4 @@
             </build>
 
     
-</project>
\ No newline at end of file
+</project>
diff --git a/maven/pom.xml b/maven/pom.xml
index 4f43ccaa6a..37eec27b2f 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -577,6 +577,9 @@
                                             <arg value="${project.build.directory}/generated-sources/project"/>
                                             <arg value="force" />
                                         </java>
+                                        <copy file="${maven.multiModuleProjectDirectory}/CodeNameOneBuildClient.jar"
+                                              tofile="${user.home}/.codenameone/CodeNameOneBuildClient.jar"
+                                              overwrite="true"/>
                                     </target>
                                 </configuration>
                             </execution>
diff --git a/scripts/ios/screenshots/BrowserComponent.png b/scripts/ios/screenshots/BrowserComponent.png
index 7c63e209bc..454e9743ba 100644
Binary files a/scripts/ios/screenshots/BrowserComponent.png and b/scripts/ios/screenshots/BrowserComponent.png differ
diff --git a/scripts/ios/screenshots/MainActivity.png b/scripts/ios/screenshots/MainActivity.png
index 299d035ebe..ec7987bb0b 100644
Binary files a/scripts/ios/screenshots/MainActivity.png and b/scripts/ios/screenshots/MainActivity.png differ
diff --git a/scripts/ios/screenshots/MediaPlayback.png b/scripts/ios/screenshots/MediaPlayback.png
index f9e1f11da4..4d19980ae4 100644
Binary files a/scripts/ios/screenshots/MediaPlayback.png and b/scripts/ios/screenshots/MediaPlayback.png differ
diff --git a/scripts/ios/screenshots/Sheet.png b/scripts/ios/screenshots/Sheet.png
index 8ad0e74a26..c920c91f6c 100644
Binary files a/scripts/ios/screenshots/Sheet.png and b/scripts/ios/screenshots/Sheet.png differ
diff --git a/scripts/ios/screenshots/graphics-affine-scale.png b/scripts/ios/screenshots/graphics-affine-scale.png
index 1f1ffd5dc5..1d13797232 100644
Binary files a/scripts/ios/screenshots/graphics-affine-scale.png and b/scripts/ios/screenshots/graphics-affine-scale.png differ
diff --git a/scripts/ios/screenshots/graphics-clip.png b/scripts/ios/screenshots/graphics-clip.png
index 6630f2b229..dfc87c9fad 100644
Binary files a/scripts/ios/screenshots/graphics-clip.png and b/scripts/ios/screenshots/graphics-clip.png differ
diff --git a/scripts/ios/screenshots/graphics-draw-arc.png b/scripts/ios/screenshots/graphics-draw-arc.png
index 693a551be2..a36d956f41 100644
Binary files a/scripts/ios/screenshots/graphics-draw-arc.png and b/scripts/ios/screenshots/graphics-draw-arc.png differ
diff --git a/scripts/ios/screenshots/graphics-draw-gradient.png b/scripts/ios/screenshots/graphics-draw-gradient.png
index ed2e2b48aa..65474b9ac5 100644
Binary files a/scripts/ios/screenshots/graphics-draw-gradient.png and b/scripts/ios/screenshots/graphics-draw-gradient.png differ
diff --git a/scripts/ios/screenshots/graphics-draw-image-rect.png b/scripts/ios/screenshots/graphics-draw-image-rect.png
index 0bb4200607..686f6ccd79 100644
Binary files a/scripts/ios/screenshots/graphics-draw-image-rect.png and b/scripts/ios/screenshots/graphics-draw-image-rect.png differ
diff --git a/scripts/ios/screenshots/graphics-draw-line.png b/scripts/ios/screenshots/graphics-draw-line.png
index ede8d9bcf9..521c76bc01 100644
Binary files a/scripts/ios/screenshots/graphics-draw-line.png and b/scripts/ios/screenshots/graphics-draw-line.png differ
diff --git a/scripts/ios/screenshots/graphics-draw-rect.png b/scripts/ios/screenshots/graphics-draw-rect.png
index 4752d07cc2..8f02a7e3f5 100644
Binary files a/scripts/ios/screenshots/graphics-draw-rect.png and b/scripts/ios/screenshots/graphics-draw-rect.png differ
diff --git a/scripts/ios/screenshots/graphics-draw-round-rect.png b/scripts/ios/screenshots/graphics-draw-round-rect.png
index 506ae40824..a70b165f69 100644
Binary files a/scripts/ios/screenshots/graphics-draw-round-rect.png and b/scripts/ios/screenshots/graphics-draw-round-rect.png differ
diff --git a/scripts/ios/screenshots/graphics-draw-shape.png b/scripts/ios/screenshots/graphics-draw-shape.png
index 3c09894893..efcba6e59c 100644
Binary files a/scripts/ios/screenshots/graphics-draw-shape.png and b/scripts/ios/screenshots/graphics-draw-shape.png differ
diff --git a/scripts/ios/screenshots/graphics-draw-string-decorated.png b/scripts/ios/screenshots/graphics-draw-string-decorated.png
index 7d033c0214..e81f87c2d5 100644
Binary files a/scripts/ios/screenshots/graphics-draw-string-decorated.png and b/scripts/ios/screenshots/graphics-draw-string-decorated.png differ
diff --git a/scripts/ios/screenshots/graphics-draw-string.png b/scripts/ios/screenshots/graphics-draw-string.png
index ec48cd97be..e18ab9c1bc 100644
Binary files a/scripts/ios/screenshots/graphics-draw-string.png and b/scripts/ios/screenshots/graphics-draw-string.png differ
diff --git a/scripts/ios/screenshots/graphics-fill-arc.png b/scripts/ios/screenshots/graphics-fill-arc.png
index 583158cb37..a7472f2914 100644
Binary files a/scripts/ios/screenshots/graphics-fill-arc.png and b/scripts/ios/screenshots/graphics-fill-arc.png differ
diff --git a/scripts/ios/screenshots/graphics-fill-polygon.png b/scripts/ios/screenshots/graphics-fill-polygon.png
index 577c6cf30c..7cce67dffb 100644
Binary files a/scripts/ios/screenshots/graphics-fill-polygon.png and b/scripts/ios/screenshots/graphics-fill-polygon.png differ
diff --git a/scripts/ios/screenshots/graphics-fill-rect.png b/scripts/ios/screenshots/graphics-fill-rect.png
index 302b690411..ba3aeba0a0 100644
Binary files a/scripts/ios/screenshots/graphics-fill-rect.png and b/scripts/ios/screenshots/graphics-fill-rect.png differ
diff --git a/scripts/ios/screenshots/graphics-fill-round-rect.png b/scripts/ios/screenshots/graphics-fill-round-rect.png
index 9608066ab6..5c04b973a9 100644
Binary files a/scripts/ios/screenshots/graphics-fill-round-rect.png and b/scripts/ios/screenshots/graphics-fill-round-rect.png differ
diff --git a/scripts/ios/screenshots/graphics-fill-shape.png b/scripts/ios/screenshots/graphics-fill-shape.png
index 26cf1411a9..c4f42c697f 100644
Binary files a/scripts/ios/screenshots/graphics-fill-shape.png and b/scripts/ios/screenshots/graphics-fill-shape.png differ
diff --git a/scripts/ios/screenshots/graphics-fill-triangle.png b/scripts/ios/screenshots/graphics-fill-triangle.png
index 26b2207b03..273691541e 100644
Binary files a/scripts/ios/screenshots/graphics-fill-triangle.png and b/scripts/ios/screenshots/graphics-fill-triangle.png differ
diff --git a/scripts/ios/screenshots/graphics-rotate.png b/scripts/ios/screenshots/graphics-rotate.png
index e02573b643..d97f524582 100644
Binary files a/scripts/ios/screenshots/graphics-rotate.png and b/scripts/ios/screenshots/graphics-rotate.png differ
diff --git a/scripts/ios/screenshots/graphics-scale.png b/scripts/ios/screenshots/graphics-scale.png
index 1427cb2dda..6fea887d9e 100644
Binary files a/scripts/ios/screenshots/graphics-scale.png and b/scripts/ios/screenshots/graphics-scale.png differ
diff --git a/scripts/ios/screenshots/graphics-stroke-test.png b/scripts/ios/screenshots/graphics-stroke-test.png
index 443eccff0a..76653cc0df 100644
Binary files a/scripts/ios/screenshots/graphics-stroke-test.png and b/scripts/ios/screenshots/graphics-stroke-test.png differ
diff --git a/scripts/ios/screenshots/graphics-tile-image.png b/scripts/ios/screenshots/graphics-tile-image.png
index a147461b87..017b129c9c 100644
Binary files a/scripts/ios/screenshots/graphics-tile-image.png and b/scripts/ios/screenshots/graphics-tile-image.png differ
diff --git a/scripts/ios/screenshots/graphics-transform-camera.png b/scripts/ios/screenshots/graphics-transform-camera.png
index 6a58bcaaa5..872d97654d 100644
Binary files a/scripts/ios/screenshots/graphics-transform-camera.png and b/scripts/ios/screenshots/graphics-transform-camera.png differ
diff --git a/scripts/ios/screenshots/graphics-transform-perspective.png b/scripts/ios/screenshots/graphics-transform-perspective.png
index 483c5425b9..63b22efc46 100644
Binary files a/scripts/ios/screenshots/graphics-transform-perspective.png and b/scripts/ios/screenshots/graphics-transform-perspective.png differ
diff --git a/scripts/ios/screenshots/graphics-transform-rotation.png b/scripts/ios/screenshots/graphics-transform-rotation.png
index af2a7bf593..8022d15e00 100644
Binary files a/scripts/ios/screenshots/graphics-transform-rotation.png and b/scripts/ios/screenshots/graphics-transform-rotation.png differ
diff --git a/scripts/ios/screenshots/graphics-transform-translation.png b/scripts/ios/screenshots/graphics-transform-translation.png
index 0668a8ac0a..b87ab561aa 100644
Binary files a/scripts/ios/screenshots/graphics-transform-translation.png and b/scripts/ios/screenshots/graphics-transform-translation.png differ
diff --git a/scripts/ios/screenshots/kotlin.png b/scripts/ios/screenshots/kotlin.png
index 383d6cfea9..3eb3dfd134 100644
Binary files a/scripts/ios/screenshots/kotlin.png and b/scripts/ios/screenshots/kotlin.png differ
diff --git a/scripts/ios/screenshots/landscape.png b/scripts/ios/screenshots/landscape.png
index 20b8f8272d..5cb599cd20 100644
Binary files a/scripts/ios/screenshots/landscape.png and b/scripts/ios/screenshots/landscape.png differ