diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5772889..70bcd7cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -199,8 +199,8 @@ set(RESOURCES
 	"BITMAP/Credit16.bmp"
 	"BITMAP/Credit17.bmp"
 	"BITMAP/Credit18.bmp"
-	"CURSOR/CURSOR_IKA.bmp"
-	"CURSOR/CURSOR_NORMAL.bmp"
+	"CURSOR/CURSOR_IKA.png"
+	"CURSOR/CURSOR_NORMAL.png"
 	"ORG/Access.org"
 	"ORG/Anzen.org"
 	"ORG/Balcony.org"
@@ -442,7 +442,7 @@ endif()
 
 # On Windows, we use native icons instead
 if(NOT WIN32)
-	list(APPEND RESOURCES "ICON/ICON_MINI.bmp")
+	list(APPEND RESOURCES "ICON/ICON_MINI.png")
 endif()
 
 
diff --git a/assets/resources/CURSOR/CURSOR_IKA.bmp b/assets/resources/CURSOR/CURSOR_IKA.bmp
deleted file mode 100644
index 6c14d1a2..00000000
Binary files a/assets/resources/CURSOR/CURSOR_IKA.bmp and /dev/null differ
diff --git a/assets/resources/CURSOR/CURSOR_IKA.png b/assets/resources/CURSOR/CURSOR_IKA.png
new file mode 100644
index 00000000..0e559544
Binary files /dev/null and b/assets/resources/CURSOR/CURSOR_IKA.png differ
diff --git a/assets/resources/CURSOR/CURSOR_NORMAL.bmp b/assets/resources/CURSOR/CURSOR_NORMAL.bmp
deleted file mode 100644
index 702deaf0..00000000
Binary files a/assets/resources/CURSOR/CURSOR_NORMAL.bmp and /dev/null differ
diff --git a/assets/resources/CURSOR/CURSOR_NORMAL.png b/assets/resources/CURSOR/CURSOR_NORMAL.png
new file mode 100644
index 00000000..600fb001
Binary files /dev/null and b/assets/resources/CURSOR/CURSOR_NORMAL.png differ
diff --git a/assets/resources/ICON/ICON_MINI.bmp b/assets/resources/ICON/ICON_MINI.bmp
deleted file mode 100644
index fe259a41..00000000
Binary files a/assets/resources/ICON/ICON_MINI.bmp and /dev/null differ
diff --git a/assets/resources/ICON/ICON_MINI.png b/assets/resources/ICON/ICON_MINI.png
new file mode 100644
index 00000000..7bb9f9a0
Binary files /dev/null and b/assets/resources/ICON/ICON_MINI.png differ
diff --git a/src/Resource.cpp b/src/Resource.cpp
index 68ef4d48..794c437c 100644
--- a/src/Resource.cpp
+++ b/src/Resource.cpp
@@ -80,16 +80,16 @@ static const unsigned char rpixel[] = {
 };
 
 static const unsigned char rCURSOR_IKA[] = {
-	#include "Resource/CURSOR/CURSOR_IKA.bmp.h"
+	#include "Resource/CURSOR/CURSOR_IKA.png.h"
 };
 
 static const unsigned char rCURSOR_NORMAL[] = {
-	#include "Resource/CURSOR/CURSOR_NORMAL.bmp.h"
+	#include "Resource/CURSOR/CURSOR_NORMAL.png.h"
 };
 
 #ifndef _WIN32
 static const unsigned char rICON_MINI[] = {
-	#include "Resource/ICON/ICON_MINI.bmp.h"
+	#include "Resource/ICON/ICON_MINI.png.h"
 };
 #endif