Viewer: 1998 called and they want their icons back

License note:

UltraVNC v1.3.1 and later were/are made available under the GPL v3,
which is not compatible with TurboVNC's license.  However, the new
TurboVNC Viewer toolbar icons are derived from icons in UltraVNC v1.2.4
(more specifically ultravnc/UltraVNC@3dd08c9e), which was made available
under the GPL v2+.

ChangeLog.md

@@ -132,6 +132,9 @@ bar and dock in full-screen mode, irrespective of bump scrolling.
 RFB extension, which allows forward and back mouse button events to be
 transmitted to the VNC server.
 
+14. The TurboVNC Viewer toolbar icons have been updated with more modern icons
+derived from UltraVNC v1.2.4.
+
 
 3.1.4
 =====

java/com/turbovnc/vncviewer/CConn.java

@@ -636,8 +636,8 @@ else if (layout.numScreens() != 1) {
     vpRect.x = vpPos.x;
     vpRect.y = vpPos.y;
     if (params.toolbar.get() && !params.fullScreen.get()) {
-      vpRect.y += 22;
-      vpRect.height -= 22;
+      vpRect.y += 26;
+      vpRect.height -= 26;
     }
 
     GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();

java/com/turbovnc/vncviewer/README.md

@@ -69,9 +69,10 @@ platforms and Windows GDI on Windows platforms.
 Acknowledgements
 ----------------
 
-Screenshot icon in the TurboVNC Viewer toolbar is by VisualPharm and is used
-under the terms of the Creative Commons Attributon license:
-<https://www.shareicon.net/screenshot-586081>
+Icons in the TurboVNC Viewer toolbar are derived from UltraVNC v1.2.4, which
+was made available under the GNU General Public License v2+ and is thus
+license-compatible with TurboVNC.  (Later versions of UltraVNC were made
+available under the GNU GPL v3.)
 
 Lock/unlock icons in the TurboVNC Viewer authentication dialog are from
 [Open Iconic](https://useiconic.com/open), which is:

java/com/turbovnc/vncviewer/Toolbar.java

@@ -1,5 +1,5 @@
-/* Copyright (C) 2012-2013, 2015, 2018, 2020, 2022, 2024 D. R. Commander.
- *                                                       All Rights Reserved.
+/* Copyright (C) 2012-2013, 2015, 2018, 2020, 2022, 2024-2025
+ *           D. R. Commander.  All Rights Reserved.
  * Copyright (C) 2011-2012 Brian P. Hinz
  *
  * This is free software; you can redistribute it and/or modify
@@ -48,9 +48,9 @@ public Toolbar(CConn cc_) {
     super();
     cc = cc_;
     BufferedImage bi =
-      new BufferedImage(192, 16, BufferedImage.TYPE_INT_ARGB);
+      new BufferedImage(240, 20, BufferedImage.TYPE_INT_ARGB);
     Graphics2D g = bi.createGraphics();
-    g.drawImage(toolbarImage, 0, 0, 192, 16, null);
+    g.drawImage(toolbarImage, 0, 0, 240, 20, null);
     setAlignmentX(java.awt.Component.LEFT_ALIGNMENT);
     setAlignmentY(java.awt.Component.CENTER_ALIGNMENT);
     setFloatable(false);
@@ -63,7 +63,7 @@ public Toolbar(CConn cc_) {
       if (i >= 6 && i <= 7 && cc.params.restricted.get())
         continue;
       ImageIcon icon = new ImageIcon(
-        tk.createImage(bi.getSubimage(i * 16, 0, 16, 16).getSource()));
+        tk.createImage(bi.getSubimage(i * 20, 0, 20, 20).getSource()));
       AbstractButton button;
       switch (i) {
         case 8:

java/com/turbovnc/vncviewer/Viewport.java

@@ -279,7 +279,7 @@ public Dimension getBorderSize() {
     Dimension borderSize = new Dimension(vpInsets.left + vpInsets.right,
                                          vpInsets.top + vpInsets.bottom);
     if (cc.params.toolbar.get())
-      borderSize.height += 22;
+      borderSize.height += 26;
     return borderSize;
   }