diff --git a/src/buttons.c b/src/buttons.c
index fba75319..759cbbe0 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -5072,7 +5072,7 @@ void Display_stored_brush_in_window(word x_pos,word y_pos,int index)
         if (Brush_container[index].Paintbrush_shape <= PAINTBRUSH_SHAPE_MISC)
           color = Brush_container[index].Thumbnail[y][x]?MC_Black:MC_Light;
         else
-          color = Brush_container[index].Thumbnail[y][x];
+          color = Brush_container[index].Colormap[Brush_container[index].Thumbnail[y][x]];
         Pixel_in_window(x_pos+x+offset_x,y_pos+y+offset_y,color);
       }
     }
@@ -5134,16 +5134,20 @@ void Store_brush(int index)
   else if (Paintbrush_shape == PAINTBRUSH_SHAPE_COLOR_BRUSH ||
      Paintbrush_shape == PAINTBRUSH_SHAPE_MONO_BRUSH)
   {
-    // Color brush
-    Brush_container[index].Brush=(byte *)malloc(Brush_width*Brush_height);
-    if (Brush_container[index].Brush)
+    // Color brush : saved bitmap and palette
+    byte * buffer;
+    buffer=(byte *)malloc(Brush_width*Brush_height);
+    if (buffer)
     {
+      Brush_container[index].Brush=buffer;
       Brush_container[index].Paintbrush_shape=Paintbrush_shape;
       Brush_container[index].Width=Brush_width;
       Brush_container[index].Height=Brush_height;
 
       memcpy(Brush_container[index].Brush, Brush_original_pixels,Brush_height*Brush_width);
-
+      memcpy(Brush_container[index].Palette, Brush_original_palette,sizeof(T_Palette));
+      memcpy(Brush_container[index].Colormap, Brush_colormap,256);
+      
       // Scale for preview
       if (Brush_width>BRUSH_CONTAINER_PREVIEW_WIDTH ||
           Brush_height>BRUSH_CONTAINER_PREVIEW_HEIGHT)
@@ -5286,11 +5290,12 @@ byte Restore_brush(int index)
     {
       // Recover pixels
       memcpy(Brush_original_pixels, Brush_container[index].Brush, (long)Brush_height*Brush_width);
-      // Grab palette (TODO: get saved palette from brush container)
-      memcpy(Brush_original_palette, Main_palette,sizeof(T_Palette));
-      // Remap (no change)
-      Remap_brush();
-      
+      // Grab palette
+      memcpy(Brush_original_palette, Brush_container[index].Palette, sizeof(T_Palette));
+      // Recover colormap
+      memcpy(Brush_colormap, Brush_container[index].Colormap, 256);
+      // Remap using current colormap
+      Remap_general_lowlevel(Brush_colormap,Brush_original_pixels,Brush,Brush_width,Brush_height,Brush_width);
       
       Brush_offset_X=Brush_width>>1;
       Brush_offset_Y=Brush_height>>1;
diff --git a/src/init.c b/src/init.c
index c92a594c..d62ab947 100644
--- a/src/init.c
+++ b/src/init.c
@@ -2656,7 +2656,7 @@ void Init_brush_container(void)
   
   for (i=0; i<BRUSH_CONTAINER_COLUMNS*BRUSH_CONTAINER_ROWS; i++)
   {
-    int x,y;
+    int x,y,c;
     
     Brush_container[i].Paintbrush_shape=PAINTBRUSH_SHAPE_MAX;
     Brush_container[i].Width=0;
@@ -2666,6 +2666,8 @@ void Init_brush_container(void)
     for (y=0; y<BRUSH_CONTAINER_PREVIEW_WIDTH; y++)
       for (x=0; x<BRUSH_CONTAINER_PREVIEW_HEIGHT; x++)
         Brush_container[i].Thumbnail[y][x]=0;
+    for (c=0; c<256; c++)
+        Brush_container[i].Colormap[c]=c;
         
     Brush_container[i].Brush = NULL;
   }
diff --git a/src/struct.h b/src/struct.h
index a98c29ab..c1fb4b62 100644
--- a/src/struct.h
+++ b/src/struct.h
@@ -424,6 +424,7 @@ typedef struct
   word Height;
   byte * Brush; /// < Color brush (if any)
   T_Palette Palette;
+  byte Colormap[256];
   byte Transp_color;
 } T_Brush_template;