diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb9d03599..1ea933fed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ### Added
 * Added even more debug info for future reports relating to issue [#R1](https://github.com/FWDekkerBot/intellij-randomness-issues/issues/1).
 
+### Changed
+* Changed icon instantiation to be more in line with guidelines, hopefully fixing [#R13](https://github.com/FWDekkerBot/intellij-randomness-issues/issues/13).
+
 
 ## 3.3.1 -- 2024-05-06
 ### Added
@@ -24,7 +27,7 @@
 * Disabled dynamic reloading of the plugin until a stable fix can be deployed. ([#522](https://github.com/FWDekker/intellij-randomness/pull/522))
 
 ### Fixed
-* Various incorrect uses of the platform API. ([#526](https://github.com/FWDekker/intellij-randomness/issues/526))
+* Fixed various incorrect uses of the platform API. ([#526](https://github.com/FWDekker/intellij-randomness/issues/526))
 
 
 ## 3.2.0 -- 2024-01-10
diff --git a/src/main/kotlin/com/fwdekker/randomness/Bundle.kt b/src/main/kotlin/com/fwdekker/randomness/Bundle.kt
index 5fac53f29..2ee5ae589 100644
--- a/src/main/kotlin/com/fwdekker/randomness/Bundle.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/Bundle.kt
@@ -40,7 +40,7 @@ object Bundle {
 fun String.matchesFormat(format: String, vararg args: String) =
     Regex("%[0-9]+\\\$[Ssd]").findAll(format)
         .toList()
-        .reversed()
+        .asReversed()
         .fold(format) { acc, match ->
             if (match.value.drop(1).dropLast(2).toInt() > args.size)
                 acc.replaceRange(match.range, ".*")
diff --git a/src/main/kotlin/com/fwdekker/randomness/Icons.kt b/src/main/kotlin/com/fwdekker/randomness/Icons.kt
index 34e75c440..018a31a87 100644
--- a/src/main/kotlin/com/fwdekker/randomness/Icons.kt
+++ b/src/main/kotlin/com/fwdekker/randomness/Icons.kt
@@ -18,57 +18,68 @@ object Icons {
     /**
      * The main icon of Randomness.
      */
-    val RANDOMNESS get() = IconLoader.getIcon("/icons/randomness.svg", this.javaClass.classLoader)
+    @JvmField
+    val RANDOMNESS = IconLoader.getIcon("/icons/randomness.svg", javaClass)
 
     /**
      * The template icon for template icons.
      */
-    val TEMPLATE get() = IconLoader.getIcon("/icons/template.svg", this.javaClass.classLoader)
+    @JvmField
+    val TEMPLATE = IconLoader.getIcon("/icons/template.svg", javaClass)
 
     /**
      * The template icon for scheme icons.
      */
-    val SCHEME get() = IconLoader.getIcon("/icons/scheme.svg", this.javaClass.classLoader)
+    @JvmField
+    val SCHEME = IconLoader.getIcon("/icons/scheme.svg", javaClass)
 
     /**
      * An icon for settings.
      */
-    val SETTINGS get() = IconLoader.getIcon("/icons/settings.svg", this.javaClass.classLoader)
+    @JvmField
+    val SETTINGS = IconLoader.getIcon("/icons/settings.svg", javaClass)
 
     /**
      * A filled-in version of [SETTINGS].
      */
-    val SETTINGS_FILLED get() = IconLoader.getIcon("/icons/settings-filled.svg", this.javaClass.classLoader)
+    @JvmField
+    val SETTINGS_FILLED = IconLoader.getIcon("/icons/settings-filled.svg", javaClass)
 
     /**
      * An icon for arrays.
      */
-    val ARRAY get() = IconLoader.getIcon("/icons/array.svg", this.javaClass.classLoader)
+    @JvmField
+    val ARRAY = IconLoader.getIcon("/icons/array.svg", javaClass)
 
     /**
      * A filled-in version of [ARRAY].
      */
-    val ARRAY_FILLED get() = IconLoader.getIcon("/icons/array-filled.svg", this.javaClass.classLoader)
+    @JvmField
+    val ARRAY_FILLED = IconLoader.getIcon("/icons/array-filled.svg", javaClass)
 
     /**
      * An icon for references.
      */
-    val REFERENCE get() = IconLoader.getIcon("/icons/reference.svg", this.javaClass.classLoader)
+    @JvmField
+    val REFERENCE = IconLoader.getIcon("/icons/reference.svg", javaClass)
 
     /**
      * A filled-in version of [REFERENCE].
      */
-    val REFERENCE_FILLED get() = IconLoader.getIcon("/icons/reference-filled.svg", this.javaClass.classLoader)
+    @JvmField
+    val REFERENCE_FILLED = IconLoader.getIcon("/icons/reference-filled.svg", javaClass)
 
     /**
      * An icon for repeated insertions.
      */
-    val REPEAT get() = IconLoader.getIcon("/icons/repeat.svg", this.javaClass.classLoader)
+    @JvmField
+    val REPEAT = IconLoader.getIcon("/icons/repeat.svg", javaClass)
 
     /**
      * A filled-in version of [REPEAT].
      */
-    val REPEAT_FILLED get() = IconLoader.getIcon("/icons/repeat-filled.svg", this.javaClass.classLoader)
+    @JvmField
+    val REPEAT_FILLED = IconLoader.getIcon("/icons/repeat-filled.svg", javaClass)
 }
 
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 09160531a..8c871331b 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -33,7 +33,7 @@
     <!-- Non-dynamic actions -->
     <actions resource-bundle="randomness">
         <action id="com.fwdekker.randomness.PopupAction" class="com.fwdekker.randomness.PopupAction"
-                icon="/icons/randomness.svg">
+                icon="com.fwdekker.randomness.Icons.RANDOMNESS">
             <keyboard-shortcut first-keystroke="alt R" keymap="$default" />
             <add-to-group group-id="GenerateGroup" anchor="last" />
             <add-to-group group-id="ToolsMenu" anchor="last" />
diff --git a/src/main/resources/icons/array-filled.svg b/src/main/resources/icons/array-filled.svg
index 57f290193..2d606ba0d 100644
--- a/src/main/resources/icons/array-filled.svg
+++ b/src/main/resources/icons/array-filled.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="array-filled">
     <path d="M0 0L16 0L16 16L0 16L0 0Z" id="Rectangle" fill="#D3D3D3" fill-rule="evenodd" stroke="none" />
     <g id="array">
@@ -7,4 +7,4 @@
       <path d="M0 16L0 0L6.4 0L6.4 2.4L2.4 2.4L2.4 13.6L6.4 13.6L6.4 16L0 16L0 16Z" id="Left" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/array.svg b/src/main/resources/icons/array.svg
index 97897dc0d..434f54ac0 100644
--- a/src/main/resources/icons/array.svg
+++ b/src/main/resources/icons/array.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="array">
     <path d="M9.6 16L9.6 13.6L13.6 13.6L13.6 2.4L9.6 2.4L9.6 0L16 0L16 16L9.6 16L9.6 16Z" id="Right" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
     <path d="M0 16L0 0L6.4 0L6.4 2.4L2.4 2.4L2.4 13.6L6.4 13.6L6.4 16L0 16L0 16Z" id="Left" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/array_dark.svg b/src/main/resources/icons/array_dark.svg
index fd7e402e4..781f208ff 100644
--- a/src/main/resources/icons/array_dark.svg
+++ b/src/main/resources/icons/array_dark.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="array_dark">
     <g id="Array-instance">
       <path d="M9.6 16L9.6 13.6L13.6 13.6L13.6 2.4L9.6 2.4L9.6 0L16 0L16 16L9.6 16L9.6 16Z" id="Right" fill="#AFB1B3" fill-rule="evenodd" stroke="none" />
       <path d="M0 16L0 0L6.4 0L6.4 2.4L2.4 2.4L2.4 13.6L6.4 13.6L6.4 16L0 16L0 16Z" id="Left" fill="#AFB1B3" fill-rule="evenodd" stroke="none" />
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/popup-filled.svg b/src/main/resources/icons/popup-filled.svg
index 7248fe737..66a50a5cd 100644
--- a/src/main/resources/icons/popup-filled.svg
+++ b/src/main/resources/icons/popup-filled.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="popup-filled">
     <path d="M0 0L16 0L16 16L0 16L0 0Z" id="Rectangle" fill="#D3D3D3" fill-rule="evenodd" stroke="none" />
     <g id="popup">
@@ -8,4 +8,4 @@
       <path d="M0 0L16 0L16 3.2L0 3.2L0 0Z" id="Rectangle" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/popup.svg b/src/main/resources/icons/popup.svg
index cacdaecc2..9df6c8871 100644
--- a/src/main/resources/icons/popup.svg
+++ b/src/main/resources/icons/popup.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="popup">
     <path d="M0 12.8L16 12.8L16 16L0 16L0 12.8Z" id="Rectangle" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
     <path d="M0 6.4L16 6.4L16 9.6L0 9.6L0 6.4Z" id="Rectangle" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
     <path d="M0 0L16 0L16 3.2L0 3.2L0 0Z" id="Rectangle" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/popup_dark.svg b/src/main/resources/icons/popup_dark.svg
index a03005c53..f60f9ce52 100644
--- a/src/main/resources/icons/popup_dark.svg
+++ b/src/main/resources/icons/popup_dark.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="popup_dark">
     <g id="Popup-instance">
       <path d="M0 12.8L16 12.8L16 16L0 16L0 12.8Z" id="Rectangle" fill="#AFB1B3" fill-rule="evenodd" stroke="none" />
@@ -7,4 +7,4 @@
       <path d="M0 0L16 0L16 3.2L0 3.2L0 0Z" id="Rectangle" fill="#AFB1B3" fill-rule="evenodd" stroke="none" />
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/randomness.svg b/src/main/resources/icons/randomness.svg
index 90f9b3f8d..92bc5759e 100644
--- a/src/main/resources/icons/randomness.svg
+++ b/src/main/resources/icons/randomness.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="randomness">
     <g id="pluginIcon">
       <path d="M8 0.8L8 6.4C8.88366 6.4 9.6 7.11634 9.6 8L15.2 8L15.2 5.799Q15.2 5.67628 15.194 5.55371Q15.188 5.43114 15.1759 5.30901Q15.1639 5.18688 15.1459 5.06549Q15.1279 4.9441 15.1039 4.82374Q15.08 4.70338 15.0502 4.58434Q15.0204 4.4653 14.9847 4.34787Q14.9491 4.23043 14.9078 4.11489Q14.8664 3.99934 14.8195 3.88597Q14.7725 3.77259 14.72 3.66165Q14.6676 3.55072 14.6097 3.44249Q14.5519 3.33426 14.4888 3.229Q14.4257 3.12374 14.3575 3.0217Q14.2893 2.91967 14.2162 2.8211Q14.1431 2.72253 14.0653 2.62767Q13.9874 2.5328 13.905 2.44188Q13.8226 2.35095 13.7358 2.26417Q13.6491 2.1774 13.5581 2.09499Q13.4672 2.01257 13.3723 1.93472Q13.2775 1.85687 13.1789 1.78377Q13.0803 1.71066 12.9783 1.64248Q12.8763 1.5743 12.771 1.51121Q12.6657 1.44812 12.5575 1.39028Q12.4493 1.33243 12.3383 1.27996Q12.2274 1.22749 12.114 1.18053Q12.0007 1.13356 11.8851 1.09222Q11.7696 1.05088 11.6521 1.01526Q11.5347 0.979632 11.4157 0.949814Q11.2966 0.919996 11.1763 0.896054Q11.0559 0.872113 10.9345 0.854107Q10.8131 0.8361 10.691 0.824072Q10.5689 0.812043 10.4463 0.806022Q10.3237 0.8 10.201 0.8L8 0.8ZM11.8 2.6C10.9163 2.6 10.2 3.31634 10.2 4.2C10.2 5.08366 10.9163 5.8 11.8 5.8C12.6837 5.8 13.4 5.08366 13.4 4.2C13.4 3.31634 12.6837 2.6 11.8 2.6Z" id="Top-die-Intersect" fill="#DB5860" fill-rule="evenodd" stroke="none" />
@@ -8,4 +8,4 @@
       <path d="M0.8 8L6.4 8C6.4 7.11634 7.11634 6.4 8 6.4L8 0.8L5.799 0.8Q5.67628 0.8 5.55371 0.806022Q5.43114 0.812043 5.30901 0.824072Q5.18688 0.8361 5.06549 0.854107Q4.9441 0.872113 4.82374 0.896054Q4.70338 0.919996 4.58434 0.949814Q4.4653 0.979632 4.34787 1.01526Q4.23043 1.05088 4.11489 1.09222Q3.99934 1.13356 3.88597 1.18053Q3.77259 1.22749 3.66165 1.27996Q3.55072 1.33243 3.44249 1.39028Q3.33426 1.44812 3.229 1.51121Q3.12374 1.5743 3.0217 1.64248Q2.91967 1.71066 2.8211 1.78377Q2.72253 1.85687 2.62767 1.93472Q2.5328 2.01257 2.44188 2.09499Q2.35095 2.1774 2.26417 2.26417Q2.1774 2.35095 2.09499 2.44188Q2.01257 2.5328 1.93472 2.62767Q1.85687 2.72253 1.78377 2.8211Q1.71066 2.91967 1.64248 3.0217Q1.5743 3.12374 1.51121 3.229Q1.44812 3.33426 1.39028 3.44249Q1.33243 3.55072 1.27996 3.66165Q1.22749 3.77259 1.18053 3.88596Q1.13356 3.99934 1.09222 4.11489Q1.05088 4.23043 1.01526 4.34787Q0.979632 4.4653 0.949814 4.58434Q0.919996 4.70338 0.896054 4.82374Q0.872113 4.9441 0.854107 5.06549Q0.8361 5.18688 0.824072 5.30901Q0.812043 5.43114 0.806022 5.55371Q0.8 5.67628 0.8 5.799L0.8 8ZM2.6 4.2C2.6 3.31634 3.31634 2.6 4.2 2.6C5.08366 2.6 5.8 3.31634 5.8 4.2C5.8 5.08366 5.08366 5.8 4.2 5.8C3.31634 5.8 2.6 5.08366 2.6 4.2Z" id="Left-die-Intersect" fill="#59A869" fill-rule="evenodd" stroke="none" />
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/reference-filled.svg b/src/main/resources/icons/reference-filled.svg
index 89cfc59d3..344c17009 100644
--- a/src/main/resources/icons/reference-filled.svg
+++ b/src/main/resources/icons/reference-filled.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="reference-filled">
     <path d="M0 0L10 0L10 9L0 9L0 0Z" transform="matrix(0.70710677 0.70710677 -0.70710677 0.70710677 8 1)" id="Rectangle" fill="#D3D3D3" fill-rule="evenodd" stroke="none" />
     <path d="M0 5C0 2.23858 2.23858 0 5 0C7.76142 0 10 2.23858 10 5C10 7.76142 7.76142 10 5 10C2.23858 10 0 7.76142 0 5Z" transform="translate(5 1)" id="Ellipse-2" fill="#D3D3D3" fill-rule="evenodd" stroke="none" />
@@ -8,4 +8,4 @@
       <path d="M3.37938 5.22763L4.67316 6.5214L2.82491 8.36965C1.49792 9.69663 1.49792 11.8481 2.82491 13.1751C4.15189 14.5021 6.30336 14.5021 7.63035 13.1751L9.47859 11.3268L10.7724 12.6206L8.92412 14.4689C6.88261 16.5104 3.57265 16.5104 1.53114 14.4689C-0.510379 12.4273 -0.510379 9.11739 1.53114 7.07588L3.37938 5.22763L3.37938 5.22763ZM5.22762 3.37938L7.07586 1.53114C9.11738 -0.510379 12.4273 -0.510379 14.4688 1.53114C16.5104 3.57265 16.5104 6.88261 14.4688 8.92412L12.6206 10.7724L11.3268 9.4786L13.1751 7.63035C14.5021 6.30336 14.5021 4.1519 13.1751 2.82491C11.8481 1.49792 9.69662 1.49792 8.36963 2.82491L6.52139 4.67316L5.22762 3.37938L5.22762 3.37938ZM4.63057 9.93635L9.80566 4.76125L11.3767 6.33226L6.20158 11.5074L4.63057 9.93635L4.63057 9.93635Z" transform="translate(0 -7.450581E-09)" id="Shape" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/reference.svg b/src/main/resources/icons/reference.svg
index 6d00d6191..05e65fa09 100644
--- a/src/main/resources/icons/reference.svg
+++ b/src/main/resources/icons/reference.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="reference">
     <path d="M3.37938 5.22763L4.67316 6.5214L2.82491 8.36965C1.49792 9.69663 1.49792 11.8481 2.82491 13.1751C4.15189 14.5021 6.30336 14.5021 7.63035 13.1751L9.47859 11.3268L10.7724 12.6206L8.92412 14.4689C6.88261 16.5104 3.57265 16.5104 1.53114 14.4689C-0.510379 12.4273 -0.510379 9.11739 1.53114 7.07588L3.37938 5.22763L3.37938 5.22763ZM5.22762 3.37938L7.07586 1.53114C9.11738 -0.510379 12.4273 -0.510379 14.4688 1.53114C16.5104 3.57265 16.5104 6.88261 14.4688 8.92412L12.6206 10.7724L11.3268 9.4786L13.1751 7.63035C14.5021 6.30336 14.5021 4.1519 13.1751 2.82491C11.8481 1.49792 9.69662 1.49792 8.36963 2.82491L6.52139 4.67316L5.22762 3.37938L5.22762 3.37938ZM4.63057 9.93635L9.80566 4.76125L11.3767 6.33226L6.20158 11.5074L4.63057 9.93635L4.63057 9.93635Z" id="Shape" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/reference_dark.svg b/src/main/resources/icons/reference_dark.svg
index d78ad980b..9138b5473 100644
--- a/src/main/resources/icons/reference_dark.svg
+++ b/src/main/resources/icons/reference_dark.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="reference_dark">
     <g id="Reference-instance">
       <path d="M3.37938 5.22763L4.67316 6.5214L2.82491 8.36965C1.49792 9.69663 1.49792 11.8481 2.82491 13.1751C4.15189 14.5021 6.30336 14.5021 7.63035 13.1751L9.47859 11.3268L10.7724 12.6206L8.92412 14.4689C6.88261 16.5104 3.57265 16.5104 1.53114 14.4689C-0.510379 12.4273 -0.510379 9.11739 1.53114 7.07588L3.37938 5.22763L3.37938 5.22763ZM5.22762 3.37938L7.07586 1.53114C9.11738 -0.510379 12.4273 -0.510379 14.4688 1.53114C16.5104 3.57265 16.5104 6.88261 14.4688 8.92412L12.6206 10.7724L11.3268 9.4786L13.1751 7.63035C14.5021 6.30336 14.5021 4.1519 13.1751 2.82491C11.8481 1.49792 9.69662 1.49792 8.36963 2.82491L6.52139 4.67316L5.22762 3.37938L5.22762 3.37938ZM4.63057 9.93634L9.80566 4.76125L11.3767 6.33226L6.20158 11.5074L4.63057 9.93634L4.63057 9.93634Z" id="Shape" fill="#AFB1B3" fill-rule="evenodd" stroke="none" />
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/repeat-filled.svg b/src/main/resources/icons/repeat-filled.svg
index 6d0a5255a..bf9649b50 100644
--- a/src/main/resources/icons/repeat-filled.svg
+++ b/src/main/resources/icons/repeat-filled.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="repeat-filled">
     <path d="M1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8C15 11.866 11.866 15 8 15C4.13401 15 1 11.866 1 8Z" id="Ellipse" fill="#D3D3D3" fill-rule="evenodd" stroke="none" />
     <g id="repeat">
       <path d="M13.2711 13.5447C11.8546 15.1134 9.81525 16.0491 7.59808 15.9329C4.01981 15.7454 1.18859 12.8814 0.780722 9.28778L3.02468 9.48767C3.49421 11.7708 5.37842 13.5299 7.7194 13.6526C9.29278 13.7351 10.7382 13.0608 11.7312 11.9353L9.21976 9.31049L15.274 9.29616L15.2597 15.623L13.2711 13.5447L13.2711 13.5447ZM2.72671 3.14798C4.14293 1.58375 6.17931 0.651185 8.39295 0.767197C11.9233 0.952214 14.7265 3.74246 15.1926 7.26834L12.9413 7.06779C12.4269 4.85005 10.5709 3.15692 8.27583 3.03664C6.70229 2.95417 5.2567 3.62861 4.26371 4.75434L6.78063 7.38485L0.726366 7.39918L0.740697 1.07234L2.72671 3.14798L2.72671 3.14798Z" id="Shape" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/repeat.svg b/src/main/resources/icons/repeat.svg
index 00df41c6f..3aadd9707 100644
--- a/src/main/resources/icons/repeat.svg
+++ b/src/main/resources/icons/repeat.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="repeat">
     <path d="M13.2711 13.5447C11.8546 15.1134 9.81525 16.0491 7.59808 15.9329C4.01981 15.7454 1.18859 12.8814 0.780722 9.28778L3.02468 9.48767C3.49421 11.7708 5.37842 13.5299 7.7194 13.6526C9.29278 13.7351 10.7382 13.0608 11.7312 11.9353L9.21976 9.31049L15.274 9.29616L15.2597 15.623L13.2711 13.5447L13.2711 13.5447ZM2.72671 3.14798C4.14293 1.58375 6.17931 0.651185 8.39295 0.767197C11.9233 0.952214 14.7265 3.74246 15.1926 7.26834L12.9413 7.06779C12.4269 4.85005 10.5709 3.15692 8.27583 3.03664C6.70229 2.95417 5.2567 3.62861 4.26371 4.75434L6.78063 7.38485L0.726366 7.39918L0.740697 1.07234L2.72671 3.14798L2.72671 3.14798Z" id="Shape" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/repeat_dark.svg b/src/main/resources/icons/repeat_dark.svg
index 01e8334ea..2423df76e 100644
--- a/src/main/resources/icons/repeat_dark.svg
+++ b/src/main/resources/icons/repeat_dark.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="repeat_dark">
     <g id="Repeat-instance">
       <path d="M13.2711 13.5447C11.8546 15.1134 9.81525 16.0491 7.59808 15.9329C4.01981 15.7454 1.18859 12.8814 0.780722 9.28778L3.02468 9.48767C3.49421 11.7708 5.37842 13.5299 7.7194 13.6526C9.29278 13.7351 10.7382 13.0608 11.7312 11.9353L9.21976 9.31049L15.274 9.29616L15.2597 15.623L13.2711 13.5447L13.2711 13.5447ZM2.72671 3.14798C4.14293 1.58375 6.17931 0.651185 8.39295 0.767197C11.9233 0.952214 14.7265 3.74246 15.1926 7.26834L12.9413 7.06779C12.4269 4.85005 10.5709 3.15692 8.27583 3.03664C6.70229 2.95417 5.2567 3.62861 4.26371 4.75434L6.78063 7.38485L0.726366 7.39918L0.740697 1.07234L2.72671 3.14798L2.72671 3.14798Z" id="Shape" fill="#AFB1B3" fill-rule="evenodd" stroke="none" />
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/scheme.svg b/src/main/resources/icons/scheme.svg
index 947f267b9..2cd5689eb 100644
--- a/src/main/resources/icons/scheme.svg
+++ b/src/main/resources/icons/scheme.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="scheme">
     <path d="M1 8C1 4.13401 4.13401 1 8 1C11.866 1 15 4.13401 15 8C15 11.866 11.866 15 8 15C4.13401 15 1 11.866 1 8Z" id="Oval" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/settings-filled.svg b/src/main/resources/icons/settings-filled.svg
index 17a1203b9..e08d6b4e6 100644
--- a/src/main/resources/icons/settings-filled.svg
+++ b/src/main/resources/icons/settings-filled.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="settings-filled">
     <path d="M6.5 4.75C6.5 2.12665 8.62665 0 11.25 0C13.8734 0 16 2.12665 16 4.75C16 7.37335 13.8734 9.5 11.25 9.5C8.62665 9.5 6.5 7.37335 6.5 4.75Z" id="Ellipse" fill="#D3D3D3" fill-rule="evenodd" stroke="none" />
     <g id="settings">
       <path d="M6.92911 6.26074C6.29669 4.51306 6.76075 2.55685 8.11088 1.27916C9.46101 0.00146546 11.4404 -0.354657 13.1514 0.372274L9.7552 3.76614L12.2331 6.24322L15.6282 2.84935C16.3545 4.55963 15.9982 6.53761 14.7207 7.88716C13.4432 9.23672 11.4871 9.70139 9.73884 9.07067L2.80856 15.9962L0 13.1898L6.92911 6.26191L6.92911 6.26074Z" id="Shape" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/settings.svg b/src/main/resources/icons/settings.svg
index 51c421120..224d4dee0 100644
--- a/src/main/resources/icons/settings.svg
+++ b/src/main/resources/icons/settings.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="settings">
     <path d="M6.92911 6.26074C6.29669 4.51306 6.76075 2.55685 8.11088 1.27916C9.46101 0.00146546 11.4404 -0.354657 13.1514 0.372274L9.7552 3.76614L12.2331 6.24322L15.6282 2.84935C16.3545 4.55963 15.9982 6.53761 14.7207 7.88716C13.4432 9.23672 11.4871 9.70139 9.73884 9.07067L2.80856 15.9962L0 13.1898L6.92911 6.26191L6.92911 6.26074Z" id="Shape" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/settings_dark.svg b/src/main/resources/icons/settings_dark.svg
index 6d5e3eba5..1f79d29f5 100644
--- a/src/main/resources/icons/settings_dark.svg
+++ b/src/main/resources/icons/settings_dark.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="settings_dark">
     <g id="Settings-instance">
       <path d="M6.92911 6.26074C6.29669 4.51306 6.76075 2.55685 8.11088 1.27916C9.46101 0.00146546 11.4404 -0.354657 13.1514 0.372274L9.7552 3.76614L12.2331 6.24322L15.6282 2.84935C16.3545 4.55963 15.9982 6.53761 14.7207 7.88716C13.4432 9.23672 11.4871 9.70139 9.73884 9.07067L2.80856 15.9962L0 13.1898L6.92911 6.26191L6.92911 6.26074Z" id="Shape" fill="#AFB1B3" fill-rule="evenodd" stroke="none" />
     </g>
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/main/resources/icons/template.svg b/src/main/resources/icons/template.svg
index d1df06847..59122ddb7 100644
--- a/src/main/resources/icons/template.svg
+++ b/src/main/resources/icons/template.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
   <g id="template">
     <path d="M2.999 1L13.001 1Q13.0992 1 13.1969 1.00963Q13.2947 1.01925 13.391 1.03841Q13.4873 1.05757 13.5813 1.08608Q13.6753 1.11458 13.766 1.15216Q13.8567 1.18975 13.9433 1.23604Q14.0299 1.28233 14.1116 1.33689Q14.1932 1.39145 14.2692 1.45375Q14.3451 1.51605 14.4145 1.58549Q14.4839 1.65493 14.5462 1.73085Q14.6085 1.80676 14.6631 1.88842Q14.7177 1.97007 14.764 2.05668Q14.8103 2.14329 14.8478 2.23402Q14.8854 2.32474 14.9139 2.41872Q14.9424 2.5127 14.9616 2.60901Q14.9807 2.70533 14.9904 2.80306Q15 2.9008 15 2.999L15 13.001Q15 13.0992 14.9904 13.1969Q14.9807 13.2947 14.9616 13.391Q14.9424 13.4873 14.9139 13.5813Q14.8854 13.6753 14.8478 13.766Q14.8103 13.8567 14.764 13.9433Q14.7177 14.0299 14.6631 14.1116Q14.6085 14.1932 14.5462 14.2692Q14.4839 14.3451 14.4145 14.4145Q14.3451 14.4839 14.2692 14.5462Q14.1932 14.6085 14.1116 14.6631Q14.0299 14.7177 13.9433 14.764Q13.8567 14.8103 13.766 14.8478Q13.6753 14.8854 13.5813 14.9139Q13.4873 14.9424 13.391 14.9616Q13.2947 14.9807 13.1969 14.9904Q13.0992 15 13.001 15L2.999 15Q2.9008 15 2.80306 14.9904Q2.70533 14.9807 2.60901 14.9616Q2.5127 14.9424 2.41872 14.9139Q2.32474 14.8854 2.23402 14.8478Q2.14329 14.8103 2.05668 14.764Q1.97007 14.7177 1.88842 14.6631Q1.80676 14.6085 1.73085 14.5462Q1.65493 14.4839 1.58549 14.4145Q1.51605 14.3451 1.45375 14.2692Q1.39145 14.1932 1.33689 14.1116Q1.28233 14.0299 1.23604 13.9433Q1.18975 13.8567 1.15216 13.766Q1.11458 13.6753 1.08608 13.5813Q1.05757 13.4873 1.03841 13.391Q1.01925 13.2947 1.00963 13.1969Q1 13.0992 1 13.001L1 2.999Q1 2.9008 1.00963 2.80306Q1.01925 2.70533 1.03841 2.60901Q1.05757 2.5127 1.08608 2.41872Q1.11458 2.32474 1.15216 2.23402Q1.18975 2.14329 1.23604 2.05668Q1.28233 1.97007 1.33689 1.88842Q1.39145 1.80676 1.45375 1.73085Q1.51605 1.65493 1.58549 1.58549Q1.65493 1.51605 1.73085 1.45375Q1.80676 1.39145 1.88842 1.33689Q1.97007 1.28233 2.05668 1.23604Q2.14329 1.18975 2.23402 1.15216Q2.32474 1.11458 2.41872 1.08608Q2.5127 1.05757 2.60901 1.03841Q2.70533 1.01925 2.80306 1.00963Q2.9008 1 2.999 1L2.999 1Z" id="Rectangle" fill="#6E6E6E" fill-rule="evenodd" stroke="none" />
   </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/test/kotlin/com/fwdekker/randomness/template/TemplateJTreeTest.kt b/src/test/kotlin/com/fwdekker/randomness/template/TemplateJTreeTest.kt
index aa03771a6..bc897ab6b 100644
--- a/src/test/kotlin/com/fwdekker/randomness/template/TemplateJTreeTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/template/TemplateJTreeTest.kt
@@ -943,7 +943,7 @@ object TemplateJTreeTest : FunSpec({
             }
 
             test("resets the selected template's scheme order") {
-                currentList.templates[0].schemes.setAll(currentList.templates[0].schemes.reversed())
+                currentList.templates[0].schemes.setAll(currentList.templates[0].schemes.asReversed().toList())
                 guiRun { tree.reload() }
                 currentList.templates[0].schemes.names() shouldContainExactly listOf("Scheme1", "Scheme0")
 
diff --git a/src/test/kotlin/com/fwdekker/randomness/template/TemplateTest.kt b/src/test/kotlin/com/fwdekker/randomness/template/TemplateTest.kt
index 6fb831656..5b32703ff 100644
--- a/src/test/kotlin/com/fwdekker/randomness/template/TemplateTest.kt
+++ b/src/test/kotlin/com/fwdekker/randomness/template/TemplateTest.kt
@@ -130,7 +130,7 @@ object TemplateTest : FunSpec({
                     .also { it.random = Random(1) }
                     .generateStrings()[0]
 
-                output1.split("-").reversed() shouldContainExactly output2.split("-")
+                output1.split("-").asReversed() shouldContainExactly output2.split("-")
             }
 
             test("sets the rng independent of the rng of other schemes") {