diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index 14076ad65e..05174ad034 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -429,6 +429,17 @@
 #define ROCKPAINT_LEFT      BUTTON_LEFT
 #define ROCKPAINT_RIGHT     BUTTON_RIGHT
 
+#elif CONFIG_KEYPAD == RG_NANO_PAD
+#define ROCKPAINT_QUIT      BUTTON_START
+#define ROCKPAINT_DRAW      BUTTON_A
+#define ROCKPAINT_MENU      BUTTON_B
+#define ROCKPAINT_TOOLBAR   BUTTON_X
+#define ROCKPAINT_TOOLBAR2  BUTTON_Y
+#define ROCKPAINT_UP        BUTTON_UP
+#define ROCKPAINT_DOWN      BUTTON_DOWN
+#define ROCKPAINT_LEFT      BUTTON_LEFT
+#define ROCKPAINT_RIGHT     BUTTON_RIGHT
+
 #else
 #error "Please define keys for this keypad"
 #endif
diff --git a/firmware/export/config/rgnano.h b/firmware/export/config/rgnano.h
index 40c3621f83..2e12254270 100644
--- a/firmware/export/config/rgnano.h
+++ b/firmware/export/config/rgnano.h
@@ -40,8 +40,8 @@
 /* LCD dimensions */
 #define LCD_WIDTH  240
 #define LCD_HEIGHT 240
-#define LCD_DEPTH  24
-#define LCD_PIXELFORMAT RGB888
+#define LCD_DEPTH  16
+#define LCD_PIXELFORMAT RGB565
 
 /* define this to indicate your device's keypad */
 #define HAVE_BUTTON_DATA
diff --git a/manual/plugins/images/ss-rockpaint-240x240x16.png b/manual/plugins/images/ss-rockpaint-240x240x16.png
new file mode 100644
index 0000000000..819448e040
Binary files /dev/null and b/manual/plugins/images/ss-rockpaint-240x240x16.png differ
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index d7a456a9bf..93131777dc 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -290,7 +290,7 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
 
 \input{plugins/resistor.tex}
 
-\opt{lcd_color}{\nopt{rgnano}{\input{plugins/rockpaint.tex}}}
+\opt{lcd_color}{\input{plugins/rockpaint.tex}}
 
 \input{plugins/stats.tex}
 
diff --git a/manual/plugins/rockpaint.tex b/manual/plugins/rockpaint.tex
index e7c1f40e1b..e43b28d7ab 100644
--- a/manual/plugins/rockpaint.tex
+++ b/manual/plugins/rockpaint.tex
@@ -106,7 +106,7 @@ if you select Exit, so any unsaved changes will be lost.}
 \begin{btnmap}
     \nopt{IPOD_4G_PAD,IPOD_3G_PAD,IPOD_1G2G_PAD}{
         \nopt{IRIVER_H300_PAD,GIGABEAT_S_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD%
-             ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}
+             ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD,RG_NANO_PAD}
             {\ButtonPower}
         \opt{IRIVER_H300_PAD}{\ButtonOff}
         \opt{GIGABEAT_S_PAD}{\ButtonBack}
@@ -114,6 +114,7 @@ if you select Exit, so any unsaved changes will be lost.}
         \opt{PBELL_VIBE500_PAD}{\ButtonRec}
         \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{Long \ButtonRew}
           \opt{HAVEREMOTEKEYMAP}{& }
+        \opt{RG_NANO_PAD}{\ButtonStart}
         & Quits Rockpaint immediately.\\
     }
 
@@ -137,6 +138,7 @@ if you select Exit, so any unsaved changes will be lost.}
     \opt{IRIVER_H10_PAD}{\ButtonPlay}%
     \opt{SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonRew}%
       \opt{HAVEREMOTEKEYMAP}{& }
+    \opt{RG_NANO_PAD}{\ButtonB}
     & Displays the Main Menu.\\
 
     \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,SANSA_E200_PAD}{\ButtonRec}
@@ -152,15 +154,17 @@ if you select Exit, so any unsaved changes will be lost.}
     \opt{SAMSUNG_YH92X_PAD}{\ButtonFF{} or \ButtonLeft+\ButtonFF}%
     \opt{SAMSUNG_YH820_PAD}{\ButtonFF{} or \ButtonRec}%
       \opt{HAVEREMOTEKEYMAP}{& }
+    \opt{RG_NANO_PAD}{\ButtonX{} or \ButtonY}
     & Displays the toolbar.\\
 
     \nopt{IRIVER_H10_PAD,touchscreen,PBELL_VIBE500_PAD,SANSA_FUZEPLUS_PAD%
-         ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonSelect}%
+         ,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD,RG_NANO_PAD}{\ButtonSelect}%
     \opt{IRIVER_H10_PAD}{\ButtonFF}%
     \opt{touchscreen}{\TouchCenter}
     \opt{PBELL_VIBE500_PAD,SAMSUNG_YH92X_PAD,SAMSUNG_YH820_PAD}{\ButtonPlay}
     \opt{SANSA_FUZEPLUS_PAD}{\ButtonVolUp}
       \opt{HAVEREMOTEKEYMAP}{& }
+    \opt{RG_NANO_PAD}{\ButtonA}
     & Toggles the brush and selects objects.\\
 
 \end{btnmap}
diff --git a/tools/configure b/tools/configure
index 01d6b13854..21e6bcc838 100755
--- a/tools/configure
+++ b/tools/configure
@@ -3664,7 +3664,7 @@ fi
     tool="cp "
     boottool="cp "
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
-    bmp2rb_native="$rootdir/tools/bmp2rb -f 9"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
     output="rockbox"
     bootoutput="rockbox"
     appextra="recorder:gui"