diff --git a/UI/data/themes/Acri/cogwheel@2x.png b/UI/data/themes/Acri/cogwheel_2x.png
similarity index 100%
rename from UI/data/themes/Acri/cogwheel@2x.png
rename to UI/data/themes/Acri/cogwheel_2x.png
diff --git a/UI/data/themes/Dark/cogwheel@2x.png b/UI/data/themes/Dark/cogwheel_2x.png
similarity index 100%
rename from UI/data/themes/Dark/cogwheel@2x.png
rename to UI/data/themes/Dark/cogwheel_2x.png
diff --git a/UI/forms/images/configuration21_16@2x.png b/UI/forms/images/configuration21_16_2x.png
similarity index 100%
rename from UI/forms/images/configuration21_16@2x.png
rename to UI/forms/images/configuration21_16_2x.png
diff --git a/UI/forms/images/invisible_mask@2x.png b/UI/forms/images/invisible_mask_2x.png
similarity index 100%
rename from UI/forms/images/invisible_mask@2x.png
rename to UI/forms/images/invisible_mask_2x.png
diff --git a/UI/forms/images/locked_mask@2x.png b/UI/forms/images/locked_mask_2x.png
similarity index 100%
rename from UI/forms/images/locked_mask@2x.png
rename to UI/forms/images/locked_mask_2x.png
diff --git a/UI/forms/images/properties@2x.png b/UI/forms/images/properties_2x.png
similarity index 100%
rename from UI/forms/images/properties@2x.png
rename to UI/forms/images/properties_2x.png
diff --git a/UI/forms/images/settings/advanced@2x.png b/UI/forms/images/settings/advanced_2x.png
similarity index 100%
rename from UI/forms/images/settings/advanced@2x.png
rename to UI/forms/images/settings/advanced_2x.png
diff --git a/UI/forms/images/settings/applications-system-2@2x.png b/UI/forms/images/settings/applications-system-2_2x.png
similarity index 100%
rename from UI/forms/images/settings/applications-system-2@2x.png
rename to UI/forms/images/settings/applications-system-2_2x.png
diff --git a/UI/forms/images/settings/decibel_audio_player@2x.png b/UI/forms/images/settings/decibel_audio_player_2x.png
similarity index 100%
rename from UI/forms/images/settings/decibel_audio_player@2x.png
rename to UI/forms/images/settings/decibel_audio_player_2x.png
diff --git a/UI/forms/images/settings/network-bluetooth@2x.png b/UI/forms/images/settings/network-bluetooth_2x.png
similarity index 100%
rename from UI/forms/images/settings/network-bluetooth@2x.png
rename to UI/forms/images/settings/network-bluetooth_2x.png
diff --git a/UI/forms/images/settings/network@2x.png b/UI/forms/images/settings/network_2x.png
similarity index 100%
rename from UI/forms/images/settings/network@2x.png
rename to UI/forms/images/settings/network_2x.png
diff --git a/UI/forms/images/settings/preferences-desktop-keyboard-shortcuts@2x.png b/UI/forms/images/settings/preferences-desktop-keyboard-shortcuts_2x.png
similarity index 100%
rename from UI/forms/images/settings/preferences-desktop-keyboard-shortcuts@2x.png
rename to UI/forms/images/settings/preferences-desktop-keyboard-shortcuts_2x.png
diff --git a/UI/forms/images/settings/preferences-system-network-3@2x.png b/UI/forms/images/settings/preferences-system-network-3_2x.png
similarity index 100%
rename from UI/forms/images/settings/preferences-system-network-3@2x.png
rename to UI/forms/images/settings/preferences-system-network-3_2x.png
diff --git a/UI/forms/images/settings/system-settings-3@2x.png b/UI/forms/images/settings/system-settings-3_2x.png
similarity index 100%
rename from UI/forms/images/settings/system-settings-3@2x.png
rename to UI/forms/images/settings/system-settings-3_2x.png
diff --git a/UI/forms/images/settings/video-display-3@2x.png b/UI/forms/images/settings/video-display-3_2x.png
similarity index 100%
rename from UI/forms/images/settings/video-display-3@2x.png
rename to UI/forms/images/settings/video-display-3_2x.png
diff --git a/UI/forms/images/unlocked_mask@2x.png b/UI/forms/images/unlocked_mask_2x.png
similarity index 100%
rename from UI/forms/images/unlocked_mask@2x.png
rename to UI/forms/images/unlocked_mask_2x.png
diff --git a/UI/forms/images/visible_mask@2x.png b/UI/forms/images/visible_mask_2x.png
similarity index 100%
rename from UI/forms/images/visible_mask@2x.png
rename to UI/forms/images/visible_mask_2x.png
diff --git a/UI/forms/obs.qrc b/UI/forms/obs.qrc
index 7ea29c256..8e05612ce 100644
--- a/UI/forms/obs.qrc
+++ b/UI/forms/obs.qrc
@@ -4,44 +4,44 @@
     <file>images/unmute.png</file>
     <file>images/refresh.png</file>
     <file>images/configuration21_16.png</file>
-    <file>images/configuration21_16@2x.png</file>
+    <file>images/configuration21_16_2x.png</file>
     <file>images/invisible_mask.png</file>
-    <file>images/invisible_mask@2x.png</file>
+    <file>images/invisible_mask_2x.png</file>
     <file>images/visible_mask.png</file>
-    <file>images/visible_mask@2x.png</file>
+    <file>images/visible_mask_2x.png</file>
     <file>images/list_remove.png</file>
     <file>images/add.png</file>
     <file>images/down.png</file>
     <file>images/editscene.png</file>
     <file>images/live.png</file>
     <file>images/properties.png</file>
-    <file>images/properties@2x.png</file>
+    <file>images/properties_2x.png</file>
     <file>images/up.png</file>
     <file>images/obs.png</file>
     <file>images/tray_active.png</file>
     <file>images/locked_mask.png</file>
-    <file>images/locked_mask@2x.png</file>
+    <file>images/locked_mask_2x.png</file>
     <file>images/unlocked_mask.png</file>
-    <file>images/unlocked_mask@2x.png</file>
+    <file>images/unlocked_mask_2x.png</file>
     <file>images/collapse.png</file>
     <file>images/expand.png</file>
   </qresource>
   <qresource prefix="/settings">
     <file>images/settings/advanced.png</file>
-    <file>images/settings/advanced@2x.png</file>
+    <file>images/settings/advanced_2x.png</file>
     <file>images/settings/network.png</file>
-    <file>images/settings/network@2x.png</file>
+    <file>images/settings/network_2x.png</file>
     <file>images/settings/video-display-3.png</file>
-    <file>images/settings/video-display-3@2x.png</file>
+    <file>images/settings/video-display-3_2x.png</file>
     <file>images/settings/decibel_audio_player.png</file>
-    <file>images/settings/decibel_audio_player@2x.png</file>
+    <file>images/settings/decibel_audio_player_2x.png</file>
     <file>images/settings/applications-system-2.png</file>
-    <file>images/settings/applications-system-2@2x.png</file>
+    <file>images/settings/applications-system-2_2x.png</file>
     <file>images/settings/system-settings-3.png</file>
-    <file>images/settings/system-settings-3@2x.png</file>
+    <file>images/settings/system-settings-3_2x.png</file>
     <file>images/settings/network-bluetooth.png</file>
-    <file>images/settings/network-bluetooth@2x.png</file>
+    <file>images/settings/network-bluetooth_2x.png</file>
     <file>images/settings/preferences-desktop-keyboard-shortcuts.png</file>
-    <file>images/settings/preferences-desktop-keyboard-shortcuts@2x.png</file>
+    <file>images/settings/preferences-desktop-keyboard-shortcuts_2x.png</file>
   </qresource>
 </RCC>
diff --git a/UI/locked-checkbox.cpp b/UI/locked-checkbox.cpp
index a5f6b5649..2d0d688ed 100644
--- a/UI/locked-checkbox.cpp
+++ b/UI/locked-checkbox.cpp
@@ -10,8 +10,8 @@ LockedCheckBox::LockedCheckBox() : QCheckBox()
 	QString lockedFile;
 	QString unlockedFile;
 	if (devicePixelRatio() >= 2) {
-		lockedFile = ":/res/images/locked_mask@2x.png";
-		unlockedFile = ":/res/images/unlocked_mask@2x.png";
+		lockedFile = ":/res/images/locked_mask_2x.png";
+		unlockedFile = ":/res/images/unlocked_mask_2x.png";
 	} else {
 		lockedFile = ":/res/images/locked_mask.png";
 		unlockedFile = ":/res/images/unlocked_mask.png";
diff --git a/UI/visibility-checkbox.cpp b/UI/visibility-checkbox.cpp
index 004a65c4d..d80cab2d4 100644
--- a/UI/visibility-checkbox.cpp
+++ b/UI/visibility-checkbox.cpp
@@ -10,8 +10,8 @@ VisibilityCheckBox::VisibilityCheckBox() : QCheckBox()
 	QString checkedFile;
 	QString uncheckedFile;
 	if (devicePixelRatio() >= 2) {
-		checkedFile = ":/res/images/visible_mask@2x.png";
-		uncheckedFile = ":/res/images/invisible_mask@2x.png";
+		checkedFile = ":/res/images/visible_mask_2x.png";
+		uncheckedFile = ":/res/images/invisible_mask_2x.png";
 	} else {
 		checkedFile = ":/res/images/visible_mask.png";
 		uncheckedFile = ":/res/images/invisible_mask.png";