diff --git a/project/java/Settings.java b/project/java/Settings.java
index 9bf56709f..11e30a543 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -2223,6 +2223,20 @@ class Settings
 				boundary.setImageBitmap(boundaryBmp);
 				layout.addView(boundary);
 				currentButton = 0;
+				if( Globals.TouchscreenKeyboardTheme == 2 )
+				{
+					int buttons2[] = {
+						R.drawable.sun_dpad,
+						R.drawable.sun_keyboard,
+						R.drawable.sun_b1,
+						R.drawable.sun_b2,
+						R.drawable.sun_b3,
+						R.drawable.sun_b4,
+						R.drawable.sun_b5,
+						R.drawable.sun_b6
+					};
+					buttons = buttons2;
+				}
 				setupButton(true);
 			}
 			
diff --git a/project/res/drawable/sun_b1.png b/project/res/drawable/sun_b1.png
new file mode 100644
index 000000000..faa1f8b24
Binary files /dev/null and b/project/res/drawable/sun_b1.png differ
diff --git a/project/res/drawable/sun_b2.png b/project/res/drawable/sun_b2.png
new file mode 100644
index 000000000..b9f58e5dd
Binary files /dev/null and b/project/res/drawable/sun_b2.png differ
diff --git a/project/res/drawable/sun_b3.png b/project/res/drawable/sun_b3.png
new file mode 100644
index 000000000..6e5fbe515
Binary files /dev/null and b/project/res/drawable/sun_b3.png differ
diff --git a/project/res/drawable/sun_b4.png b/project/res/drawable/sun_b4.png
new file mode 100644
index 000000000..a92dd6af6
Binary files /dev/null and b/project/res/drawable/sun_b4.png differ
diff --git a/project/res/drawable/sun_b5.png b/project/res/drawable/sun_b5.png
new file mode 100644
index 000000000..d40c10820
Binary files /dev/null and b/project/res/drawable/sun_b5.png differ
diff --git a/project/res/drawable/sun_b6.png b/project/res/drawable/sun_b6.png
new file mode 100644
index 000000000..9b644d122
Binary files /dev/null and b/project/res/drawable/sun_b6.png differ
diff --git a/project/res/drawable/sun_dpad.png b/project/res/drawable/sun_dpad.png
new file mode 100644
index 000000000..f653f2550
Binary files /dev/null and b/project/res/drawable/sun_dpad.png differ
diff --git a/project/res/drawable/sun_keyboard.png b/project/res/drawable/sun_keyboard.png
new file mode 100644
index 000000000..10b740e92
Binary files /dev/null and b/project/res/drawable/sun_keyboard.png differ