diff --git a/data/gui_buttons.png b/data/gui_buttons.png
index ea9a701d3e..dc2b31b254 100644
Binary files a/data/gui_buttons.png and b/data/gui_buttons.png differ
diff --git a/data/gui_icons.png b/data/gui_icons.png
index 61f338412b..7027443cb2 100644
Binary files a/data/gui_icons.png and b/data/gui_icons.png differ
diff --git a/datasrc/content.py b/datasrc/content.py
index 31f5092fec..1f16e3170b 100644
--- a/datasrc/content.py
+++ b/datasrc/content.py
@@ -257,7 +257,7 @@ def FileList(format, num):
 set_emoticons = SpriteSet("emoticons", image_emoticons, 4, 4)
 set_demobuttons = SpriteSet("demobuttons", image_demobuttons, 5, 1)
 set_fileicons = SpriteSet("fileicons", image_fileicons, 8, 1)
-set_guibuttons = SpriteSet("guibuttons", image_guibuttons, 6, 2)
+set_guibuttons = SpriteSet("guibuttons", image_guibuttons, 12, 4)
 set_guiicons = SpriteSet("guiicons", image_guiicons, 8, 2)
 
 container.spritesets.Add(set_particles)
@@ -391,9 +391,9 @@ def FileList(format, num):
 container.sprites.Add(Sprite("file_map1", set_fileicons, 5,0,1,1))
 container.sprites.Add(Sprite("file_map2", set_fileicons, 6,0,1,1))
 
-container.sprites.Add(Sprite("guibutton_off", set_guibuttons, 0,0,2,2))
-container.sprites.Add(Sprite("guibutton_on", set_guibuttons, 2,0,2,2))
-container.sprites.Add(Sprite("guibutton_hover", set_guibuttons, 4,0,2,2))
+container.sprites.Add(Sprite("guibutton_off", set_guibuttons, 0,0,4,4))
+container.sprites.Add(Sprite("guibutton_on", set_guibuttons, 4,0,4,4))
+container.sprites.Add(Sprite("guibutton_hover", set_guibuttons, 8,0,4,4))
 
 container.sprites.Add(Sprite("guiicon_mute", set_guiicons, 0,0,4,2))
 container.sprites.Add(Sprite("guiicon_friend", set_guiicons, 4,0,4,2))