diff --git a/share/grafx2/scripts/samples_2.4/picture/Tiler.lua b/share/grafx2/scripts/samples_2.4/picture/Tiler.lua
index 4119809c..760dd42e 100644
--- a/share/grafx2/scripts/samples_2.4/picture/Tiler.lua
+++ b/share/grafx2/scripts/samples_2.4/picture/Tiler.lua
@@ -14,8 +14,8 @@
 
 -- Grid size
 -- TODO : get it from GrafX2
-xgrid = 17;
-ygrid = 17;
+xgrid = 16;
+ygrid = 16;
 
 -- picture size
 w, h = getpicturesize();
diff --git a/share/grafx2/skins/skin_Aurora.png b/share/grafx2/skins/skin_Aurora.png
index e86663f3..6bb53798 100644
Binary files a/share/grafx2/skins/skin_Aurora.png and b/share/grafx2/skins/skin_Aurora.png differ
diff --git a/share/grafx2/skins/skin_Clax2.gif b/share/grafx2/skins/skin_Clax2.gif
index 6247deca..3361d541 100644
Binary files a/share/grafx2/skins/skin_Clax2.gif and b/share/grafx2/skins/skin_Clax2.gif differ
diff --git a/share/grafx2/skins/skin_Clax3.gif b/share/grafx2/skins/skin_Clax3.gif
index 3e7d2f5b..774405b9 100644
Binary files a/share/grafx2/skins/skin_Clax3.gif and b/share/grafx2/skins/skin_Clax3.gif differ
diff --git a/share/grafx2/skins/skin_Clax4.gif b/share/grafx2/skins/skin_Clax4.gif
index abe75a31..9f3a574f 100644
Binary files a/share/grafx2/skins/skin_Clax4.gif and b/share/grafx2/skins/skin_Clax4.gif differ
diff --git a/share/grafx2/skins/skin_DPaint.png b/share/grafx2/skins/skin_DPaint.png
index eae8e114..63fe8f3e 100644
Binary files a/share/grafx2/skins/skin_DPaint.png and b/share/grafx2/skins/skin_DPaint.png differ
diff --git a/share/grafx2/skins/skin_classic.png b/share/grafx2/skins/skin_classic.png
index 2241f990..188898ac 100644
Binary files a/share/grafx2/skins/skin_classic.png and b/share/grafx2/skins/skin_classic.png differ
diff --git a/share/grafx2/skins/skin_modern.png b/share/grafx2/skins/skin_modern.png
index b062284d..a722e69a 100644
Binary files a/share/grafx2/skins/skin_modern.png and b/share/grafx2/skins/skin_modern.png differ
diff --git a/share/grafx2/skins/skin_scenish.png b/share/grafx2/skins/skin_scenish.png
index eb7a574a..4fa79f7d 100644
Binary files a/share/grafx2/skins/skin_scenish.png and b/share/grafx2/skins/skin_scenish.png differ
diff --git a/src/buttons.c b/src/buttons.c
index 2ac97018..e726a0b4 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -4454,7 +4454,7 @@ void Button_Adjust(void)
 
 // -- Menu des effets (Shade, Stencil, etc...) ------------------------------
 
-void Display_effect_sprite(short sprite_number, short start_x, short start_y)
+void Display_effect_sprite(int sprite_number, short start_x, short start_y)
 {
   short x,y,x_pos,y_pos;
 
@@ -4528,16 +4528,17 @@ void Button_Effects(void)
   Window_set_normal_button(177, 19, 16,16,"",0,1,Config_Key[SPECIAL_FORMAT_CHECKER_MENU][0]); // 14
 
   Display_feedback_state();
-  Display_effect_sprite(0,  8,20);
-  Display_effect_sprite(0,  8,39);
-  Display_effect_sprite(1,  8,58);
-  Display_effect_sprite(2,  8,77);
-  Display_effect_sprite(8,  8,96);
-  Display_effect_sprite(4,C2+1,20);
-  Display_effect_sprite(7,C2+1,39);
-  Display_effect_sprite(5,C2+1,58);
-  Display_effect_sprite(6,C2+1,77);
-  Display_effect_sprite(3,C2+1,96);
+  Display_effect_sprite(EFFECTS_SPRITE_SHADE,   8,20);
+  Display_effect_sprite(EFFECTS_SPRITE_SHADE,   8,39);
+  Display_effect_sprite(EFFECTS_SPRITE_TRANSP,  8,58);
+  Display_effect_sprite(EFFECTS_SPRITE_SMOOTH,  8,77);
+  Display_effect_sprite(EFFECTS_SPRITE_SMEAR,   8,96);
+  Display_effect_sprite(EFFECTS_SPRITE_STENCIL,C2+1,20);
+  Display_effect_sprite(EFFECTS_SPRITE_MASK,   C2+1,39);
+  Display_effect_sprite(EFFECTS_SPRITE_SIEVE,  C2+1,58);
+  Display_effect_sprite(EFFECTS_SPRITE_GRID,   C2+1,77);
+  Display_effect_sprite(EFFECTS_SPRITE_TILING, C2+1,96);
+  Display_effect_sprite(EFFECTS_SPRITE_8BIT,  177+1,20);
   Display_effect_states();
 
   Print_in_window(12,117,"click: Left:Switch / Right:Edit",MC_Dark,MC_Light);
diff --git a/src/const.h b/src/const.h
index 58e11b99..600efc8a 100644
--- a/src/const.h
+++ b/src/const.h
@@ -43,7 +43,6 @@
 #define NB_CURSOR_SPRITES         8     ///< Number of available mouse cursor sprites.
 #define CURSOR_SPRITE_WIDTH       15    ///< Width of a mouse cursor sprite.
 #define CURSOR_SPRITE_HEIGHT      15    ///< Height of a mouse cursor sprite.
-#define NB_EFFECTS_SPRITES        9     ///< Number of effect sprites.
 #define MENU_SPRITE_WIDTH         16    ///< Width of a menu sprite in pixels
 #define MENU_SPRITE_HEIGHT        16    ///< Height of a menu sprite in pixels
 #define EFFECT_SPRITE_WIDTH       14    ///< Width of an effect sprite in pixels
@@ -279,6 +278,21 @@ enum ICON_TYPES
   ICON_NONE          ///< None of the above
 };
 
+enum EFFECT_SPRITES
+{
+  EFFECTS_SPRITE_SHADE,
+  EFFECTS_SPRITE_TRANSP,
+  EFFECTS_SPRITE_SMOOTH,
+  EFFECTS_SPRITE_TILING,
+  EFFECTS_SPRITE_STENCIL,
+  EFFECTS_SPRITE_SIEVE,
+  EFFECTS_SPRITE_GRID,
+  EFFECTS_SPRITE_MASK,
+  EFFECTS_SPRITE_SMEAR,
+  EFFECTS_SPRITE_8BIT,
+  NB_EFFECTS_SPRITES ///< Number of effect sprites.
+};
+
 /// Identifiers for the buttons in the menu.
 enum BUTTON_NUMBERS
 {