diff --git a/regression/030_house.nml b/regression/030_house.nml
index ea65250d..b5d1fb9b 100644
--- a/regression/030_house.nml
+++ b/regression/030_house.nml
@@ -36,9 +36,6 @@ spriteset(brewery_spriteset_ground) {
     tmpl_ground_tile( 10, 10, "groundtiles.png") //bare
     tmpl_ground_tile(150, 10, "groundtiles.png") //stones
     tmpl_ground_tile(220, 10, "groundtiles.png") //snowed
-    [] /* pad with empty sprites, as all spritesets have to have the same no. of sprites (=6) */
-    []
-    []
 }
 
 spriteset(brewery_spriteset_building) {
diff --git a/regression/expected/030_house.grf b/regression/expected/030_house.grf
index 85e0bf88..4567b02b 100644
Binary files a/regression/expected/030_house.grf and b/regression/expected/030_house.grf differ
diff --git a/regression/expected/030_house.nfo b/regression/expected/030_house.nfo
index 0f89e0b7..7ea103cd 100644
--- a/regression/expected/030_house.nfo
+++ b/regression/expected/030_house.nfo
@@ -5,7 +5,7 @@
 // Escapes: D= = DR D+ = DF D- = DC Du* = DM D* = DnF Du<< = DnC D<< = DO D& D| Du/ D/ Du% D%
 // Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags
 
-0 * 4 \d59
+0 * 4 \d57
 
 1 * 54 14 "C" "INFO"
 "B" "VRSN" \w4 \dx00000000
@@ -21,32 +21,31 @@
 4 * 24 00 08 \b1 04 FF \wx0000
 09 "PASS" "MAIL" "GRAI" "WHEA"
 
-5 * 6 01 07 \b2 FF \wx0006
+5 * 6 01 07 \b1 FF \wx0003
 
 6 groundtiles.png 8bpp 10 10 64 31 -31 0 normal
 7 groundtiles.png 8bpp 150 10 64 31 -31 0 normal
 8 groundtiles.png 8bpp 220 10 64 31 -31 0 normal
-9 * 1 00
-10 * 1 00
-11 * 1 00
 
-12 brewery.png 8bpp 10 60 64 91 -31 -60 normal nocrop
-13 brewery.png 8bpp 80 60 64 91 -31 -60 normal nocrop
-14 brewery.png 8bpp 150 60 64 91 -31 -60 normal nocrop
-15 brewery_snow.png 8bpp 10 60 64 91 -31 -60 normal nocrop
-16 brewery_snow.png 8bpp 80 60 64 91 -31 -60 normal nocrop
-17 brewery_snow.png 8bpp 150 60 64 91 -31 -60 normal nocrop
+9 * 12 01 07 00 FF \wx0001 FF \wx0001 FF \wx0006
+
+10 brewery.png 8bpp 10 60 64 91 -31 -60 normal nocrop
+11 brewery.png 8bpp 80 60 64 91 -31 -60 normal nocrop
+12 brewery.png 8bpp 150 60 64 91 -31 -60 normal nocrop
+13 brewery_snow.png 8bpp 10 60 64 91 -31 -60 normal nocrop
+14 brewery_snow.png 8bpp 80 60 64 91 -31 -60 normal nocrop
+15 brewery_snow.png 8bpp 150 60 64 91 -31 -60 normal nocrop
 
 // Name: brewery_sprite_layout - feature 07
 // building_sprite : register 8B
 // with_smoke : register 8C
-18 * 49 02 07 FF \b67 \dx00000F8D \wx0000
+16 * 49 02 07 FF \b67 \dx00000F8D \wx0000
 \dxC0000000 \wx0002 \b0 \b0 80 83
 \dx80008001 \wx0003 \b0 \b0 \b0 \b16 \b16 \b48 86 84
 \dx00000000 \wx0023 \b8 \b0 \b0 \b11 \b16 \b7 8A 87 88
 
 // Name: brewery_sprite_layout@registers - feature 07
-19 * 362 02 07 FF 89
+17 * 362 02 07 FF 89
 43 20 \dx000000FF
 \2cmp 1A 20 \dx00000004
 \2& 1A 20 \dx00000001
@@ -98,7 +97,7 @@
 \wx00FF //
 
 // Name: @return_action_0
-20 * 44 02 07 FE 89
+18 * 44 02 07 FE 89
 1A 20 \dx00000002
 \2sto 1A 20 \dx0000008B
 \2r 1A 20 \dx00000000
@@ -108,7 +107,7 @@
 \wx00FF // brewery_sprite_layout
 
 // Name: @return_action_1
-21 * 44 02 07 FD 89
+19 * 44 02 07 FD 89
 1A 20 \dx00000001
 \2sto 1A 20 \dx0000008B
 \2r 1A 20 \dx00000000
@@ -118,7 +117,7 @@
 \wx00FF // brewery_sprite_layout
 
 // Name: @return_action_2
-22 * 44 02 07 FC 89
+20 * 44 02 07 FC 89
 1A 20 \dxFFFFFFFF
 \2sto 1A 20 \dx0000008B
 \2r 1A 20 \dx00000000
@@ -128,7 +127,7 @@
 \wx00FF // brewery_sprite_layout
 
 // Name: @return_action_3
-23 * 44 02 07 FB 89
+21 * 44 02 07 FB 89
 1A 20 \dx00000000
 \2sto 1A 20 \dx0000008B
 \2r 1A 20 \dx00000001
@@ -138,7 +137,7 @@
 \wx00FF // brewery_sprite_layout
 
 // Name: brewery_layout_1
-24 * 44 02 07 FB 89
+22 * 44 02 07 FB 89
 7D FF 10 \dx000000FF
 \b3
 \wx00FE \dx00000000 \dx00000000 	// 0 .. 0: @return_action_0;
@@ -147,7 +146,7 @@
 \wx00FB // default: @return_action_3;
 
 // Name: @return_action_0
-25 * 44 02 07 FC 89
+23 * 44 02 07 FC 89
 1A 20 \dxFFFFFFFF
 \2sto 1A 20 \dx0000008B
 \2r 1A 20 \dx00000000
@@ -157,7 +156,7 @@
 \wx00FF // brewery_sprite_layout
 
 // Name: @return_action_1
-26 * 44 02 07 FD 89
+24 * 44 02 07 FD 89
 1A 20 \dx00000000
 \2sto 1A 20 \dx0000008B
 \2r 1A 20 \dx00000001
@@ -167,7 +166,7 @@
 \wx00FF // brewery_sprite_layout
 
 // Name: @return_action_2
-27 * 44 02 07 FE 89
+25 * 44 02 07 FE 89
 1A 20 \dx00000002
 \2sto 1A 20 \dx0000008B
 \2r 1A 20 \dx00000000
@@ -177,7 +176,7 @@
 \wx00FF // brewery_sprite_layout
 
 // Name: @return_action_3
-28 * 44 02 07 FF 89
+26 * 44 02 07 FF 89
 1A 20 \dx00000001
 \2sto 1A 20 \dx0000008B
 \2r 1A 20 \dx00000000
@@ -187,7 +186,7 @@
 \wx00FF // brewery_sprite_layout
 
 // Name: brewery_layout_2
-29 * 44 02 07 FF 89
+27 * 44 02 07 FF 89
 7D FF 10 \dx000000FF
 \b3
 \wx00FC \dx00000000 \dx00000000 	// 0 .. 0: @return_action_0;
@@ -196,21 +195,21 @@
 \wx00FF // default: @return_action_3;
 
 // Name: brewery_choose_layout
-30 * 23 02 07 FF 89
+28 * 23 02 07 FF 89
 5F 08 \dx00000001
 \b1
 \wx00FB \dx00000000 \dx00000000 	// 0 .. 0: brewery_layout_1;
 \wx00FF // default: brewery_layout_2;
 
 // Name: brewery_next_frame
-31 * 23 02 07 FB 89
+29 * 23 02 07 FB 89
 46 00 \dx000000FF
 \b1
 \wx80FF \dx00000000 \dx00000000 	// 0 .. 0: return 255;
 \wx80FE // default: return 254;
 
 // Name: @return_action_0
-32 * 41 02 07 FE 89
+30 * 41 02 07 FE 89
 46 20 \dx000000FF
 \2cmp 1A 20 \dx00000000
 \2& 1A 20 \dx00000001
@@ -220,7 +219,7 @@
 \wx8000 // Return computed value
 
 // Name: brewery_cargo_accepted
-33 * 59 02 07 FE 89
+31 * 59 02 07 FE 89
 5F 28 \dx00000001
 \2u< 1A 20 \dx00000001
 \2* 1A 20 \dxFFFFFFFF 	// expr1 - expr2
@@ -232,34 +231,34 @@
 \wx80FD // default: return 253;
 
 // Name: brewery_check_location
-34 * 23 02 07 FD 89
+32 * 23 02 07 FD 89
 44 00 \dx000000FF
 \b1
 \wx8001 \dx00000000 \dx00000000 	// 0 .. 0: return 1;
 \wx8000 // default: return 0;
 
 // param[126] = 0
-35 * 9 0D 7E \D= FF 00 \dx00000000
+33 * 9 0D 7E \D= FF 00 \dx00000000
 
-36 * 9 09 00 04 \7c \dx49415247 01
+34 * 9 09 00 04 \7c \dx49415247 01
 
 // param[126] = 1
-37 * 9 0D 7E \D= FF 00 \dx00000001
+35 * 9 0D 7E \D= FF 00 \dx00000001
 
 // param[125] = 0
-38 * 9 0D 7D \D= FF 00 \dx00000000
+36 * 9 0D 7D \D= FF 00 \dx00000000
 
-39 * 9 09 00 04 \7c \dx41454857 01
+37 * 9 09 00 04 \7c \dx41454857 01
 
 // param[125] = 1
-40 * 9 0D 7D \D= FF 00 \dx00000001
+38 * 9 0D 7D \D= FF 00 \dx00000001
 
 // param[127] = (param[126] | param[125])
-41 * 5 0D 7F \D| 7E 7D
+39 * 5 0D 7F \D| 7E 7D
 
-42 * 9 07 7F 04 \7= \dx00000000 02
+40 * 9 07 7F 04 \7= \dx00000000 02
 
-43 * 183 00 07 \b20 04 FF \wx0000
+41 * 183 00 07 \b20 04 FF \wx0000
 08 28 29 2A 2B
 12 \wxDC00 \wxDC00 \wxDC00 \wxDC00
 09 30 20 20 20
@@ -295,11 +294,11 @@
 \b2
 02 03
 
-44 * 9 00 07 \b1 01 FF \wx0000
+42 * 9 00 07 \b1 01 FF \wx0000
 14 03
 
 // Name: @action3_0
-45 * 57 02 07 FD 89
+43 * 57 02 07 FD 89
 1A 20 \dx00000000
 \2sto 1A 20 \dx000000FF
 \2r 0C 00 \dx0000FFFF
@@ -309,16 +308,16 @@
 \wx00FE \dx00000148 \dx00000148 	// brewery_cargo_accepted;
 \wx00FF // brewery_choose_layout;
 
-46 * 9 07 7F 04 \7= \dx00000000 02
+44 * 9 07 7F 04 \7= \dx00000000 02
 
-47 * 7 03 07 01 00 \b0
+45 * 7 03 07 01 00 \b0
 \wx00FD 	// @action3_0;
 
-48 * 9 00 07 \b1 01 FF \wx0001
+46 * 9 00 07 \b1 01 FF \wx0001
 14 02
 
 // Name: @action3_1
-49 * 47 02 07 FD 89
+47 * 47 02 07 FD 89
 1A 20 \dx00010100
 \2sto 1A 20 \dx000000FF
 \2r 0C 00 \dx0000FFFF
@@ -327,16 +326,16 @@
 \wx00FE \dx00000148 \dx00000148 	// brewery_cargo_accepted;
 \wx00FF // brewery_choose_layout;
 
-50 * 9 07 7F 04 \7= \dx00000000 02
+48 * 9 07 7F 04 \7= \dx00000000 02
 
-51 * 7 03 07 01 01 \b0
+49 * 7 03 07 01 01 \b0
 \wx00FD 	// @action3_1;
 
-52 * 9 00 07 \b1 01 FF \wx0002
+50 * 9 00 07 \b1 01 FF \wx0002
 14 02
 
 // Name: @action3_2
-53 * 47 02 07 FD 89
+51 * 47 02 07 FD 89
 1A 20 \dx00020001
 \2sto 1A 20 \dx000000FF
 \2r 0C 00 \dx0000FFFF
@@ -345,16 +344,16 @@
 \wx00FE \dx00000148 \dx00000148 	// brewery_cargo_accepted;
 \wx00FF // brewery_choose_layout;
 
-54 * 9 07 7F 04 \7= \dx00000000 02
+52 * 9 07 7F 04 \7= \dx00000000 02
 
-55 * 7 03 07 01 02 \b0
+53 * 7 03 07 01 02 \b0
 \wx00FD 	// @action3_2;
 
-56 * 9 00 07 \b1 01 FF \wx0003
+54 * 9 00 07 \b1 01 FF \wx0003
 14 02
 
 // Name: @action3_3
-57 * 47 02 07 FF 89
+55 * 47 02 07 FF 89
 1A 20 \dx00030101
 \2sto 1A 20 \dx000000FF
 \2r 0C 00 \dx0000FFFF
@@ -363,8 +362,8 @@
 \wx00FE \dx00000148 \dx00000148 	// brewery_cargo_accepted;
 \wx00FF // brewery_choose_layout;
 
-58 * 9 07 7F 04 \7= \dx00000000 01
+56 * 9 07 7F 04 \7= \dx00000000 01
 
-59 * 7 03 07 01 03 \b0
+57 * 7 03 07 01 03 \b0
 \wx00FF 	// @action3_3;