diff --git a/DroidFish/res/drawable/flip.png b/DroidFish/res/drawable/flip.png
new file mode 100644
index 0000000..503e8f1
Binary files /dev/null and b/DroidFish/res/drawable/flip.png differ
diff --git a/DroidFish/res/drawable/flip_large.png b/DroidFish/res/drawable/flip_large.png
new file mode 100644
index 0000000..5eeb2bc
Binary files /dev/null and b/DroidFish/res/drawable/flip_large.png differ
diff --git a/DroidFish/res/layout-land/main.xml b/DroidFish/res/layout-land/main.xml
index b1101c7..e9d64aa 100644
--- a/DroidFish/res/layout-land/main.xml
+++ b/DroidFish/res/layout-land/main.xml
@@ -18,7 +18,14 @@
         android:orientation="horizontal"
         android:layout_width="fill_parent"
 	    android:layout_height="wrap_content">
-		<ImageButton
+        <ImageButton
+            android:id="@+id/flipButton"
+            android:contentDescription="@string/buttonDesc_flip"
+            android:layout_width="36dp"
+            android:layout_height="32dp"
+            android:src="@drawable/flip">
+        </ImageButton>
+        <ImageButton
             android:id="@+id/modeButton"
             android:contentDescription="@string/buttonDesc_mode"
             android:layout_width="36dp"
diff --git a/DroidFish/res/layout/main.xml b/DroidFish/res/layout/main.xml
index ad73a3e..3cef430 100644
--- a/DroidFish/res/layout/main.xml
+++ b/DroidFish/res/layout/main.xml
@@ -20,7 +20,14 @@
 		    android:includeFontPadding="true"
     		android:typeface="monospace"
 		    android:textSize="10dip"/>
-		<ImageButton
+        <ImageButton
+            android:id="@+id/flipButton"
+            android:contentDescription="@string/buttonDesc_flip"
+            android:layout_width="36dp"
+            android:layout_height="32dp"
+            android:src="@drawable/flip">
+        </ImageButton>
+        <ImageButton
             android:id="@+id/modeButton"
             android:contentDescription="@string/buttonDesc_mode"
             android:layout_width="36dp"
diff --git a/DroidFish/res/layout/main_left_handed.xml b/DroidFish/res/layout/main_left_handed.xml
index 93acffa..c41156f 100644
--- a/DroidFish/res/layout/main_left_handed.xml
+++ b/DroidFish/res/layout/main_left_handed.xml
@@ -14,6 +14,13 @@
         android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
+        <ImageButton
+            android:id="@+id/flipButton"
+            android:contentDescription="@string/buttonDesc_flip"
+            android:layout_width="36dp"
+            android:layout_height="32dp"
+            android:src="@drawable/flip">
+        </ImageButton>
         <ImageButton
             android:id="@+id/modeButton"
             android:contentDescription="@string/buttonDesc_mode"
diff --git a/DroidFish/res/raw/about.html b/DroidFish/res/raw/about.html
index f7c8f5a..ca4fd4e 100644
--- a/DroidFish/res/raw/about.html
+++ b/DroidFish/res/raw/about.html
@@ -41,7 +41,7 @@
     to go to the previous/next variation.
   </li>
   <li>
-    Long press left/right buttons for additional game navigation commands.
+    Long press mode/left/right buttons for additional commands.
   </li>
 </ul>
 
diff --git a/DroidFish/res/values/strings.xml b/DroidFish/res/values/strings.xml
index 150711f..3ad5c69 100644
--- a/DroidFish/res/values/strings.xml
+++ b/DroidFish/res/values/strings.xml
@@ -359,8 +359,6 @@ you are not actively using the program.\
     <string name="prefs_playing_options">Playing Options</string>
     <string name="prefs_playerName_title">Player Name</string>
     <string name="prefs_playerName_summary">Default player name in new games</string>
-    <string name="prefs_boardFlipped_title">Flip Board</string>
-    <string name="prefs_boardFlipped_summary">View board from black side</string>
     <string name="prefs_autoSwapSides_title">Auto Swap Sides</string>
     <string name="prefs_autoSwapSides_summary">Automatically swap sides when new game started. Also overrides Flip Board setting</string>
     <string name="prefs_playerNameFlip_title">Flip Board: Player</string>
@@ -482,6 +480,7 @@ you are not actively using the program.\
     <string name="prefs_tbEngineProbe_summary">Enable tablebase probing in engine, when supported. Takes effect next time engine is started</string>
     <string name="prefs_gtbPath_title">GTB Directory</string>
     <string name="prefs_gtbPath_summary">Directory where Gaviota tablebases are installed. Leave blank to use default directory</string>
+    <string name="buttonDesc_flip">Flip board button</string>
     <string name="buttonDesc_mode">Mode button</string>
     <string name="buttonDesc_back">Backward button</string>
     <string name="buttonDesc_forward">Forward button</string>
diff --git a/DroidFish/res/xml/preferences.xml b/DroidFish/res/xml/preferences.xml
index 268881b..a2f13d5 100644
--- a/DroidFish/res/xml/preferences.xml
+++ b/DroidFish/res/xml/preferences.xml
@@ -9,12 +9,6 @@
             android:summary="@string/prefs_playerName_summary"
             android:defaultValue="Player">
         </EditTextPreference>
-        <CheckBoxPreference
-            android:key="boardFlipped"
-            android:title="@string/prefs_boardFlipped_title"
-            android:summary="@string/prefs_boardFlipped_summary"
-            android:defaultValue="false">
-        </CheckBoxPreference>
         <CheckBoxPreference
             android:key="autoSwapSides"
             android:title="@string/prefs_autoSwapSides_title"
diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java
index 490e890..3978c3b 100644
--- a/DroidFish/src/org/petero/droidfish/DroidFish.java
+++ b/DroidFish/src/org/petero/droidfish/DroidFish.java
@@ -163,7 +163,7 @@ public class DroidFish extends Activity implements GUIInterface {
     private ScrollView moveListScroll;
     private TextView moveList;
     private TextView thinking;
-    private ImageButton modeButton, undoButton, redoButton;
+    private ImageButton flipButton, modeButton, undoButton, redoButton;
     private TextView whiteClock, blackClock, titleText;
 
     SharedPreferences settings;
@@ -475,6 +475,14 @@ public class DroidFish extends Activity implements GUIInterface {
             }
         });
 
+        flipButton = (ImageButton)findViewById(R.id.flipButton);
+        flipButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setBoardFlipPrefs(!boardFlipped);
+                setBoardFlip(false);
+            }
+        });
         modeButton = (ImageButton)findViewById(R.id.modeButton);
         modeButton.setOnClickListener(new OnClickListener() {
             @Override
@@ -621,14 +629,17 @@ public class DroidFish extends Activity implements GUIInterface {
         if (largeButtons) {
             bWidth  = bWidth  * 3 / 2;
             bHeight = bHeight * 3 / 2;
+            flipButton.setImageResource(R.drawable.flip_large);
             modeButton.setImageResource(R.drawable.mode_large);
             undoButton.setImageResource(R.drawable.left_large);
             redoButton.setImageResource(R.drawable.right_large);
         } else {
+            flipButton.setImageResource(R.drawable.flip);
             modeButton.setImageResource(R.drawable.mode);
             undoButton.setImageResource(R.drawable.left);
             redoButton.setImageResource(R.drawable.right);
         }
+        flipButton.setLayoutParams(new LinearLayout.LayoutParams(bWidth, bHeight));
         modeButton.setLayoutParams(new LinearLayout.LayoutParams(bWidth, bHeight));
         undoButton.setLayoutParams(new LinearLayout.LayoutParams(bWidth, bHeight));
         redoButton.setLayoutParams(new LinearLayout.LayoutParams(bWidth, bHeight));
@@ -919,6 +930,13 @@ public class DroidFish extends Activity implements GUIInterface {
         setBoardFlip(false);
     }
 
+    private final void setBoardFlipPrefs(boolean flipped) {
+        boardFlipped = flipped;
+        Editor editor = settings.edit();
+        editor.putBoolean("boardFlipped", boardFlipped);
+        editor.commit();
+    }
+
     private final void setBoardFlip(boolean matchPlayerNames) {
         boolean flipped = boardFlipped;
         if (playerNameFlip && matchPlayerNames && (ctrl != null)) {
@@ -929,10 +947,7 @@ public class DroidFish extends Activity implements GUIInterface {
             if (( flipped && (whiteMatch > blackMatch)) ||
                 (!flipped && (whiteMatch < blackMatch))) {
                 flipped = !flipped;
-                boardFlipped = flipped;
-                Editor editor = settings.edit();
-                editor.putBoolean("boardFlipped", boardFlipped);
-                editor.commit();
+                setBoardFlipPrefs(flipped);
             }
         }
         if (autoSwapSides) {