diff --git a/media/baseset/orig_extra.grf b/media/baseset/orig_extra.grf
index 728a8b2555..881c4631ce 100644
Binary files a/media/baseset/orig_extra.grf and b/media/baseset/orig_extra.grf differ
diff --git a/media/baseset/orig_extra/fix_gui_icons.nfo b/media/baseset/orig_extra/fix_gui_icons.nfo
new file mode 100644
index 0000000000..2fdb8880bd
--- /dev/null
+++ b/media/baseset/orig_extra/fix_gui_icons.nfo
@@ -0,0 +1,12 @@
+// This file is part of OpenTTD.
+// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+//
+   -1 * 0	 0C "Fix alignment of button icons."
+
+// Fix alignment of button icons.
+   -1 * 11	 0A 03 01 DC 02 01 E2 02 01 E6 02
+   -1 sprites/fix_gui_icons.png 8bpp   8  13  20  20  0  0 normal nocrop
+   -1 sprites/fix_gui_icons.png 8bpp  40  13  20  20  0  0 normal nocrop
+   -1 sprites/fix_gui_icons.png 8bpp  72  13  20  20  0  0 normal nocrop
diff --git a/media/baseset/orig_extra/fix_gui_icons.png b/media/baseset/orig_extra/fix_gui_icons.png
new file mode 100644
index 0000000000..0630179616
Binary files /dev/null and b/media/baseset/orig_extra/fix_gui_icons.png differ
diff --git a/media/baseset/orig_extra/orig_extra.nfo b/media/baseset/orig_extra/orig_extra.nfo
index 903d96a572..e6ecca8a00 100644
--- a/media/baseset/orig_extra/orig_extra.nfo
+++ b/media/baseset/orig_extra/orig_extra.nfo
@@ -83,3 +83,4 @@
 #include "rivers/arctic.nfo"
 #include "rivers/tropic.nfo"
 #include "rivers/toyland.nfo"
+#include "fix_gui_icons.nfo"