diff --git a/shell/android/psd/dctemplate.psd b/shell/android/psd/dctemplate.psd
index 34c7e2caa..9e488654a 100644
Binary files a/shell/android/psd/dctemplate.psd and b/shell/android/psd/dctemplate.psd differ
diff --git a/shell/android/res/drawable/fast_forward.png b/shell/android/res/drawable/fast_forward.png
deleted file mode 100644
index 6549681b3..000000000
Binary files a/shell/android/res/drawable/fast_forward.png and /dev/null differ
diff --git a/shell/android/res/drawable/frames_down.png b/shell/android/res/drawable/frames_down.png
new file mode 100644
index 000000000..faf15cb75
Binary files /dev/null and b/shell/android/res/drawable/frames_down.png differ
diff --git a/shell/android/res/drawable/frames_up.png b/shell/android/res/drawable/frames_up.png
new file mode 100644
index 000000000..a0980bb1a
Binary files /dev/null and b/shell/android/res/drawable/frames_up.png differ
diff --git a/shell/android/res/drawable/normal_play.png b/shell/android/res/drawable/normal_play.png
deleted file mode 100644
index f88480dec..000000000
Binary files a/shell/android/res/drawable/normal_play.png and /dev/null differ
diff --git a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
index 781a28339..8bb7ce229 100644
--- a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
+++ b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
@@ -49,7 +49,7 @@ public class GL2JNIActivity extends Activity {
 	
 	private File sdcard = Environment.getExternalStorageDirectory();
 	private String home_directory = sdcard + "/dc";
-	private boolean frameskipping = false;
+	private int frameskip;
 	private boolean widescreen;
 
 	public static HashMap<Integer, String> deviceId_deviceDescriptor = new HashMap<Integer, String>();
@@ -193,27 +193,31 @@ public class GL2JNIActivity extends Activity {
 			});
 		}
 		hlay.addView(fullscreen, params);
-		View frameskip;
-		if (!frameskipping) {
-			frameskip = addbut(R.drawable.fast_forward, new OnClickListener() {
-				public void onClick(View v) {
-					JNIdc.frameskip((ConfigureFragment.frameskip + 1) * 5);
-					popUpConfig.dismiss();
-					frameskipping = true;
-					displayConfigPopup();
-					
-				}
-			});
-		} else {
-			frameskip = addbut(R.drawable.normal_play, new OnClickListener() {
-				public void onClick(View v) {
-					JNIdc.frameskip(ConfigureFragment.frameskip);
-					popUpConfig.dismiss();
-					frameskipping = false;
-				}
-			});
+		View frames_up = addbut(R.drawable.frames_up, new OnClickListener() {
+			public void onClick(View v) {
+				frameskip++;
+				JNIdc.frameskip(frameskip);
+				popUpConfig.dismiss();
+				displayConfigPopup();
+				
+			}
+		});
+			hlay.addView(frames_up, params);
+		if (frameskip >= 5) {
+			frames_up.setEnabled(false);
+		}
+		View frames_down = addbut(R.drawable.frames_down, new OnClickListener() {
+			public void onClick(View v) {
+				frameskip--;
+				JNIdc.frameskip(frameskip);
+				popUpConfig.dismiss();
+				displayConfigPopup();
+			}
+		});
+		hlay.addView(frames_down, params);
+		if (frameskip <= 0) {
+			frames_down.setEnabled(false);
 		}
-		hlay.addView(frameskip, params);
 		hlay.addView(addbut(R.drawable.up, new OnClickListener() {
 			public void onClick(View v) {
 				popUpConfig.dismiss();
@@ -260,6 +264,7 @@ public class GL2JNIActivity extends Activity {
 		home_directory = prefs.getString("home_directory", home_directory);
 		ConfigureFragment.getCurrentConfiguration(home_directory);
 		widescreen = ConfigureFragment.widescreen;
+		frameskip = ConfigureFragment.frameskip;
 
 		String fileName = null;