diff --git a/data/images/checkboxhid.png b/data/images/checkboxhid.png
index e524a3ca..2ac0b42e 100644
Binary files a/data/images/checkboxhid.png and b/data/images/checkboxhid.png differ
diff --git a/data/images/checkboxreq.png b/data/images/checkboxreq.png
index 08d5e62b..2b14859c 100644
Binary files a/data/images/checkboxreq.png and b/data/images/checkboxreq.png differ
diff --git a/data/images/checkboxs.png b/data/images/checkboxs.png
index cb328b20..97630b6a 100644
Binary files a/data/images/checkboxs.png and b/data/images/checkboxs.png differ
diff --git a/data/images/wait_01.jpg b/data/images/wait_01.jpg
deleted file mode 100644
index de8c7bdc..00000000
Binary files a/data/images/wait_01.jpg and /dev/null differ
diff --git a/data/images/wait_01.png b/data/images/wait_01.png
new file mode 100644
index 00000000..dbf5c0e0
Binary files /dev/null and b/data/images/wait_01.png differ
diff --git a/data/images/wait_02.jpg b/data/images/wait_02.jpg
deleted file mode 100644
index 8f047dc5..00000000
Binary files a/data/images/wait_02.jpg and /dev/null differ
diff --git a/data/images/wait_02.png b/data/images/wait_02.png
new file mode 100644
index 00000000..25f466fd
Binary files /dev/null and b/data/images/wait_02.png differ
diff --git a/data/images/wait_03.jpg b/data/images/wait_03.jpg
deleted file mode 100644
index 33aa7ead..00000000
Binary files a/data/images/wait_03.jpg and /dev/null differ
diff --git a/data/images/wait_03.png b/data/images/wait_03.png
new file mode 100644
index 00000000..952e231e
Binary files /dev/null and b/data/images/wait_03.png differ
diff --git a/data/images/wait_04.jpg b/data/images/wait_04.jpg
deleted file mode 100644
index 60ad4a54..00000000
Binary files a/data/images/wait_04.jpg and /dev/null differ
diff --git a/data/images/wait_04.png b/data/images/wait_04.png
new file mode 100644
index 00000000..f2be7d8c
Binary files /dev/null and b/data/images/wait_04.png differ
diff --git a/data/images/wait_05.jpg b/data/images/wait_05.jpg
deleted file mode 100644
index 4fb9b7b4..00000000
Binary files a/data/images/wait_05.jpg and /dev/null differ
diff --git a/data/images/wait_05.png b/data/images/wait_05.png
new file mode 100644
index 00000000..d1e6c66c
Binary files /dev/null and b/data/images/wait_05.png differ
diff --git a/data/images/wait_06.jpg b/data/images/wait_06.jpg
deleted file mode 100644
index 489a8dd4..00000000
Binary files a/data/images/wait_06.jpg and /dev/null differ
diff --git a/data/images/wait_06.png b/data/images/wait_06.png
new file mode 100644
index 00000000..6bbacc25
Binary files /dev/null and b/data/images/wait_06.png differ
diff --git a/data/images/wait_07.jpg b/data/images/wait_07.jpg
deleted file mode 100644
index d5a70d8d..00000000
Binary files a/data/images/wait_07.jpg and /dev/null differ
diff --git a/data/images/wait_07.png b/data/images/wait_07.png
new file mode 100644
index 00000000..1cdd030d
Binary files /dev/null and b/data/images/wait_07.png differ
diff --git a/data/images/wait_08.jpg b/data/images/wait_08.jpg
deleted file mode 100644
index 34479b81..00000000
Binary files a/data/images/wait_08.jpg and /dev/null differ
diff --git a/data/images/wait_08.png b/data/images/wait_08.png
new file mode 100644
index 00000000..05fe20e5
Binary files /dev/null and b/data/images/wait_08.png differ
diff --git a/data/images/wait_09.png b/data/images/wait_09.png
new file mode 100644
index 00000000..6167cabf
Binary files /dev/null and b/data/images/wait_09.png differ
diff --git a/data/images/wait_10.png b/data/images/wait_10.png
new file mode 100644
index 00000000..e1caf5e0
Binary files /dev/null and b/data/images/wait_10.png differ
diff --git a/resources/optipng.exe b/resources/optipng.exe
index 85c4649d..9b0c9e05 100644
Binary files a/resources/optipng.exe and b/resources/optipng.exe differ
diff --git a/resources/theme_pngs/wait_01.png b/resources/theme_pngs/wait_01.png
deleted file mode 100644
index d6e061c2..00000000
Binary files a/resources/theme_pngs/wait_01.png and /dev/null differ
diff --git a/resources/theme_pngs/wait_02.png b/resources/theme_pngs/wait_02.png
deleted file mode 100644
index f5eb6804..00000000
Binary files a/resources/theme_pngs/wait_02.png and /dev/null differ
diff --git a/resources/theme_pngs/wait_03.png b/resources/theme_pngs/wait_03.png
deleted file mode 100644
index 7741daff..00000000
Binary files a/resources/theme_pngs/wait_03.png and /dev/null differ
diff --git a/resources/theme_pngs/wait_04.png b/resources/theme_pngs/wait_04.png
deleted file mode 100644
index ddf7a518..00000000
Binary files a/resources/theme_pngs/wait_04.png and /dev/null differ
diff --git a/resources/theme_pngs/wait_05.png b/resources/theme_pngs/wait_05.png
deleted file mode 100644
index 7672c150..00000000
Binary files a/resources/theme_pngs/wait_05.png and /dev/null differ
diff --git a/resources/theme_pngs/wait_06.png b/resources/theme_pngs/wait_06.png
deleted file mode 100644
index 9611a4cb..00000000
Binary files a/resources/theme_pngs/wait_06.png and /dev/null differ
diff --git a/resources/theme_pngs/wait_07.png b/resources/theme_pngs/wait_07.png
deleted file mode 100644
index 560deddb..00000000
Binary files a/resources/theme_pngs/wait_07.png and /dev/null differ
diff --git a/resources/theme_pngs/wait_08.png b/resources/theme_pngs/wait_08.png
deleted file mode 100644
index cb1d734f..00000000
Binary files a/resources/theme_pngs/wait_08.png and /dev/null differ
diff --git a/source/gui/video.cpp b/source/gui/video.cpp
index b817d5a2..59d44b12 100644
--- a/source/gui/video.cpp
+++ b/source/gui/video.cpp
@@ -11,22 +11,16 @@
 
 #define DEFAULT_FIFO_SIZE	(256 * 1024)
 
-extern const u8 wait_01_jpg[];
-extern const u32 wait_01_jpg_size;
-extern const u8 wait_02_jpg[];
-extern const u32 wait_02_jpg_size;
-extern const u8 wait_03_jpg[];
-extern const u32 wait_03_jpg_size;
-extern const u8 wait_04_jpg[];
-extern const u32 wait_04_jpg_size;
-extern const u8 wait_05_jpg[];
-extern const u32 wait_05_jpg_size;
-extern const u8 wait_06_jpg[];
-extern const u32 wait_06_jpg_size;
-extern const u8 wait_07_jpg[];
-extern const u32 wait_07_jpg_size;
-extern const u8 wait_08_jpg[];
-extern const u32 wait_08_jpg_size;
+extern const u8 wait_01_png[];
+extern const u8 wait_02_png[];
+extern const u8 wait_03_png[];
+extern const u8 wait_04_png[];
+extern const u8 wait_05_png[];
+extern const u8 wait_06_png[];
+extern const u8 wait_07_png[];
+extern const u8 wait_08_png[];
+extern const u8 wait_09_png[];
+extern const u8 wait_10_png[];
 
 vector<TexData> m_defaultWaitMessages;
 
@@ -571,16 +565,18 @@ void CVideo::waitMessage(float delay)
 {
 	if(m_defaultWaitMessages.size() == 0)
 	{
-		TexData m_wTextures[8];
-		TexHandle.fromJPG(m_wTextures[0], wait_01_jpg, wait_01_jpg_size);
-		TexHandle.fromJPG(m_wTextures[1], wait_02_jpg, wait_02_jpg_size);
-		TexHandle.fromJPG(m_wTextures[2], wait_03_jpg, wait_03_jpg_size);
-		TexHandle.fromJPG(m_wTextures[3], wait_04_jpg, wait_04_jpg_size);
-		TexHandle.fromJPG(m_wTextures[4], wait_05_jpg, wait_05_jpg_size);
-		TexHandle.fromJPG(m_wTextures[5], wait_06_jpg, wait_06_jpg_size);
-		TexHandle.fromJPG(m_wTextures[6], wait_07_jpg, wait_07_jpg_size);
-		TexHandle.fromJPG(m_wTextures[7], wait_08_jpg, wait_08_jpg_size);
-		for(int i = 0; i < 8; i++)
+		TexData m_wTextures[10];
+		TexHandle.fromPNG(m_wTextures[0], wait_01_png);
+		TexHandle.fromPNG(m_wTextures[1], wait_02_png);
+		TexHandle.fromPNG(m_wTextures[2], wait_03_png);
+		TexHandle.fromPNG(m_wTextures[3], wait_04_png);
+		TexHandle.fromPNG(m_wTextures[4], wait_05_png);
+		TexHandle.fromPNG(m_wTextures[5], wait_06_png);
+		TexHandle.fromPNG(m_wTextures[6], wait_07_png);
+		TexHandle.fromPNG(m_wTextures[7], wait_08_png);
+		TexHandle.fromPNG(m_wTextures[8], wait_09_png);
+		TexHandle.fromPNG(m_wTextures[9], wait_10_png);
+		for(int i = 0; i < 10; i++)
 			m_defaultWaitMessages.push_back(m_wTextures[i]);
 	}
 	waitMessage(vector<TexData>(), delay);
@@ -592,7 +588,7 @@ void CVideo::waitMessage(const vector<TexData> &tex, float delay)
 	if(tex.size() == 0)
 	{
 		m_waitMessages = m_defaultWaitMessages;
-		m_waitMessageDelay = 0.15f;
+		m_waitMessageDelay = 0.12f;
 	}
 	else
 	{