diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html
index b1014659..6434e4dc 100644
--- a/package.nw/GridTracker.html
+++ b/package.nw/GridTracker.html
@@ -588,16 +588,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
onclick="openCallRosterWindow();"
title="Open Call Roster"
>
-
+
-
+
-
+
@@ -617,7 +617,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
@@ -632,18 +632,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
-
+
@@ -651,7 +651,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
@@ -689,13 +689,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
-
+
-
+
diff --git a/package.nw/img/award-delete.png b/package.nw/img/award-delete.png
new file mode 100644
index 00000000..12882b3e
Binary files /dev/null and b/package.nw/img/award-delete.png differ
diff --git a/package.nw/img/award-delete.svg b/package.nw/img/award-delete.svg
deleted file mode 100644
index ba04aaed..00000000
--- a/package.nw/img/award-delete.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
diff --git a/package.nw/img/award-empty.png b/package.nw/img/award-empty.png
new file mode 100644
index 00000000..86c9ea76
Binary files /dev/null and b/package.nw/img/award-empty.png differ
diff --git a/package.nw/img/award-empty.svg b/package.nw/img/award-empty.svg
deleted file mode 100644
index 89b00e80..00000000
--- a/package.nw/img/award-empty.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
diff --git a/package.nw/img/award-medal.png b/package.nw/img/award-medal.png
new file mode 100644
index 00000000..99c1b87e
Binary files /dev/null and b/package.nw/img/award-medal.png differ
diff --git a/package.nw/img/award-medal.svg b/package.nw/img/award-medal.svg
deleted file mode 100644
index 5d0a449a..00000000
--- a/package.nw/img/award-medal.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
diff --git a/package.nw/img/award-tally.png b/package.nw/img/award-tally.png
new file mode 100644
index 00000000..f7c3b1ed
Binary files /dev/null and b/package.nw/img/award-tally.png differ
diff --git a/package.nw/img/award-tally.svg b/package.nw/img/award-tally.svg
deleted file mode 100644
index 67072397..00000000
--- a/package.nw/img/award-tally.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
diff --git a/package.nw/img/award-trophy.png b/package.nw/img/award-trophy.png
new file mode 100644
index 00000000..172de02c
Binary files /dev/null and b/package.nw/img/award-trophy.png differ
diff --git a/package.nw/img/award-trophy.svg b/package.nw/img/award-trophy.svg
deleted file mode 100644
index 5feaf9be..00000000
--- a/package.nw/img/award-trophy.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
diff --git a/package.nw/img/conditions.png b/package.nw/img/conditions.png
new file mode 100644
index 00000000..59c46763
Binary files /dev/null and b/package.nw/img/conditions.png differ
diff --git a/package.nw/img/conditions.svg b/package.nw/img/conditions.svg
deleted file mode 100644
index 6b4df50e..00000000
--- a/package.nw/img/conditions.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/donate.png b/package.nw/img/donate.png
new file mode 100644
index 00000000..ba20a99c
Binary files /dev/null and b/package.nw/img/donate.png differ
diff --git a/package.nw/img/donate.svg b/package.nw/img/donate.svg
deleted file mode 100644
index 6988fd8d..00000000
--- a/package.nw/img/donate.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/energy-star.svg b/package.nw/img/energy-star.svg
deleted file mode 100644
index 503be8a5..00000000
--- a/package.nw/img/energy-star.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/package.nw/img/grid-overlay.png b/package.nw/img/grid-overlay.png
new file mode 100644
index 00000000..04295d01
Binary files /dev/null and b/package.nw/img/grid-overlay.png differ
diff --git a/package.nw/img/grid-overlay.svg b/package.nw/img/grid-overlay.svg
deleted file mode 100644
index f596fb49..00000000
--- a/package.nw/img/grid-overlay.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/help.png b/package.nw/img/help.png
new file mode 100644
index 00000000..7d19adcb
Binary files /dev/null and b/package.nw/img/help.png differ
diff --git a/package.nw/img/help.svg b/package.nw/img/help.svg
deleted file mode 100644
index 2ea091e6..00000000
--- a/package.nw/img/help.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/lookup.png b/package.nw/img/lookup.png
new file mode 100644
index 00000000..91ef1bf2
Binary files /dev/null and b/package.nw/img/lookup.png differ
diff --git a/package.nw/img/lookup.svg b/package.nw/img/lookup.svg
deleted file mode 100644
index 09e5f95c..00000000
--- a/package.nw/img/lookup.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/muted-button.png b/package.nw/img/muted-button.png
new file mode 100644
index 00000000..8e85e16b
Binary files /dev/null and b/package.nw/img/muted-button.png differ
diff --git a/package.nw/img/muted-button.svg b/package.nw/img/muted-button.svg
deleted file mode 100644
index da98b4a5..00000000
--- a/package.nw/img/muted-button.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/offline_map.png b/package.nw/img/offline_map.png
new file mode 100644
index 00000000..62bb0d15
Binary files /dev/null and b/package.nw/img/offline_map.png differ
diff --git a/package.nw/img/offline_map.svg b/package.nw/img/offline_map.svg
deleted file mode 100644
index 5f36f454..00000000
--- a/package.nw/img/offline_map.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/online_map.png b/package.nw/img/online_map.png
new file mode 100644
index 00000000..ffebfa8a
Binary files /dev/null and b/package.nw/img/online_map.png differ
diff --git a/package.nw/img/online_map.svg b/package.nw/img/online_map.svg
deleted file mode 100644
index 05f3a01c..00000000
--- a/package.nw/img/online_map.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/plus.png b/package.nw/img/plus.png
new file mode 100644
index 00000000..78bd1d31
Binary files /dev/null and b/package.nw/img/plus.png differ
diff --git a/package.nw/img/plus.svg b/package.nw/img/plus.svg
deleted file mode 100644
index 18ac154f..00000000
--- a/package.nw/img/plus.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
diff --git a/package.nw/img/radar-button.png b/package.nw/img/radar-button.png
new file mode 100644
index 00000000..e55abe4a
Binary files /dev/null and b/package.nw/img/radar-button.png differ
diff --git a/package.nw/img/radar-button.svg b/package.nw/img/radar-button.svg
deleted file mode 100644
index 5053f530..00000000
--- a/package.nw/img/radar-button.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/roster-button.png b/package.nw/img/roster-button.png
new file mode 100644
index 00000000..56db01d1
Binary files /dev/null and b/package.nw/img/roster-button.png differ
diff --git a/package.nw/img/roster-button.svg b/package.nw/img/roster-button.svg
deleted file mode 100644
index 5224c723..00000000
--- a/package.nw/img/roster-button.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/roster.png b/package.nw/img/roster.png
new file mode 100644
index 00000000..9deea2c9
Binary files /dev/null and b/package.nw/img/roster.png differ
diff --git a/package.nw/img/roster.svg b/package.nw/img/roster.svg
deleted file mode 100644
index 608fc53e..00000000
--- a/package.nw/img/roster.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
diff --git a/package.nw/img/settings-button.png b/package.nw/img/settings-button.png
new file mode 100644
index 00000000..77258742
Binary files /dev/null and b/package.nw/img/settings-button.png differ
diff --git a/package.nw/img/settings-button.svg b/package.nw/img/settings-button.svg
deleted file mode 100644
index f7afe1fc..00000000
--- a/package.nw/img/settings-button.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/spots.png b/package.nw/img/spots.png
new file mode 100644
index 00000000..89e75c7d
Binary files /dev/null and b/package.nw/img/spots.png differ
diff --git a/package.nw/img/spots.svg b/package.nw/img/spots.svg
deleted file mode 100644
index 6eebf100..00000000
--- a/package.nw/img/spots.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/stats-button.png b/package.nw/img/stats-button.png
new file mode 100644
index 00000000..bc0f0fc5
Binary files /dev/null and b/package.nw/img/stats-button.png differ
diff --git a/package.nw/img/stats-button.svg b/package.nw/img/stats-button.svg
deleted file mode 100644
index 9df2badc..00000000
--- a/package.nw/img/stats-button.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/timezone-button.png b/package.nw/img/timezone-button.png
new file mode 100644
index 00000000..f1214b1c
Binary files /dev/null and b/package.nw/img/timezone-button.png differ
diff --git a/package.nw/img/timezone-button.svg b/package.nw/img/timezone-button.svg
deleted file mode 100644
index cb684c7a..00000000
--- a/package.nw/img/timezone-button.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/img/unmuted-button.png b/package.nw/img/unmuted-button.png
new file mode 100644
index 00000000..8b152720
Binary files /dev/null and b/package.nw/img/unmuted-button.png differ
diff --git a/package.nw/img/unmuted-button.svg b/package.nw/img/unmuted-button.svg
deleted file mode 100644
index 60f4dfd1..00000000
--- a/package.nw/img/unmuted-button.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
\ No newline at end of file
diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index 6f36d4eb..f84122bb 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -568,8 +568,8 @@ var g_gtShareFlagImageArray = Array();
g_gtShareFlagImageArray[1] = "./img/share-on.png";
g_gtShareFlagImageArray[0] = "./img/share-off.png";
var g_mapImageArray = Array();
-g_mapImageArray[1] = "./img/online_map.svg";
-g_mapImageArray[0] = "./img/offline_map.svg";
+g_mapImageArray[1] = "./img/online_map.png";
+g_mapImageArray[0] = "./img/offline_map.png";
var g_pinImageArray = Array();
g_pinImageArray[1] = "./img/red_pin_32.png";
g_pinImageArray[0] = "./img/gt_grid.png";
@@ -580,8 +580,8 @@ var g_qslLockImageArray = Array();
g_qslLockImageArray[0] = "./img/qsl_unlocked_32.png";
g_qslLockImageArray[1] = "./img/qsl_locked_32.png";
var g_alertImageArray = Array();
-g_alertImageArray[0] = "./img/unmuted-button.svg";
-g_alertImageArray[1] = "./img/muted-button.svg";
+g_alertImageArray[0] = "./img/unmuted-button.png";
+g_alertImageArray[1] = "./img/muted-button.png";
var g_maidenheadModeImageArray = Array();
g_maidenheadModeImageArray[0] = "./img/mh4_32.png";
g_maidenheadModeImageArray[1] = "./img/mh6_32.png";
diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js
index 9239b928..64950cbf 100644
--- a/package.nw/lib/roster.js
+++ b/package.nw/lib/roster.js
@@ -2639,12 +2639,12 @@ function updateAwardList(target = null)
row,
"