From 99a9c03f3c5815552d26527e9560a95292abbf6f Mon Sep 17 00:00:00 2001
From: Samuel Mannehed <samuel@cendio.se>
Date: Thu, 22 Dec 2022 11:13:20 +0100
Subject: Rename browser icon variable to reflect use

The other variables in the Makefile are named according to how the icons
are used, lets do the same for the variable for the browser icons.
---
 app/images/icons/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/images/icons/Makefile b/app/images/icons/Makefile
index be564b4..d259fc2 100644
--- a/app/images/icons/Makefile
+++ b/app/images/icons/Makefile
@@ -1,4 +1,4 @@
-ICONS := \
+BROWSER := \
 	novnc-16x16.png \
 	novnc-24x24.png \
 	novnc-32x32.png \
@@ -20,7 +20,7 @@ IPAD_LAUNCHER := \
 	novnc-76x76.png \
 	novnc-152x152.png
 
-ALL_ICONS := $(ICONS) $(ANDROID_LAUNCHER) $(IPHONE_LAUNCHER) $(IPAD_LAUNCHER)
+ALL_ICONS := $(BROWSER) $(ANDROID_LAUNCHER) $(IPHONE_LAUNCHER) $(IPAD_LAUNCHER)
 
 all: $(ALL_ICONS)
 
-- 
cgit v1.2.1


From 034fd376ac10b2e0faf365ce9606ec0cca33bd5a Mon Sep 17 00:00:00 2001
From: Samuel Mannehed <samuel@cendio.se>
Date: Thu, 22 Dec 2022 11:29:10 +0100
Subject: Simplify icon variables by removing the filename

The filename is the same for all of these, lets break out that part to
simplify things.
---
 app/images/icons/Makefile | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/app/images/icons/Makefile b/app/images/icons/Makefile
index d259fc2..490735c 100644
--- a/app/images/icons/Makefile
+++ b/app/images/icons/Makefile
@@ -1,26 +1,10 @@
-BROWSER := \
-	novnc-16x16.png \
-	novnc-24x24.png \
-	novnc-32x32.png \
-	novnc-48x48.png \
-	novnc-64x64.png
+BROWSER_SIZES := 16 24 32 48 64
+ANDROID_SIZES := 48 72 96 144 192
+IPHONE_SIZES := 60 120
+IPAD_SIZES := 76 152
 
-ANDROID_LAUNCHER := \
-	novnc-48x48.png \
-	novnc-72x72.png \
-	novnc-96x96.png \
-	novnc-144x144.png \
-	novnc-192x192.png
-
-IPHONE_LAUNCHER := \
-	novnc-60x60.png \
-	novnc-120x120.png
-
-IPAD_LAUNCHER := \
-	novnc-76x76.png \
-	novnc-152x152.png
-
-ALL_ICONS := $(BROWSER) $(ANDROID_LAUNCHER) $(IPHONE_LAUNCHER) $(IPAD_LAUNCHER)
+ALL_SIZES := $(BROWSER_SIZES) $(ANDROID_SIZES) $(IPHONE_SIZES) $(IPAD_SIZES)
+ALL_ICONS := $(foreach SIZE, $(ALL_SIZES), novnc-$(SIZE)x$(SIZE).png)
 
 all: $(ALL_ICONS)
 
-- 
cgit v1.2.1


From 9649b8ee259cdccaaaa7474c94e8d14ee96f466a Mon Sep 17 00:00:00 2001
From: Samuel Mannehed <samuel@cendio.se>
Date: Thu, 22 Dec 2022 13:02:42 +0100
Subject: Remove duplicate 48 icon from Android sizes

This size is already specified under BROWSER_SIZES.
---
 app/images/icons/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/images/icons/Makefile b/app/images/icons/Makefile
index 490735c..fff7e47 100644
--- a/app/images/icons/Makefile
+++ b/app/images/icons/Makefile
@@ -1,5 +1,5 @@
 BROWSER_SIZES := 16 24 32 48 64
-ANDROID_SIZES := 48 72 96 144 192
+ANDROID_SIZES := 72 96 144 192
 IPHONE_SIZES := 60 120
 IPAD_SIZES := 76 152
 
-- 
cgit v1.2.1


From 079889a13ad95714deaa11c994368d47f042658a Mon Sep 17 00:00:00 2001
From: Samuel Mannehed <samuel@cendio.se>
Date: Thu, 22 Dec 2022 12:56:45 +0100
Subject: Stop including apple-touch-icons as regular icons

These icons are used differently and don't belong in the list of regular
browser icons.
---
 vnc.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/vnc.html b/vnc.html
index 2458b43..2da8f0b 100644
--- a/vnc.html
+++ b/vnc.html
@@ -22,14 +22,10 @@
     <link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24x24.png">
     <link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32x32.png">
     <link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48x48.png">
-    <link rel="icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png">
     <link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64x64.png">
     <link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72x72.png">
-    <link rel="icon" sizes="76x76" type="image/png" href="app/images/icons/novnc-76x76.png">
     <link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96x96.png">
-    <link rel="icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
     <link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144x144.png">
-    <link rel="icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png">
     <link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192x192.png">
     <!-- Firefox currently mishandles SVG, see #1419039
     <link rel="icon" sizes="any" type="image/svg+xml" href="app/images/icons/novnc-icon.svg">
-- 
cgit v1.2.1


From c8d37ae8bd8c9b102e6a2d54cfc5fe322f70cb9e Mon Sep 17 00:00:00 2001
From: Samuel Mannehed <samuel@cendio.se>
Date: Thu, 22 Dec 2022 13:15:25 +0100
Subject: Provide up to date set of apple-touch-icons

Apple requires a different set of icons now-a-days. This change involves
removing the 76x76 icon and adding icons with the following sizes;
40, 58, 80, 87, 167 and 180.
---
 app/images/icons/Makefile          |   9 ++++++---
 app/images/icons/novnc-167x167.png | Bin 0 -> 5449 bytes
 app/images/icons/novnc-180x180.png | Bin 0 -> 5825 bytes
 app/images/icons/novnc-40x40.png   | Bin 0 -> 1478 bytes
 app/images/icons/novnc-58x58.png   | Bin 0 -> 1898 bytes
 app/images/icons/novnc-76x76.png   | Bin 2874 -> 0 bytes
 app/images/icons/novnc-80x80.png   | Bin 0 -> 3018 bytes
 app/images/icons/novnc-87x87.png   | Bin 0 -> 3157 bytes
 vnc.html                           |  14 +++++++++++---
 9 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 app/images/icons/novnc-167x167.png
 create mode 100644 app/images/icons/novnc-180x180.png
 create mode 100644 app/images/icons/novnc-40x40.png
 create mode 100644 app/images/icons/novnc-58x58.png
 delete mode 100644 app/images/icons/novnc-76x76.png
 create mode 100644 app/images/icons/novnc-80x80.png
 create mode 100644 app/images/icons/novnc-87x87.png

diff --git a/app/images/icons/Makefile b/app/images/icons/Makefile
index fff7e47..5635b53 100644
--- a/app/images/icons/Makefile
+++ b/app/images/icons/Makefile
@@ -1,9 +1,12 @@
 BROWSER_SIZES := 16 24 32 48 64
 ANDROID_SIZES := 72 96 144 192
-IPHONE_SIZES := 60 120
-IPAD_SIZES := 76 152
 
-ALL_SIZES := $(BROWSER_SIZES) $(ANDROID_SIZES) $(IPHONE_SIZES) $(IPAD_SIZES)
+#IOS_1X_SIZES := 20 29 40 76 # No such devices exist anymore
+IOS_2X_SIZES := 40 58 80 120 152 167
+IOS_3X_SIZES := 60 87 120 180
+ALL_IOS_SIZES := $(IOS_1X_SIZES) $(IOS_2X_SIZES) $(IOS_3X_SIZES)
+
+ALL_SIZES := $(BROWSER_SIZES) $(ANDROID_SIZES) $(ALL_IOS_SIZES)
 ALL_ICONS := $(foreach SIZE, $(ALL_SIZES), novnc-$(SIZE)x$(SIZE).png)
 
 all: $(ALL_ICONS)
diff --git a/app/images/icons/novnc-167x167.png b/app/images/icons/novnc-167x167.png
new file mode 100644
index 0000000..6b361b6
Binary files /dev/null and b/app/images/icons/novnc-167x167.png differ
diff --git a/app/images/icons/novnc-180x180.png b/app/images/icons/novnc-180x180.png
new file mode 100644
index 0000000..cf8802b
Binary files /dev/null and b/app/images/icons/novnc-180x180.png differ
diff --git a/app/images/icons/novnc-40x40.png b/app/images/icons/novnc-40x40.png
new file mode 100644
index 0000000..4e42a1d
Binary files /dev/null and b/app/images/icons/novnc-40x40.png differ
diff --git a/app/images/icons/novnc-58x58.png b/app/images/icons/novnc-58x58.png
new file mode 100644
index 0000000..ba2564e
Binary files /dev/null and b/app/images/icons/novnc-58x58.png differ
diff --git a/app/images/icons/novnc-76x76.png b/app/images/icons/novnc-76x76.png
deleted file mode 100644
index aef61c4..0000000
Binary files a/app/images/icons/novnc-76x76.png and /dev/null differ
diff --git a/app/images/icons/novnc-80x80.png b/app/images/icons/novnc-80x80.png
new file mode 100644
index 0000000..19b1488
Binary files /dev/null and b/app/images/icons/novnc-80x80.png differ
diff --git a/app/images/icons/novnc-87x87.png b/app/images/icons/novnc-87x87.png
new file mode 100644
index 0000000..ed7042c
Binary files /dev/null and b/app/images/icons/novnc-87x87.png differ
diff --git a/vnc.html b/vnc.html
index 2da8f0b..eae8220 100644
--- a/vnc.html
+++ b/vnc.html
@@ -37,11 +37,19 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-    <!-- Home Screen Icons (favourites and bookmarks use the normal icons) -->
-    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png">
-    <link rel="apple-touch-icon" sizes="76x76" type="image/png" href="app/images/icons/novnc-76x76.png">
+
+    <!-- @2x -->
+    <link rel="apple-touch-icon" sizes="40x40" type="image/png" href="app/images/icons/novnc-40x40.png">
+    <link rel="apple-touch-icon" sizes="58x58" type="image/png" href="app/images/icons/novnc-58x58.png">
+    <link rel="apple-touch-icon" sizes="80x80" type="image/png" href="app/images/icons/novnc-80x80.png">
     <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
     <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png">
+    <link rel="apple-touch-icon" sizes="167x167" type="image/png" href="app/images/icons/novnc-167x167.png">
+    <!-- @3x -->
+    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png">
+    <link rel="apple-touch-icon" sizes="87x87" type="image/png" href="app/images/icons/novnc-87x87.png">
+    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
+    <link rel="apple-touch-icon" sizes="180x180" type="image/png" href="app/images/icons/novnc-180x180.png">
 
     <!-- Stylesheets -->
     <link rel="stylesheet" href="app/styles/base.css">
-- 
cgit v1.2.1


From 9e9d5ef17dc79b3a192014c9e42e32fcd4d66420 Mon Sep 17 00:00:00 2001
From: Samuel Mannehed <samuel@cendio.se>
Date: Thu, 22 Dec 2022 14:02:04 +0100
Subject: Simplify names of favicons

All of the icons are square, only providing the size in one direction is
enough. This change lets us avoid some unnecessary complexity in the
Makefile.
---
 app/images/icons/Makefile          |  10 +++++-----
 app/images/icons/novnc-120.png     | Bin 0 -> 4028 bytes
 app/images/icons/novnc-120x120.png | Bin 4028 -> 0 bytes
 app/images/icons/novnc-144.png     | Bin 0 -> 4582 bytes
 app/images/icons/novnc-144x144.png | Bin 4582 -> 0 bytes
 app/images/icons/novnc-152.png     | Bin 0 -> 5216 bytes
 app/images/icons/novnc-152x152.png | Bin 5216 -> 0 bytes
 app/images/icons/novnc-16.png      | Bin 0 -> 675 bytes
 app/images/icons/novnc-167.png     | Bin 0 -> 5449 bytes
 app/images/icons/novnc-167x167.png | Bin 5449 -> 0 bytes
 app/images/icons/novnc-16x16.png   | Bin 675 -> 0 bytes
 app/images/icons/novnc-180.png     | Bin 0 -> 5825 bytes
 app/images/icons/novnc-180x180.png | Bin 5825 -> 0 bytes
 app/images/icons/novnc-192.png     | Bin 0 -> 5787 bytes
 app/images/icons/novnc-192x192.png | Bin 5787 -> 0 bytes
 app/images/icons/novnc-24.png      | Bin 0 -> 1000 bytes
 app/images/icons/novnc-24x24.png   | Bin 1000 -> 0 bytes
 app/images/icons/novnc-32.png      | Bin 0 -> 1064 bytes
 app/images/icons/novnc-32x32.png   | Bin 1064 -> 0 bytes
 app/images/icons/novnc-40.png      | Bin 0 -> 1478 bytes
 app/images/icons/novnc-40x40.png   | Bin 1478 -> 0 bytes
 app/images/icons/novnc-48.png      | Bin 0 -> 1397 bytes
 app/images/icons/novnc-48x48.png   | Bin 1397 -> 0 bytes
 app/images/icons/novnc-58.png      | Bin 0 -> 1898 bytes
 app/images/icons/novnc-58x58.png   | Bin 1898 -> 0 bytes
 app/images/icons/novnc-60.png      | Bin 0 -> 1932 bytes
 app/images/icons/novnc-60x60.png   | Bin 1932 -> 0 bytes
 app/images/icons/novnc-64.png      | Bin 0 -> 1946 bytes
 app/images/icons/novnc-64x64.png   | Bin 1946 -> 0 bytes
 app/images/icons/novnc-72.png      | Bin 0 -> 2699 bytes
 app/images/icons/novnc-72x72.png   | Bin 2699 -> 0 bytes
 app/images/icons/novnc-80.png      | Bin 0 -> 3018 bytes
 app/images/icons/novnc-80x80.png   | Bin 3018 -> 0 bytes
 app/images/icons/novnc-87.png      | Bin 0 -> 3157 bytes
 app/images/icons/novnc-87x87.png   | Bin 3157 -> 0 bytes
 app/images/icons/novnc-96.png      | Bin 0 -> 2351 bytes
 app/images/icons/novnc-96x96.png   | Bin 2351 -> 0 bytes
 vnc.html                           |  40 ++++++++++++++++++-------------------
 38 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 app/images/icons/novnc-120.png
 delete mode 100644 app/images/icons/novnc-120x120.png
 create mode 100644 app/images/icons/novnc-144.png
 delete mode 100644 app/images/icons/novnc-144x144.png
 create mode 100644 app/images/icons/novnc-152.png
 delete mode 100644 app/images/icons/novnc-152x152.png
 create mode 100644 app/images/icons/novnc-16.png
 create mode 100644 app/images/icons/novnc-167.png
 delete mode 100644 app/images/icons/novnc-167x167.png
 delete mode 100644 app/images/icons/novnc-16x16.png
 create mode 100644 app/images/icons/novnc-180.png
 delete mode 100644 app/images/icons/novnc-180x180.png
 create mode 100644 app/images/icons/novnc-192.png
 delete mode 100644 app/images/icons/novnc-192x192.png
 create mode 100644 app/images/icons/novnc-24.png
 delete mode 100644 app/images/icons/novnc-24x24.png
 create mode 100644 app/images/icons/novnc-32.png
 delete mode 100644 app/images/icons/novnc-32x32.png
 create mode 100644 app/images/icons/novnc-40.png
 delete mode 100644 app/images/icons/novnc-40x40.png
 create mode 100644 app/images/icons/novnc-48.png
 delete mode 100644 app/images/icons/novnc-48x48.png
 create mode 100644 app/images/icons/novnc-58.png
 delete mode 100644 app/images/icons/novnc-58x58.png
 create mode 100644 app/images/icons/novnc-60.png
 delete mode 100644 app/images/icons/novnc-60x60.png
 create mode 100644 app/images/icons/novnc-64.png
 delete mode 100644 app/images/icons/novnc-64x64.png
 create mode 100644 app/images/icons/novnc-72.png
 delete mode 100644 app/images/icons/novnc-72x72.png
 create mode 100644 app/images/icons/novnc-80.png
 delete mode 100644 app/images/icons/novnc-80x80.png
 create mode 100644 app/images/icons/novnc-87.png
 delete mode 100644 app/images/icons/novnc-87x87.png
 create mode 100644 app/images/icons/novnc-96.png
 delete mode 100644 app/images/icons/novnc-96x96.png

diff --git a/app/images/icons/Makefile b/app/images/icons/Makefile
index 5635b53..8ee31c1 100644
--- a/app/images/icons/Makefile
+++ b/app/images/icons/Makefile
@@ -7,22 +7,22 @@ IOS_3X_SIZES := 60 87 120 180
 ALL_IOS_SIZES := $(IOS_1X_SIZES) $(IOS_2X_SIZES) $(IOS_3X_SIZES)
 
 ALL_SIZES := $(BROWSER_SIZES) $(ANDROID_SIZES) $(ALL_IOS_SIZES)
-ALL_ICONS := $(foreach SIZE, $(ALL_SIZES), novnc-$(SIZE)x$(SIZE).png)
+ALL_ICONS := $(ALL_SIZES:%=novnc-%.png)
 
 all: $(ALL_ICONS)
 
-novnc-16x16.png: novnc-icon-sm.svg
+novnc-16.png: novnc-icon-sm.svg
 	convert -density 90 \
 		-background transparent "$<" "$@"
-novnc-24x24.png: novnc-icon-sm.svg
+novnc-24.png: novnc-icon-sm.svg
 	convert -density 135 \
 		-background transparent "$<" "$@"
-novnc-32x32.png: novnc-icon-sm.svg
+novnc-32.png: novnc-icon-sm.svg
 	convert -density 180 \
 		-background transparent "$<" "$@"
 
 novnc-%.png: novnc-icon.svg
-	convert -density $$[`echo $* | cut -d x -f 1` * 90 / 48] \
+	convert -density $$[`echo $*` * 90 / 48] \
 		-background transparent "$<" "$@"
 
 clean:
diff --git a/app/images/icons/novnc-120.png b/app/images/icons/novnc-120.png
new file mode 100644
index 0000000..40823ef
Binary files /dev/null and b/app/images/icons/novnc-120.png differ
diff --git a/app/images/icons/novnc-120x120.png b/app/images/icons/novnc-120x120.png
deleted file mode 100644
index 40823ef..0000000
Binary files a/app/images/icons/novnc-120x120.png and /dev/null differ
diff --git a/app/images/icons/novnc-144.png b/app/images/icons/novnc-144.png
new file mode 100644
index 0000000..eee71f1
Binary files /dev/null and b/app/images/icons/novnc-144.png differ
diff --git a/app/images/icons/novnc-144x144.png b/app/images/icons/novnc-144x144.png
deleted file mode 100644
index eee71f1..0000000
Binary files a/app/images/icons/novnc-144x144.png and /dev/null differ
diff --git a/app/images/icons/novnc-152.png b/app/images/icons/novnc-152.png
new file mode 100644
index 0000000..0694b2d
Binary files /dev/null and b/app/images/icons/novnc-152.png differ
diff --git a/app/images/icons/novnc-152x152.png b/app/images/icons/novnc-152x152.png
deleted file mode 100644
index 0694b2d..0000000
Binary files a/app/images/icons/novnc-152x152.png and /dev/null differ
diff --git a/app/images/icons/novnc-16.png b/app/images/icons/novnc-16.png
new file mode 100644
index 0000000..42108f4
Binary files /dev/null and b/app/images/icons/novnc-16.png differ
diff --git a/app/images/icons/novnc-167.png b/app/images/icons/novnc-167.png
new file mode 100644
index 0000000..6b361b6
Binary files /dev/null and b/app/images/icons/novnc-167.png differ
diff --git a/app/images/icons/novnc-167x167.png b/app/images/icons/novnc-167x167.png
deleted file mode 100644
index 6b361b6..0000000
Binary files a/app/images/icons/novnc-167x167.png and /dev/null differ
diff --git a/app/images/icons/novnc-16x16.png b/app/images/icons/novnc-16x16.png
deleted file mode 100644
index 42108f4..0000000
Binary files a/app/images/icons/novnc-16x16.png and /dev/null differ
diff --git a/app/images/icons/novnc-180.png b/app/images/icons/novnc-180.png
new file mode 100644
index 0000000..cf8802b
Binary files /dev/null and b/app/images/icons/novnc-180.png differ
diff --git a/app/images/icons/novnc-180x180.png b/app/images/icons/novnc-180x180.png
deleted file mode 100644
index cf8802b..0000000
Binary files a/app/images/icons/novnc-180x180.png and /dev/null differ
diff --git a/app/images/icons/novnc-192.png b/app/images/icons/novnc-192.png
new file mode 100644
index 0000000..ef9201f
Binary files /dev/null and b/app/images/icons/novnc-192.png differ
diff --git a/app/images/icons/novnc-192x192.png b/app/images/icons/novnc-192x192.png
deleted file mode 100644
index ef9201f..0000000
Binary files a/app/images/icons/novnc-192x192.png and /dev/null differ
diff --git a/app/images/icons/novnc-24.png b/app/images/icons/novnc-24.png
new file mode 100644
index 0000000..1106135
Binary files /dev/null and b/app/images/icons/novnc-24.png differ
diff --git a/app/images/icons/novnc-24x24.png b/app/images/icons/novnc-24x24.png
deleted file mode 100644
index 1106135..0000000
Binary files a/app/images/icons/novnc-24x24.png and /dev/null differ
diff --git a/app/images/icons/novnc-32.png b/app/images/icons/novnc-32.png
new file mode 100644
index 0000000..ff00dc3
Binary files /dev/null and b/app/images/icons/novnc-32.png differ
diff --git a/app/images/icons/novnc-32x32.png b/app/images/icons/novnc-32x32.png
deleted file mode 100644
index ff00dc3..0000000
Binary files a/app/images/icons/novnc-32x32.png and /dev/null differ
diff --git a/app/images/icons/novnc-40.png b/app/images/icons/novnc-40.png
new file mode 100644
index 0000000..4e42a1d
Binary files /dev/null and b/app/images/icons/novnc-40.png differ
diff --git a/app/images/icons/novnc-40x40.png b/app/images/icons/novnc-40x40.png
deleted file mode 100644
index 4e42a1d..0000000
Binary files a/app/images/icons/novnc-40x40.png and /dev/null differ
diff --git a/app/images/icons/novnc-48.png b/app/images/icons/novnc-48.png
new file mode 100644
index 0000000..f24cd6c
Binary files /dev/null and b/app/images/icons/novnc-48.png differ
diff --git a/app/images/icons/novnc-48x48.png b/app/images/icons/novnc-48x48.png
deleted file mode 100644
index f24cd6c..0000000
Binary files a/app/images/icons/novnc-48x48.png and /dev/null differ
diff --git a/app/images/icons/novnc-58.png b/app/images/icons/novnc-58.png
new file mode 100644
index 0000000..ba2564e
Binary files /dev/null and b/app/images/icons/novnc-58.png differ
diff --git a/app/images/icons/novnc-58x58.png b/app/images/icons/novnc-58x58.png
deleted file mode 100644
index ba2564e..0000000
Binary files a/app/images/icons/novnc-58x58.png and /dev/null differ
diff --git a/app/images/icons/novnc-60.png b/app/images/icons/novnc-60.png
new file mode 100644
index 0000000..06b0d60
Binary files /dev/null and b/app/images/icons/novnc-60.png differ
diff --git a/app/images/icons/novnc-60x60.png b/app/images/icons/novnc-60x60.png
deleted file mode 100644
index 06b0d60..0000000
Binary files a/app/images/icons/novnc-60x60.png and /dev/null differ
diff --git a/app/images/icons/novnc-64.png b/app/images/icons/novnc-64.png
new file mode 100644
index 0000000..6d0fb34
Binary files /dev/null and b/app/images/icons/novnc-64.png differ
diff --git a/app/images/icons/novnc-64x64.png b/app/images/icons/novnc-64x64.png
deleted file mode 100644
index 6d0fb34..0000000
Binary files a/app/images/icons/novnc-64x64.png and /dev/null differ
diff --git a/app/images/icons/novnc-72.png b/app/images/icons/novnc-72.png
new file mode 100644
index 0000000..23163a2
Binary files /dev/null and b/app/images/icons/novnc-72.png differ
diff --git a/app/images/icons/novnc-72x72.png b/app/images/icons/novnc-72x72.png
deleted file mode 100644
index 23163a2..0000000
Binary files a/app/images/icons/novnc-72x72.png and /dev/null differ
diff --git a/app/images/icons/novnc-80.png b/app/images/icons/novnc-80.png
new file mode 100644
index 0000000..19b1488
Binary files /dev/null and b/app/images/icons/novnc-80.png differ
diff --git a/app/images/icons/novnc-80x80.png b/app/images/icons/novnc-80x80.png
deleted file mode 100644
index 19b1488..0000000
Binary files a/app/images/icons/novnc-80x80.png and /dev/null differ
diff --git a/app/images/icons/novnc-87.png b/app/images/icons/novnc-87.png
new file mode 100644
index 0000000..ed7042c
Binary files /dev/null and b/app/images/icons/novnc-87.png differ
diff --git a/app/images/icons/novnc-87x87.png b/app/images/icons/novnc-87x87.png
deleted file mode 100644
index ed7042c..0000000
Binary files a/app/images/icons/novnc-87x87.png and /dev/null differ
diff --git a/app/images/icons/novnc-96.png b/app/images/icons/novnc-96.png
new file mode 100644
index 0000000..1a77c53
Binary files /dev/null and b/app/images/icons/novnc-96.png differ
diff --git a/app/images/icons/novnc-96x96.png b/app/images/icons/novnc-96x96.png
deleted file mode 100644
index 1a77c53..0000000
Binary files a/app/images/icons/novnc-96x96.png and /dev/null differ
diff --git a/vnc.html b/vnc.html
index eae8220..4665143 100644
--- a/vnc.html
+++ b/vnc.html
@@ -18,20 +18,20 @@
     <meta charset="utf-8">
 
     <!-- Icons (see app/images/icons/Makefile for what the sizes are for) -->
-    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
-    <link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24x24.png">
-    <link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32x32.png">
-    <link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48x48.png">
-    <link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64x64.png">
-    <link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72x72.png">
-    <link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96x96.png">
-    <link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144x144.png">
-    <link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192x192.png">
+    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16.png">
+    <link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24.png">
+    <link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32.png">
+    <link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48.png">
+    <link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64.png">
+    <link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72.png">
+    <link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96.png">
+    <link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144.png">
+    <link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192.png">
     <!-- Firefox currently mishandles SVG, see #1419039
     <link rel="icon" sizes="any" type="image/svg+xml" href="app/images/icons/novnc-icon.svg">
     -->
     <!-- Repeated last so that legacy handling will pick this -->
-    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
+    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16.png">
 
     <!-- Apple iOS Safari settings -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
@@ -39,17 +39,17 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 
     <!-- @2x -->
-    <link rel="apple-touch-icon" sizes="40x40" type="image/png" href="app/images/icons/novnc-40x40.png">
-    <link rel="apple-touch-icon" sizes="58x58" type="image/png" href="app/images/icons/novnc-58x58.png">
-    <link rel="apple-touch-icon" sizes="80x80" type="image/png" href="app/images/icons/novnc-80x80.png">
-    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
-    <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png">
-    <link rel="apple-touch-icon" sizes="167x167" type="image/png" href="app/images/icons/novnc-167x167.png">
+    <link rel="apple-touch-icon" sizes="40x40" type="image/png" href="app/images/icons/novnc-40.png">
+    <link rel="apple-touch-icon" sizes="58x58" type="image/png" href="app/images/icons/novnc-58.png">
+    <link rel="apple-touch-icon" sizes="80x80" type="image/png" href="app/images/icons/novnc-80.png">
+    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120.png">
+    <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152.png">
+    <link rel="apple-touch-icon" sizes="167x167" type="image/png" href="app/images/icons/novnc-167.png">
     <!-- @3x -->
-    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png">
-    <link rel="apple-touch-icon" sizes="87x87" type="image/png" href="app/images/icons/novnc-87x87.png">
-    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
-    <link rel="apple-touch-icon" sizes="180x180" type="image/png" href="app/images/icons/novnc-180x180.png">
+    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60.png">
+    <link rel="apple-touch-icon" sizes="87x87" type="image/png" href="app/images/icons/novnc-87.png">
+    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120.png">
+    <link rel="apple-touch-icon" sizes="180x180" type="image/png" href="app/images/icons/novnc-180.png">
 
     <!-- Stylesheets -->
     <link rel="stylesheet" href="app/styles/base.css">
-- 
cgit v1.2.1


From 416e21151b5b084a07d9f32442a98af445a35fa9 Mon Sep 17 00:00:00 2001
From: Samuel Mannehed <samuel@cendio.se>
Date: Thu, 22 Dec 2022 15:54:12 +0100
Subject: Create specific apple-touch-icons

These icons shouldn't have any transparancy. Instead, we remove the
rounded corners and let iOS handle that.
---
 app/images/icons/Makefile           |  10 +-
 app/images/icons/novnc-120.png      | Bin 4028 -> 0 bytes
 app/images/icons/novnc-152.png      | Bin 5216 -> 0 bytes
 app/images/icons/novnc-167.png      | Bin 5449 -> 0 bytes
 app/images/icons/novnc-180.png      | Bin 5825 -> 0 bytes
 app/images/icons/novnc-40.png       | Bin 1478 -> 0 bytes
 app/images/icons/novnc-58.png       | Bin 1898 -> 0 bytes
 app/images/icons/novnc-60.png       | Bin 1932 -> 0 bytes
 app/images/icons/novnc-80.png       | Bin 3018 -> 0 bytes
 app/images/icons/novnc-87.png       | Bin 3157 -> 0 bytes
 app/images/icons/novnc-ios-120.png  | Bin 0 -> 3215 bytes
 app/images/icons/novnc-ios-152.png  | Bin 0 -> 4190 bytes
 app/images/icons/novnc-ios-167.png  | Bin 0 -> 4574 bytes
 app/images/icons/novnc-ios-180.png  | Bin 0 -> 4730 bytes
 app/images/icons/novnc-ios-40.png   | Bin 0 -> 1245 bytes
 app/images/icons/novnc-ios-58.png   | Bin 0 -> 1602 bytes
 app/images/icons/novnc-ios-60.png   | Bin 0 -> 1595 bytes
 app/images/icons/novnc-ios-80.png   | Bin 0 -> 1825 bytes
 app/images/icons/novnc-ios-87.png   | Bin 0 -> 2708 bytes
 app/images/icons/novnc-ios-icon.svg | 183 ++++++++++++++++++++++++++++++++++++
 vnc.html                            |  20 ++--
 21 files changed, 201 insertions(+), 12 deletions(-)
 delete mode 100644 app/images/icons/novnc-120.png
 delete mode 100644 app/images/icons/novnc-152.png
 delete mode 100644 app/images/icons/novnc-167.png
 delete mode 100644 app/images/icons/novnc-180.png
 delete mode 100644 app/images/icons/novnc-40.png
 delete mode 100644 app/images/icons/novnc-58.png
 delete mode 100644 app/images/icons/novnc-60.png
 delete mode 100644 app/images/icons/novnc-80.png
 delete mode 100644 app/images/icons/novnc-87.png
 create mode 100644 app/images/icons/novnc-ios-120.png
 create mode 100644 app/images/icons/novnc-ios-152.png
 create mode 100644 app/images/icons/novnc-ios-167.png
 create mode 100644 app/images/icons/novnc-ios-180.png
 create mode 100644 app/images/icons/novnc-ios-40.png
 create mode 100644 app/images/icons/novnc-ios-58.png
 create mode 100644 app/images/icons/novnc-ios-60.png
 create mode 100644 app/images/icons/novnc-ios-80.png
 create mode 100644 app/images/icons/novnc-ios-87.png
 create mode 100644 app/images/icons/novnc-ios-icon.svg

diff --git a/app/images/icons/Makefile b/app/images/icons/Makefile
index 8ee31c1..7f53b0a 100644
--- a/app/images/icons/Makefile
+++ b/app/images/icons/Makefile
@@ -1,13 +1,15 @@
 BROWSER_SIZES := 16 24 32 48 64
 ANDROID_SIZES := 72 96 144 192
+WEB_ICON_SIZES := $(BROWSER_SIZES) $(ANDROID_SIZES)
 
 #IOS_1X_SIZES := 20 29 40 76 # No such devices exist anymore
 IOS_2X_SIZES := 40 58 80 120 152 167
 IOS_3X_SIZES := 60 87 120 180
 ALL_IOS_SIZES := $(IOS_1X_SIZES) $(IOS_2X_SIZES) $(IOS_3X_SIZES)
 
-ALL_SIZES := $(BROWSER_SIZES) $(ANDROID_SIZES) $(ALL_IOS_SIZES)
-ALL_ICONS := $(ALL_SIZES:%=novnc-%.png)
+ALL_ICONS := \
+	$(ALL_IOS_SIZES:%=novnc-ios-%.png) \
+	$(WEB_ICON_SIZES:%=novnc-%.png)
 
 all: $(ALL_ICONS)
 
@@ -25,5 +27,9 @@ novnc-%.png: novnc-icon.svg
 	convert -density $$[`echo $*` * 90 / 48] \
 		-background transparent "$<" "$@"
 
+novnc-ios-%.png: novnc-ios-icon.svg
+	convert -depth 8 -background transparent \
+		-size $*x$* "$<" "$@"
+
 clean:
 	rm -f *.png
diff --git a/app/images/icons/novnc-120.png b/app/images/icons/novnc-120.png
deleted file mode 100644
index 40823ef..0000000
Binary files a/app/images/icons/novnc-120.png and /dev/null differ
diff --git a/app/images/icons/novnc-152.png b/app/images/icons/novnc-152.png
deleted file mode 100644
index 0694b2d..0000000
Binary files a/app/images/icons/novnc-152.png and /dev/null differ
diff --git a/app/images/icons/novnc-167.png b/app/images/icons/novnc-167.png
deleted file mode 100644
index 6b361b6..0000000
Binary files a/app/images/icons/novnc-167.png and /dev/null differ
diff --git a/app/images/icons/novnc-180.png b/app/images/icons/novnc-180.png
deleted file mode 100644
index cf8802b..0000000
Binary files a/app/images/icons/novnc-180.png and /dev/null differ
diff --git a/app/images/icons/novnc-40.png b/app/images/icons/novnc-40.png
deleted file mode 100644
index 4e42a1d..0000000
Binary files a/app/images/icons/novnc-40.png and /dev/null differ
diff --git a/app/images/icons/novnc-58.png b/app/images/icons/novnc-58.png
deleted file mode 100644
index ba2564e..0000000
Binary files a/app/images/icons/novnc-58.png and /dev/null differ
diff --git a/app/images/icons/novnc-60.png b/app/images/icons/novnc-60.png
deleted file mode 100644
index 06b0d60..0000000
Binary files a/app/images/icons/novnc-60.png and /dev/null differ
diff --git a/app/images/icons/novnc-80.png b/app/images/icons/novnc-80.png
deleted file mode 100644
index 19b1488..0000000
Binary files a/app/images/icons/novnc-80.png and /dev/null differ
diff --git a/app/images/icons/novnc-87.png b/app/images/icons/novnc-87.png
deleted file mode 100644
index ed7042c..0000000
Binary files a/app/images/icons/novnc-87.png and /dev/null differ
diff --git a/app/images/icons/novnc-ios-120.png b/app/images/icons/novnc-ios-120.png
new file mode 100644
index 0000000..8da7bab
Binary files /dev/null and b/app/images/icons/novnc-ios-120.png differ
diff --git a/app/images/icons/novnc-ios-152.png b/app/images/icons/novnc-ios-152.png
new file mode 100644
index 0000000..60b2bce
Binary files /dev/null and b/app/images/icons/novnc-ios-152.png differ
diff --git a/app/images/icons/novnc-ios-167.png b/app/images/icons/novnc-ios-167.png
new file mode 100644
index 0000000..98fade2
Binary files /dev/null and b/app/images/icons/novnc-ios-167.png differ
diff --git a/app/images/icons/novnc-ios-180.png b/app/images/icons/novnc-ios-180.png
new file mode 100644
index 0000000..5d24df7
Binary files /dev/null and b/app/images/icons/novnc-ios-180.png differ
diff --git a/app/images/icons/novnc-ios-40.png b/app/images/icons/novnc-ios-40.png
new file mode 100644
index 0000000..cf14894
Binary files /dev/null and b/app/images/icons/novnc-ios-40.png differ
diff --git a/app/images/icons/novnc-ios-58.png b/app/images/icons/novnc-ios-58.png
new file mode 100644
index 0000000..f6dfbeb
Binary files /dev/null and b/app/images/icons/novnc-ios-58.png differ
diff --git a/app/images/icons/novnc-ios-60.png b/app/images/icons/novnc-ios-60.png
new file mode 100644
index 0000000..8cda295
Binary files /dev/null and b/app/images/icons/novnc-ios-60.png differ
diff --git a/app/images/icons/novnc-ios-80.png b/app/images/icons/novnc-ios-80.png
new file mode 100644
index 0000000..6c417c4
Binary files /dev/null and b/app/images/icons/novnc-ios-80.png differ
diff --git a/app/images/icons/novnc-ios-87.png b/app/images/icons/novnc-ios-87.png
new file mode 100644
index 0000000..4377d87
Binary files /dev/null and b/app/images/icons/novnc-ios-87.png differ
diff --git a/app/images/icons/novnc-ios-icon.svg b/app/images/icons/novnc-ios-icon.svg
new file mode 100644
index 0000000..009452a
--- /dev/null
+++ b/app/images/icons/novnc-ios-icon.svg
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 48 48.000001"
+   id="svg2"
+   version="1.1"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   sodipodi:docname="novnc-ios-icon.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="27.356195"
+     inkscape:cy="17.810253"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:window-width="2560"
+     inkscape:window-height="1371"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4169" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3621)">
+    <rect
+       style="opacity:1;fill:#494949;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4167"
+       width="48"
+       height="48"
+       x="0"
+       y="1004.3621"
+       inkscape:label="background" />
+    <path
+       style="opacity:1;fill:#313131;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 0,1004.3621 v 48 h 20 c 15.512,0 28,-16.948 28,-38 v -10 z"
+       id="rect4173"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc"
+       inkscape:label="darker_grey_plate" />
+    <g
+       id="g4300"
+       style="display:inline;fill:#000000;fill-opacity:1;stroke:none"
+       transform="translate(0.5,0.5)"
+       inkscape:label="shadows">
+      <g
+         id="g4302"
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         inkscape:label="no">
+        <path
+           sodipodi:nodetypes="scsccsssscccs"
+           d="m 11.986926,1016.3621 c 0.554325,0 1.025987,0.2121 1.414987,0.6362 0.398725,0.4138 0.600909,0.9155 0.598087,1.5052 v 6.8586 h -2 v -6.8914 c 0,-0.072 -0.03404,-0.1086 -0.102113,-0.1086 H 7.1021125 C 7.0340375,1018.3621 7,1018.3983 7,1018.4707 v 6.8914 H 5 v -9 z"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="path4304"
+           inkscape:connector-curvature="0"
+           inkscape:label="n" />
+        <path
+           sodipodi:nodetypes="sscsscsscsscssssssssss"
+           d="m 17.013073,1016.3621 h 4.973854 c 0.554325,0 1.025987,0.2121 1.414986,0.6362 0.398725,0.4138 0.598087,0.9155 0.598087,1.5052 v 4.7172 c 0,0.5897 -0.199362,1.0966 -0.598087,1.5207 -0.388999,0.4138 -0.860661,0.6207 -1.414986,0.6207 h -4.973854 c -0.554325,0 -1.030849,-0.2069 -1.429574,-0.6207 C 15.1945,1024.3173 15,1023.8104 15,1023.2207 v -4.7172 c 0,-0.5897 0.1945,-1.0914 0.583499,-1.5052 0.398725,-0.4241 0.875249,-0.6362 1.429574,-0.6362 z m 4.884815,2 h -4.795776 c -0.06808,0 -0.102112,0.036 -0.102112,0.1086 v 4.7828 c 0,0.072 0.03404,0.1086 0.102112,0.1086 h 4.795776 c 0.06807,0 0.102112,-0.036 0.102112,-0.1086 v -4.7828 c 0,-0.072 -0.03404,-0.1086 -0.102112,-0.1086 z"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="path4306"
+           inkscape:connector-curvature="0"
+           inkscape:label="o" />
+      </g>
+      <g
+         id="g4308"
+         style="fill:#000000;fill-opacity:1;stroke:none"
+         inkscape:label="VNC">
+        <path
+           sodipodi:nodetypes="cccccccc"
+           d="m 12,1036.9177 4.768114,-8.5556 H 19 l -6,11 h -2 l -6,-11 h 2.2318854 z"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="path4310"
+           inkscape:connector-curvature="0"
+           inkscape:label="V" />
+        <path
+           sodipodi:nodetypes="ccccccccccc"
+           d="m 29,1036.3621 v -8 h 2 v 11 h -2 l -7,-8 v 8 h -2 v -11 h 2 z"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="path4312"
+           inkscape:connector-curvature="0"
+           inkscape:label="N" />
+        <path
+           sodipodi:nodetypes="cssssccscsscscc"
+           d="m 43,1030.3621 h -8.897887 c -0.06808,0 -0.102113,0.036 -0.102113,0.1069 v 6.7862 c 0,0.071 0.03404,0.1069 0.102113,0.1069 H 43 v 2 h -8.972339 c -0.56405,0 -1.045437,-0.2037 -1.444162,-0.6111 C 32.1945,1038.3334 32,1037.8292 32,1037.2385 v -6.7528 c 0,-0.5907 0.1945,-1.0898 0.583499,-1.4972 0.398725,-0.4176 0.880112,-0.6264 1.444162,-0.6264 H 43 Z"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="path4314"
+           inkscape:connector-curvature="0"
+           inkscape:label="C" />
+      </g>
+    </g>
+    <g
+       id="g4291"
+       style="stroke:none"
+       inkscape:label="noVNC">
+      <g
+         id="g4282"
+         style="stroke:none"
+         inkscape:label="no">
+        <path
+           inkscape:connector-curvature="0"
+           id="path4143"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 11.986926,1016.3621 c 0.554325,0 1.025987,0.2121 1.414987,0.6362 0.398725,0.4138 0.600909,0.9155 0.598087,1.5052 l 0,6.8586 -2,0 0,-6.8914 c 0,-0.072 -0.03404,-0.1086 -0.102113,-0.1086 l -4.7957745,0 C 7.0340375,1018.3621 7,1018.3983 7,1018.4707 l 0,6.8914 -2,0 0,-9 z"
+           sodipodi:nodetypes="scsccsssscccs"
+           inkscape:label="n" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4145"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 17.013073,1016.3621 4.973854,0 c 0.554325,0 1.025987,0.2121 1.414986,0.6362 0.398725,0.4138 0.598087,0.9155 0.598087,1.5052 l 0,4.7172 c 0,0.5897 -0.199362,1.0966 -0.598087,1.5207 -0.388999,0.4138 -0.860661,0.6207 -1.414986,0.6207 l -4.973854,0 c -0.554325,0 -1.030849,-0.2069 -1.429574,-0.6207 C 15.1945,1024.3173 15,1023.8104 15,1023.2207 l 0,-4.7172 c 0,-0.5897 0.1945,-1.0914 0.583499,-1.5052 0.398725,-0.4241 0.875249,-0.6362 1.429574,-0.6362 z m 4.884815,2 -4.795776,0 c -0.06808,0 -0.102112,0.036 -0.102112,0.1086 l 0,4.7828 c 0,0.072 0.03404,0.1086 0.102112,0.1086 l 4.795776,0 c 0.06807,0 0.102112,-0.036 0.102112,-0.1086 l 0,-4.7828 c 0,-0.072 -0.03404,-0.1086 -0.102112,-0.1086 z"
+           sodipodi:nodetypes="sscsscsscsscssssssssss"
+           inkscape:label="o" />
+      </g>
+      <g
+         id="g4286"
+         style="stroke:none"
+         inkscape:label="VNC">
+        <path
+           inkscape:connector-curvature="0"
+           id="path4147"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 12,1036.9177 4.768114,-8.5556 2.231886,0 -6,11 -2,0 -6,-11 2.2318854,0 z"
+           sodipodi:nodetypes="cccccccc"
+           inkscape:label="V" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4149"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 29,1036.3621 0,-8 2,0 0,11 -2,0 -7,-8 0,8 -2,0 0,-11 2,0 z"
+           sodipodi:nodetypes="ccccccccccc"
+           inkscape:label="N" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4151"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:Orbitron;-inkscape-font-specification:'Orbitron Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 43,1030.3621 -8.897887,0 c -0.06808,0 -0.102113,0.036 -0.102113,0.1069 l 0,6.7862 c 0,0.071 0.03404,0.1069 0.102113,0.1069 l 8.897887,0 0,2 -8.972339,0 c -0.56405,0 -1.045437,-0.2037 -1.444162,-0.6111 C 32.1945,1038.3334 32,1037.8292 32,1037.2385 l 0,-6.7528 c 0,-0.5907 0.1945,-1.0898 0.583499,-1.4972 0.398725,-0.4176 0.880112,-0.6264 1.444162,-0.6264 l 8.972339,0 z"
+           sodipodi:nodetypes="cssssccscsscscc"
+           inkscape:label="C" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/vnc.html b/vnc.html
index 4665143..2f5438a 100644
--- a/vnc.html
+++ b/vnc.html
@@ -39,17 +39,17 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 
     <!-- @2x -->
-    <link rel="apple-touch-icon" sizes="40x40" type="image/png" href="app/images/icons/novnc-40.png">
-    <link rel="apple-touch-icon" sizes="58x58" type="image/png" href="app/images/icons/novnc-58.png">
-    <link rel="apple-touch-icon" sizes="80x80" type="image/png" href="app/images/icons/novnc-80.png">
-    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120.png">
-    <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152.png">
-    <link rel="apple-touch-icon" sizes="167x167" type="image/png" href="app/images/icons/novnc-167.png">
+    <link rel="apple-touch-icon" sizes="40x40" type="image/png" href="app/images/icons/novnc-ios-40.png">
+    <link rel="apple-touch-icon" sizes="58x58" type="image/png" href="app/images/icons/novnc-ios-58.png">
+    <link rel="apple-touch-icon" sizes="80x80" type="image/png" href="app/images/icons/novnc-ios-80.png">
+    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-ios-120.png">
+    <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-ios-152.png">
+    <link rel="apple-touch-icon" sizes="167x167" type="image/png" href="app/images/icons/novnc-ios-167.png">
     <!-- @3x -->
-    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60.png">
-    <link rel="apple-touch-icon" sizes="87x87" type="image/png" href="app/images/icons/novnc-87.png">
-    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120.png">
-    <link rel="apple-touch-icon" sizes="180x180" type="image/png" href="app/images/icons/novnc-180.png">
+    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-ios-60.png">
+    <link rel="apple-touch-icon" sizes="87x87" type="image/png" href="app/images/icons/novnc-ios-87.png">
+    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-ios-120.png">
+    <link rel="apple-touch-icon" sizes="180x180" type="image/png" href="app/images/icons/novnc-ios-180.png">
 
     <!-- Stylesheets -->
     <link rel="stylesheet" href="app/styles/base.css">
-- 
cgit v1.2.1


From 139f087187b7b9b385d016be561e5b0bf3661a37 Mon Sep 17 00:00:00 2001
From: Samuel Mannehed <samuel@cendio.se>
Date: Thu, 22 Dec 2022 16:14:11 +0100
Subject: Explicitly specify icon size instead of density

Instead of calculating a density that we hope results in the correct
size, we can specify what size we want. This is more robust and easier
to understand. This also allows us to simplify the Makefile quite a bit.

Note that Fedora's packaging of ImageMagick has a bug here:
https://bugzilla.redhat.com/show_bug.cgi?id=2140018
---
 app/images/icons/Makefile      |  21 ++++++++-------------
 app/images/icons/novnc-144.png | Bin 4582 -> 4583 bytes
 app/images/icons/novnc-16.png  | Bin 675 -> 648 bytes
 app/images/icons/novnc-192.png | Bin 5787 -> 5754 bytes
 app/images/icons/novnc-24.png  | Bin 1000 -> 967 bytes
 app/images/icons/novnc-32.png  | Bin 1064 -> 1023 bytes
 app/images/icons/novnc-48.png  | Bin 1397 -> 1370 bytes
 app/images/icons/novnc-64.png  | Bin 1946 -> 1917 bytes
 app/images/icons/novnc-72.png  | Bin 2699 -> 2684 bytes
 app/images/icons/novnc-96.png  | Bin 2351 -> 3104 bytes
 10 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/images/icons/Makefile b/app/images/icons/Makefile
index 7f53b0a..83218e1 100644
--- a/app/images/icons/Makefile
+++ b/app/images/icons/Makefile
@@ -13,23 +13,18 @@ ALL_ICONS := \
 
 all: $(ALL_ICONS)
 
-novnc-16.png: novnc-icon-sm.svg
-	convert -density 90 \
-		-background transparent "$<" "$@"
-novnc-24.png: novnc-icon-sm.svg
-	convert -density 135 \
-		-background transparent "$<" "$@"
-novnc-32.png: novnc-icon-sm.svg
-	convert -density 180 \
-		-background transparent "$<" "$@"
-
+# General conversion
 novnc-%.png: novnc-icon.svg
-	convert -density $$[`echo $*` * 90 / 48] \
-		-background transparent "$<" "$@"
+	convert -depth 8 -background transparent \
+		-size $*x$* "$(lastword $^)" "$@"
 
+# iOS icons use their own SVG
 novnc-ios-%.png: novnc-ios-icon.svg
 	convert -depth 8 -background transparent \
-		-size $*x$* "$<" "$@"
+		-size $*x$* "$(lastword $^)" "$@"
+
+# The smallest sizes are generated using a different SVG
+novnc-16.png novnc-24.png novnc-32.png: novnc-icon-sm.svg
 
 clean:
 	rm -f *.png
diff --git a/app/images/icons/novnc-144.png b/app/images/icons/novnc-144.png
index eee71f1..1707e33 100644
Binary files a/app/images/icons/novnc-144.png and b/app/images/icons/novnc-144.png differ
diff --git a/app/images/icons/novnc-16.png b/app/images/icons/novnc-16.png
index 42108f4..d4e2928 100644
Binary files a/app/images/icons/novnc-16.png and b/app/images/icons/novnc-16.png differ
diff --git a/app/images/icons/novnc-192.png b/app/images/icons/novnc-192.png
index ef9201f..8c582b4 100644
Binary files a/app/images/icons/novnc-192.png and b/app/images/icons/novnc-192.png differ
diff --git a/app/images/icons/novnc-24.png b/app/images/icons/novnc-24.png
index 1106135..ee316e1 100644
Binary files a/app/images/icons/novnc-24.png and b/app/images/icons/novnc-24.png differ
diff --git a/app/images/icons/novnc-32.png b/app/images/icons/novnc-32.png
index ff00dc3..6d9182a 100644
Binary files a/app/images/icons/novnc-32.png and b/app/images/icons/novnc-32.png differ
diff --git a/app/images/icons/novnc-48.png b/app/images/icons/novnc-48.png
index f24cd6c..631a9bd 100644
Binary files a/app/images/icons/novnc-48.png and b/app/images/icons/novnc-48.png differ
diff --git a/app/images/icons/novnc-64.png b/app/images/icons/novnc-64.png
index 6d0fb34..98375f8 100644
Binary files a/app/images/icons/novnc-64.png and b/app/images/icons/novnc-64.png differ
diff --git a/app/images/icons/novnc-72.png b/app/images/icons/novnc-72.png
index 23163a2..26e4fba 100644
Binary files a/app/images/icons/novnc-72.png and b/app/images/icons/novnc-72.png differ
diff --git a/app/images/icons/novnc-96.png b/app/images/icons/novnc-96.png
index 1a77c53..102e8a6 100644
Binary files a/app/images/icons/novnc-96.png and b/app/images/icons/novnc-96.png differ
-- 
cgit v1.2.1


From 6e1d84285002c98957ec4eb1c3264b3bac0c8531 Mon Sep 17 00:00:00 2001
From: Samuel Mannehed <samuel@cendio.se>
Date: Thu, 22 Dec 2022 16:43:44 +0100
Subject: Use an ICO file for favicons

The browsers have been choosing very poorly and have a lot of bugs when
it comes to favicons. Using an ICO makes many browsers choose better in
most cases. Most large websites use ICO files.

The icons in the ICO file needs to be ordered largest to the smallest
icon, and due to a Chrome bug we are limited to 8 icons. This
unfortunately means we couldn't fit one of the Android sizes. The 72x72
icon was removed since testing showed that it was used the least.
---
 app/images/icons/Makefile      |  16 ++++++++++++++--
 app/images/icons/novnc-144.png | Bin 4583 -> 0 bytes
 app/images/icons/novnc-16.png  | Bin 648 -> 0 bytes
 app/images/icons/novnc-192.png | Bin 5754 -> 0 bytes
 app/images/icons/novnc-24.png  | Bin 967 -> 0 bytes
 app/images/icons/novnc-32.png  | Bin 1023 -> 0 bytes
 app/images/icons/novnc-48.png  | Bin 1370 -> 0 bytes
 app/images/icons/novnc-64.png  | Bin 1917 -> 0 bytes
 app/images/icons/novnc-72.png  | Bin 2684 -> 0 bytes
 app/images/icons/novnc-96.png  | Bin 3104 -> 0 bytes
 app/images/icons/novnc.ico     | Bin 0 -> 310566 bytes
 vnc.html                       |  16 +---------------
 12 files changed, 15 insertions(+), 17 deletions(-)
 delete mode 100644 app/images/icons/novnc-144.png
 delete mode 100644 app/images/icons/novnc-16.png
 delete mode 100644 app/images/icons/novnc-192.png
 delete mode 100644 app/images/icons/novnc-24.png
 delete mode 100644 app/images/icons/novnc-32.png
 delete mode 100644 app/images/icons/novnc-48.png
 delete mode 100644 app/images/icons/novnc-64.png
 delete mode 100644 app/images/icons/novnc-72.png
 delete mode 100644 app/images/icons/novnc-96.png
 create mode 100644 app/images/icons/novnc.ico

diff --git a/app/images/icons/Makefile b/app/images/icons/Makefile
index 83218e1..03eaed0 100644
--- a/app/images/icons/Makefile
+++ b/app/images/icons/Makefile
@@ -1,5 +1,8 @@
 BROWSER_SIZES := 16 24 32 48 64
-ANDROID_SIZES := 72 96 144 192
+#ANDROID_SIZES := 72 96 144 192
+# FIXME: The ICO is limited to 8 icons due to a Chrome bug:
+#        https://bugs.chromium.org/p/chromium/issues/detail?id=1381393
+ANDROID_SIZES := 96 144 192
 WEB_ICON_SIZES := $(BROWSER_SIZES) $(ANDROID_SIZES)
 
 #IOS_1X_SIZES := 20 29 40 76 # No such devices exist anymore
@@ -9,10 +12,19 @@ ALL_IOS_SIZES := $(IOS_1X_SIZES) $(IOS_2X_SIZES) $(IOS_3X_SIZES)
 
 ALL_ICONS := \
 	$(ALL_IOS_SIZES:%=novnc-ios-%.png) \
-	$(WEB_ICON_SIZES:%=novnc-%.png)
+	novnc.ico
 
 all: $(ALL_ICONS)
 
+# Our testing shows that the ICO file need to be sorted in largest to
+# smallest to get the apporpriate behviour
+WEB_ICON_SIZES_REVERSE := $(shell echo $(WEB_ICON_SIZES) | tr ' ' '\n' | sort -nr | tr '\n' ' ')
+WEB_BASE_ICONS := $(WEB_ICON_SIZES_REVERSE:%=novnc-%.png)
+.INTERMEDIATE: $(WEB_BASE_ICONS)
+
+novnc.ico: $(WEB_BASE_ICONS)
+	convert $(WEB_BASE_ICONS) "$@"
+
 # General conversion
 novnc-%.png: novnc-icon.svg
 	convert -depth 8 -background transparent \
diff --git a/app/images/icons/novnc-144.png b/app/images/icons/novnc-144.png
deleted file mode 100644
index 1707e33..0000000
Binary files a/app/images/icons/novnc-144.png and /dev/null differ
diff --git a/app/images/icons/novnc-16.png b/app/images/icons/novnc-16.png
deleted file mode 100644
index d4e2928..0000000
Binary files a/app/images/icons/novnc-16.png and /dev/null differ
diff --git a/app/images/icons/novnc-192.png b/app/images/icons/novnc-192.png
deleted file mode 100644
index 8c582b4..0000000
Binary files a/app/images/icons/novnc-192.png and /dev/null differ
diff --git a/app/images/icons/novnc-24.png b/app/images/icons/novnc-24.png
deleted file mode 100644
index ee316e1..0000000
Binary files a/app/images/icons/novnc-24.png and /dev/null differ
diff --git a/app/images/icons/novnc-32.png b/app/images/icons/novnc-32.png
deleted file mode 100644
index 6d9182a..0000000
Binary files a/app/images/icons/novnc-32.png and /dev/null differ
diff --git a/app/images/icons/novnc-48.png b/app/images/icons/novnc-48.png
deleted file mode 100644
index 631a9bd..0000000
Binary files a/app/images/icons/novnc-48.png and /dev/null differ
diff --git a/app/images/icons/novnc-64.png b/app/images/icons/novnc-64.png
deleted file mode 100644
index 98375f8..0000000
Binary files a/app/images/icons/novnc-64.png and /dev/null differ
diff --git a/app/images/icons/novnc-72.png b/app/images/icons/novnc-72.png
deleted file mode 100644
index 26e4fba..0000000
Binary files a/app/images/icons/novnc-72.png and /dev/null differ
diff --git a/app/images/icons/novnc-96.png b/app/images/icons/novnc-96.png
deleted file mode 100644
index 102e8a6..0000000
Binary files a/app/images/icons/novnc-96.png and /dev/null differ
diff --git a/app/images/icons/novnc.ico b/app/images/icons/novnc.ico
new file mode 100644
index 0000000..c3bc58e
Binary files /dev/null and b/app/images/icons/novnc.ico differ
diff --git a/vnc.html b/vnc.html
index 2f5438a..e77e82c 100644
--- a/vnc.html
+++ b/vnc.html
@@ -17,21 +17,7 @@
 
     <meta charset="utf-8">
 
-    <!-- Icons (see app/images/icons/Makefile for what the sizes are for) -->
-    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16.png">
-    <link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24.png">
-    <link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32.png">
-    <link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48.png">
-    <link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64.png">
-    <link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72.png">
-    <link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96.png">
-    <link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144.png">
-    <link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192.png">
-    <!-- Firefox currently mishandles SVG, see #1419039
-    <link rel="icon" sizes="any" type="image/svg+xml" href="app/images/icons/novnc-icon.svg">
-    -->
-    <!-- Repeated last so that legacy handling will pick this -->
-    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16.png">
+    <link rel="icon" type="image/x-icon" href="app/images/icons/novnc.ico">
 
     <!-- Apple iOS Safari settings -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-- 
cgit v1.2.1