diff --git a/shell/android/res/layout/configure_fragment.xml b/shell/android/res/layout/configure_fragment.xml
index f94283246..afd31cd17 100644
--- a/shell/android/res/layout/configure_fragment.xml
+++ b/shell/android/res/layout/configure_fragment.xml
@@ -135,6 +135,33 @@
                 </LinearLayout>
             </LinearLayout>
 
+            <TableRow
+                android:layout_marginTop="10dp"
+                android:gravity="center_vertical" >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"
+                    android:ems="10"
+                    android:gravity="center_vertical|left"
+                    android:text="@string/show_profiling_tools" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="right"
+                    android:orientation="vertical" >
+
+                    <de.ankri.views.Switch
+                        android:id="@+id/debug_profling_tools"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:focusable="true" />
+                </LinearLayout>
+            </TableRow>
+
             <TableRow
                 android:layout_marginTop="10dp"
                 android:gravity="center_vertical" >
diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml
index 9f194bd1b..a894a8518 100644
--- a/shell/android/res/values/strings.xml
+++ b/shell/android/res/values/strings.xml
@@ -27,6 +27,7 @@
     <string name="select_render">PVR Rendering (does nothing for now)</string>
     <string name="select_force_gpu">Force v6 GPU Config</string>
     <string name="default_disk">Set Default Disk</string>
+    <string name="show_profiling_tools">Show debug profiling tools</string>
 
     <string name="games_listing">Available Dreamcast Games</string>
 
diff --git a/shell/android/src/com/reicast/emulator/ConfigureFragment.java b/shell/android/src/com/reicast/emulator/ConfigureFragment.java
index 1f1a4faab..6fe4b51db 100644
--- a/shell/android/src/com/reicast/emulator/ConfigureFragment.java
+++ b/shell/android/src/com/reicast/emulator/ConfigureFragment.java
@@ -305,6 +305,16 @@ public class ConfigureFragment extends Fragment {
 			stretch_view.setChecked(false);
 		}
 		stretch_view.setOnCheckedChangeListener(full_screen);
+		
+		Switch showProfilingToolsSwitch = (Switch) getView().findViewById(
+				R.id.debug_profling_tools);
+		boolean showProfilingTools = mPrefs.getBoolean("debug_profling_tools", false);
+		showProfilingToolsSwitch.setChecked(showProfilingTools);
+		showProfilingToolsSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+				mPrefs.edit().putBoolean("debug_profling_tools", isChecked).commit();
+			}
+		});
 
 		mainFrames = (TextView) getView().findViewById(R.id.current_frames);
 		mainFrames.setText(String.valueOf(frameskip));
diff --git a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
index cf10dc90a..9ea5dfcfe 100644
--- a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
+++ b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
@@ -91,44 +91,43 @@ public class GL2JNIActivity extends Activity {
 			}
 		}), params);
 		
-		//TODO comment what these do
-		//TODO update these icons
+		if(prefs.getBoolean("debug_profling_tools", false)){
 
-		hlay.addView(addbut(R.drawable.config, new OnClickListener() {
-			public void onClick(View v) {
-				JNIdc.send(0, 0); //Killing texture cache
-				popUp.dismiss();
-			}
-		}), params);
-
-		hlay.addView(addbut(R.drawable.profiler, new OnClickListener() {
-			public void onClick(View v) {
-				JNIdc.send(1, 3000); //sample_Start(param);
-				popUp.dismiss();
-			}
-		}), params);
-
-		hlay.addView(addbut(R.drawable.profiler, new OnClickListener() {
-			public void onClick(View v) {
-				JNIdc.send(1, 0); //sample_Start(param);
-				popUp.dismiss();
-			}
-		}), params);
-
-		hlay.addView(addbut(R.drawable.disk_unknown, new OnClickListener() {
-			public void onClick(View v) {
-				JNIdc.send(0, 1); //settings.pvr.ta_skip
-				popUp.dismiss();
-			}
-		}), params);
-
-		hlay.addView(addbut(R.drawable.profiler, new OnClickListener() {
-			public void onClick(View v) {
-				JNIdc.send(0, 2);
-				popUp.dismiss(); //print_stats=true;
-			}
-		}), params);
-		
+			hlay.addView(addbut(R.drawable.config, new OnClickListener() {
+				public void onClick(View v) {
+					JNIdc.send(0, 0); //Killing texture cache
+					popUp.dismiss();
+				}
+			}), params);
+	
+			hlay.addView(addbut(R.drawable.profiler, new OnClickListener() {
+				public void onClick(View v) {
+					JNIdc.send(1, 3000); //sample_Start(param);
+					popUp.dismiss();
+				}
+			}), params);
+	
+			hlay.addView(addbut(R.drawable.profiler, new OnClickListener() {
+				public void onClick(View v) {
+					JNIdc.send(1, 0); //sample_Start(param);
+					popUp.dismiss();
+				}
+			}), params);
+	
+			hlay.addView(addbut(R.drawable.disk_unknown, new OnClickListener() {
+				public void onClick(View v) {
+					JNIdc.send(0, 1); //settings.pvr.ta_skip
+					popUp.dismiss();
+				}
+			}), params);
+	
+			hlay.addView(addbut(R.drawable.profiler, new OnClickListener() {
+				public void onClick(View v) {
+					JNIdc.send(0, 2);
+					popUp.dismiss(); //print_stats=true;
+				}
+			}), params);
+		}
 		hlay.addView(addbut(R.drawable.vmu_swap, new OnClickListener() {
 			public void onClick(View v) {
 				JNIdc.vmuSwap();
@@ -144,7 +143,8 @@ public class GL2JNIActivity extends Activity {
 	protected void onCreate(Bundle icicle) {
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		moga.onCreate(this);
-
+		
+		prefs = PreferenceManager.getDefaultSharedPreferences(this);
 		createPopup();
 		/*
 		 * try { //int rID =
@@ -165,7 +165,6 @@ public class GL2JNIActivity extends Activity {
 		map = new int[4][];
 
 		// Populate device descriptor-to-player-map from preferences
-		prefs = PreferenceManager.getDefaultSharedPreferences(this);
 		deviceDescriptor_PlayerNum.put(
 				prefs.getString("device_descriptor_player_1", null), 0);
 		deviceDescriptor_PlayerNum.put(