11 files changed, 18 insertions, 15 deletions

diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES
index 82bab1be12..0fbc4766d1 100644
--- a/apps/plugins/bitmaps/mono/SOURCES
+++ b/apps/plugins/bitmaps/mono/SOURCES
@@ -31,4 +31,22 @@ brickmania_powerups.112x64x1.bmp
 tetrox_background.112x64x1.bmp
 #endif
 
+/* Solitaire */
+#if LCD_HEIGHT > 64
+solitaire_numbers.8x10x1.bmp
+#if HAVE_LCD_COLOR
+solitaire_suits.8x10x1_filled.bmp
+#else
+solitaire_suits.8x10x1.bmp
+#endif
+#else
+solitaire_numbers.6x6x1.bmp
+solitaire_suits.6x6x1.bmp
+#endif
+#if HAVE_LCD_COLOR
+solitaire_suitsi.15x16x1_filled.bmp
+#else
+solitaire_suitsi.15x16x1.bmp
+#endif
+
 #endif /* HAVE_LCD_BITMAP */
diff --git a/apps/plugins/bitmaps/native/solitaire_numbers.6x6x1.bmp b/apps/plugins/bitmaps/mono/solitaire_numbers.6x6x1.bmp
index 67884fe741..67884fe741 100644
--- a/apps/plugins/bitmaps/native/solitaire_numbers.6x6x1.bmp
+++ b/apps/plugins/bitmaps/mono/solitaire_numbers.6x6x1.bmp
diff --git a/apps/plugins/bitmaps/native/solitaire_numbers.8x10x1.bmp b/apps/plugins/bitmaps/mono/solitaire_numbers.8x10x1.bmp
index 228532b54b..228532b54b 100644
--- a/apps/plugins/bitmaps/native/solitaire_numbers.8x10x1.bmp
+++ b/apps/plugins/bitmaps/mono/solitaire_numbers.8x10x1.bmp
diff --git a/apps/plugins/bitmaps/native/solitaire_suits.6x6x1.bmp b/apps/plugins/bitmaps/mono/solitaire_suits.6x6x1.bmp
index 67ec92e113..67ec92e113 100644
--- a/apps/plugins/bitmaps/native/solitaire_suits.6x6x1.bmp
+++ b/apps/plugins/bitmaps/mono/solitaire_suits.6x6x1.bmp
diff --git a/apps/plugins/bitmaps/native/solitaire_suits.8x10x1.bmp b/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1.bmp
index 444a63e0a0..444a63e0a0 100644
--- a/apps/plugins/bitmaps/native/solitaire_suits.8x10x1.bmp
+++ b/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1.bmp
diff --git a/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1_filled.bmp b/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1_filled.bmp
new file mode 100644
index 0000000000..497dcae149
--- /dev/null
+++ b/apps/plugins/bitmaps/mono/solitaire_suits.8x10x1_filled.bmp
diff --git a/apps/plugins/bitmaps/native/solitaire_suitsi.15x16x1.bmp b/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1.bmp
index ba8fad0a92..ba8fad0a92 100644
--- a/apps/plugins/bitmaps/native/solitaire_suitsi.15x16x1.bmp
+++ b/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1.bmp
diff --git a/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1_filled.bmp b/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1_filled.bmp
new file mode 100644
index 0000000000..541bfc0688
--- /dev/null
+++ b/apps/plugins/bitmaps/mono/solitaire_suitsi.15x16x1_filled.bmp
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index 7ddb042def..8df3bef608 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -158,21 +158,6 @@ solitaire_cardback.220x176x16.bmp
 solitaire_cardback.176x132x16.bmp
 #endif
 #endif
-#if defined( HAVE_LCD_COLOR )
-solitaire_numbers.8x10x1.bmp
-solitaire_suits.8x10x16.bmp
-#elif LCD_HEIGHT > 64
-solitaire_numbers.8x10x1.bmp
-solitaire_suits.8x10x1.bmp
-#else
-solitaire_numbers.6x6x1.bmp
-solitaire_suits.6x6x1.bmp
-#endif
-#ifdef HAVE_LCD_COLOR
-solitaire_suitsi.15x16x16.bmp
-#else
-solitaire_suitsi.15x16x1.bmp
-#endif
 
 /* Sudoku */
 #if LCD_WIDTH >= LCD_HEIGHT
diff --git a/apps/plugins/bitmaps/native/solitaire_suits.8x10x16.bmp b/apps/plugins/bitmaps/native/solitaire_suits.8x10x16.bmp
deleted file mode 100644
index df8ad2e8b2..0000000000
--- a/apps/plugins/bitmaps/native/solitaire_suits.8x10x16.bmp
+++ /dev/null
diff --git a/apps/plugins/bitmaps/native/solitaire_suitsi.15x16x16.bmp b/apps/plugins/bitmaps/native/solitaire_suitsi.15x16x16.bmp
deleted file mode 100644
index 530921db3d..0000000000
--- a/apps/plugins/bitmaps/native/solitaire_suitsi.15x16x16.bmp
+++ /dev/null