diff --git a/CHANGELOG.md b/CHANGELOG.md
index a024392..88d3b26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,14 +40,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
     - In 6.1.1.18, there is no longer a global shared JsonParser, which was the main potential source of race conditions.
 - Fix issue where pretty-printing or compressing causes tree view position tracking to be out of sync with the document until a query is issued or the `Refresh` button is hit.
 - Improve Alt-key accelerators *in forms*. They don't seem to work right for some reason.
-- Fix problem where icons disappear when going from light mode to dark mode (until Notepad++ is closed; does not persist after restart)
-    - this problem only seems to appear after the user has opened a docking form, and maybe not even every time
+- *Completely* Fix problem where icons disappear when going from light mode to dark mode (until Notepad++ is closed; does not persist after restart)
+    - this problem rarely surfaces, but it doesn't seem to be completely addressed
 - issue with treeview closing when a file with a treeview is moved from one view to another
 - `loop()` function used in `s_sub` callbacks is not thread-safe. *This doesn't matter right now* because RemesPath is single-threaded, but it could matter in the future.
 - GrepperForm loses its JSON permanently when the buffer associated with its treeview is deleted.
 - Since v7.0, holding down `Enter` in a multiline textbox (like the [tree viewer query box](/docs/README.md#remespath)) only adds one newline when the key is lifted.
 - Maybe use pre-7.1 (dictionary-based rather than indicator-based) [selection remembering](/docs/README.md#working-with-selections) for Notepad++ 8.5.5 and earlier? Indicators are risky with those older NPP's because of the lack of `NPPM_ALLOCATEINDICATOR`.
 
+## [8.4.0] - (UNRELEASED) YYYY-MM-DD
+
+### Fixed
+
+1. Mostly fix bug where icons would disappear when going from light to dark mode. As a side effect, the icons when using "standard icons: small" are smaller, but the icons under other conditions are larger.
+
 ## [8.3.1] - 2024-12-22
 
 ### Fixed
diff --git a/JsonToolsNppPlugin/Properties/AssemblyInfo.cs b/JsonToolsNppPlugin/Properties/AssemblyInfo.cs
index 70c097b..720c73d 100644
--- a/JsonToolsNppPlugin/Properties/AssemblyInfo.cs
+++ b/JsonToolsNppPlugin/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("8.3.1.0")]
-[assembly: AssemblyFileVersion("8.3.1.0")]
+[assembly: AssemblyVersion("8.3.1.1")]
+[assembly: AssemblyFileVersion("8.3.1.1")]
diff --git a/JsonToolsNppPlugin/Resources/json compress toolbar bmp.bmp b/JsonToolsNppPlugin/Resources/json compress toolbar bmp.bmp
index dc1969c..4bd25a6 100644
Binary files a/JsonToolsNppPlugin/Resources/json compress toolbar bmp.bmp and b/JsonToolsNppPlugin/Resources/json compress toolbar bmp.bmp differ
diff --git a/JsonToolsNppPlugin/Resources/json compress toolbar darkmode.ico b/JsonToolsNppPlugin/Resources/json compress toolbar darkmode.ico
index 533d681..450e19c 100644
Binary files a/JsonToolsNppPlugin/Resources/json compress toolbar darkmode.ico and b/JsonToolsNppPlugin/Resources/json compress toolbar darkmode.ico differ
diff --git a/JsonToolsNppPlugin/Resources/json compress toolbar.ico b/JsonToolsNppPlugin/Resources/json compress toolbar.ico
index 4184fb0..7d504e4 100644
Binary files a/JsonToolsNppPlugin/Resources/json compress toolbar.ico and b/JsonToolsNppPlugin/Resources/json compress toolbar.ico differ
diff --git a/JsonToolsNppPlugin/Resources/json path to position toolbar bmp.bmp b/JsonToolsNppPlugin/Resources/json path to position toolbar bmp.bmp
index f35d3dd..a1ba95d 100644
Binary files a/JsonToolsNppPlugin/Resources/json path to position toolbar bmp.bmp and b/JsonToolsNppPlugin/Resources/json path to position toolbar bmp.bmp differ
diff --git a/JsonToolsNppPlugin/Resources/json path to position toolbar darkmode.ico b/JsonToolsNppPlugin/Resources/json path to position toolbar darkmode.ico
index 28f582d..22f3235 100644
Binary files a/JsonToolsNppPlugin/Resources/json path to position toolbar darkmode.ico and b/JsonToolsNppPlugin/Resources/json path to position toolbar darkmode.ico differ
diff --git a/JsonToolsNppPlugin/Resources/json path to position toolbar.ico b/JsonToolsNppPlugin/Resources/json path to position toolbar.ico
index a36c353..b10d94c 100644
Binary files a/JsonToolsNppPlugin/Resources/json path to position toolbar.ico and b/JsonToolsNppPlugin/Resources/json path to position toolbar.ico differ
diff --git a/JsonToolsNppPlugin/Resources/json pretty print toolbar bmp.bmp b/JsonToolsNppPlugin/Resources/json pretty print toolbar bmp.bmp
index 60d9bac..0631010 100644
Binary files a/JsonToolsNppPlugin/Resources/json pretty print toolbar bmp.bmp and b/JsonToolsNppPlugin/Resources/json pretty print toolbar bmp.bmp differ
diff --git a/JsonToolsNppPlugin/Resources/json pretty print toolbar darkmode.ico b/JsonToolsNppPlugin/Resources/json pretty print toolbar darkmode.ico
index 0fb4557..aadc5cd 100644
Binary files a/JsonToolsNppPlugin/Resources/json pretty print toolbar darkmode.ico and b/JsonToolsNppPlugin/Resources/json pretty print toolbar darkmode.ico differ
diff --git a/JsonToolsNppPlugin/Resources/json pretty print toolbar.ico b/JsonToolsNppPlugin/Resources/json pretty print toolbar.ico
index 322f2b8..46b9667 100644
Binary files a/JsonToolsNppPlugin/Resources/json pretty print toolbar.ico and b/JsonToolsNppPlugin/Resources/json pretty print toolbar.ico differ
diff --git a/JsonToolsNppPlugin/Resources/json tree toolbar bmp.bmp b/JsonToolsNppPlugin/Resources/json tree toolbar bmp.bmp
index f5a82a6..aef933c 100644
Binary files a/JsonToolsNppPlugin/Resources/json tree toolbar bmp.bmp and b/JsonToolsNppPlugin/Resources/json tree toolbar bmp.bmp differ
diff --git a/JsonToolsNppPlugin/Resources/json tree toolbar darkmode.ico b/JsonToolsNppPlugin/Resources/json tree toolbar darkmode.ico
index 760d8a3..be81977 100644
Binary files a/JsonToolsNppPlugin/Resources/json tree toolbar darkmode.ico and b/JsonToolsNppPlugin/Resources/json tree toolbar darkmode.ico differ
diff --git a/JsonToolsNppPlugin/Resources/json tree toolbar.ico b/JsonToolsNppPlugin/Resources/json tree toolbar.ico
index c7da2b3..f6da10e 100644
Binary files a/JsonToolsNppPlugin/Resources/json tree toolbar.ico and b/JsonToolsNppPlugin/Resources/json tree toolbar.ico differ
diff --git a/JsonToolsNppPlugin/Resources/json-tools icons.bat b/JsonToolsNppPlugin/Resources/json-tools icons.bat
index bdf10d4..a2bf66f 100644
--- a/JsonToolsNppPlugin/Resources/json-tools icons.bat	
+++ b/JsonToolsNppPlugin/Resources/json-tools icons.bat	
@@ -8,19 +8,19 @@ magick "string type icon.png" "string type icon.ico"
 magick "null type icon.png" "null type icon.ico"
 
 : add toolbar bitmaps
-magick "json pretty print icon.png" -resize 20x20 "json pretty print toolbar bmp.bmp"
-magick "json compress icon.png" -resize 20x20 "json compress toolbar bmp.bmp"
-magick "json path to position icon.png" -resize 20x20 "json path to position toolbar bmp.bmp"
-magick "json tree icon.png" -resize 20x20 "json tree toolbar bmp.bmp"
+magick "json pretty print icon.png" -resize 16x16! "json pretty print toolbar bmp.bmp"
+magick "json compress icon.png" -resize 16x16! "json compress toolbar bmp.bmp"
+magick "json path to position icon.png" -resize 16x16! "json path to position toolbar bmp.bmp"
+magick "json tree icon.png" -resize 16x16! "json tree toolbar bmp.bmp"
 
 : add toolbar icons
-magick "json pretty print icon.png" -resize 20x20 "json pretty print toolbar.ico"
-magick "json compress icon.png" -resize 20x20 "json compress toolbar.ico"
-magick "json path to position icon.png" -resize 20x20 "json path to position toolbar.ico"
-magick "json tree icon.png" -resize 20x20 "json tree toolbar.ico"
+magick "json pretty print icon.png" -resize 32x32! "json pretty print toolbar.ico"
+magick "json compress icon.png" -resize 32x32! "json compress toolbar.ico"
+magick "json path to position icon.png" -resize 32x32! "json path to position toolbar.ico"
+magick "json tree icon.png" -resize 32x32! "json tree toolbar.ico"
 
 : add darkmode icons
-magick "json pretty print icon darkmode.png" -resize 20x20 "json pretty print toolbar darkmode.ico"
-magick "json compress icon darkmode.png" -resize 20x20 "json compress toolbar darkmode.ico"
-magick "json path to position icon darkmode.png" -resize 20x20 "json path to position toolbar darkmode.ico"
-magick "json tree toolbar darkmode.png" -resize 20x20 "json tree toolbar darkmode.ico"
\ No newline at end of file
+magick "json pretty print icon darkmode.png" -resize 32x32! "json pretty print toolbar darkmode.ico"
+magick "json compress icon darkmode.png" -resize 32x32! "json compress toolbar darkmode.ico"
+magick "json path to position icon darkmode.png" -resize 32x32! "json path to position toolbar darkmode.ico"
+magick "json tree toolbar darkmode.png" -resize 32x32! "json tree toolbar darkmode.ico"
\ No newline at end of file