diff --git a/res/drawable-hdpi/ic_menu_savephoto.png b/res/drawable-hdpi/ic_menu_savephoto.png
new file mode 100644
index 0000000..0c0309f
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_savephoto.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_savephoto.png b/res/drawable-mdpi/ic_menu_savephoto.png
new file mode 100644
index 0000000..b1dd52a
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_savephoto.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_savephoto.png b/res/drawable-xhdpi/ic_menu_savephoto.png
new file mode 100644
index 0000000..4b1210a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_savephoto.png
Binary files differ
diff --git a/res/layout/action_bar_two_line_text.xml b/res/layout/action_bar_two_line_text.xml
index 37cb375..9b76a80 100644
--- a/res/layout/action_bar_two_line_text.xml
+++ b/res/layout/action_bar_two_line_text.xml
@@ -17,7 +17,7 @@
     android:paddingLeft="18dp"
     android:paddingRight="18dp"
     android:background="?android:attr/activatedBackgroundIndicator"
-    android:layout_width="fill_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:mode="twoLine"
@@ -25,21 +25,18 @@
 >
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@android:id/text1"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:singleLine="true"
         android:ellipsize="end"
-        android:gravity="top"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:minHeight="?attr/listPreferredItemHeightSmall"
+        android:textSize="15dp"
     />
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@android:id/text2"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:gravity="bottom"
-        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:layout_below="@android:id/text1"
+        android:textSize="9dp"
         android:singleLine="true"
-        android:minHeight="?attr/listPreferredItemHeightSmall"
     />
-</TwoLineListItem>
\ No newline at end of file
+</TwoLineListItem>
diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml
index 064b0e6..20e3664 100644
--- a/res/layout/filtershow_actionbar.xml
+++ b/res/layout/filtershow_actionbar.xml
@@ -19,7 +19,7 @@
     android:layout_height="match_parent"
     android:background="@drawable/filtershow_button_background"
     android:id="@+id/filtershow_done"
-    android:text="@string/done"
+    android:text="@string/save"
     android:gravity="center_vertical"
     android:textSize="18dip"
-    android:drawableLeft="?android:attr/actionModeCloseDrawable" />
\ No newline at end of file
+    android:drawableLeft="@drawable/ic_menu_savephoto" />
\ No newline at end of file
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 178f18a..0c9ceb8 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -181,14 +181,6 @@
                 android:orientation="horizontal"
                 android:visibility="gone" >
 
-                <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                    android:id="@+id/compareWithOriginalImage"
-                    style="@style/FilterShowBottomButton"
-                    android:layout_gravity="left"
-                    android:layout_weight="0"
-                    android:src="@drawable/filtershow_button_geometry_straighten"
-                    android:text="@string/compare_original" />
-
                 <Button
                     android:id="@+id/applyEffect"
                     android:layout_height="94dip"
@@ -198,20 +190,13 @@
                     android:gravity="center"
                     android:text="@string/apply_effect"
                     android:textSize="24dip" />
-
-                <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                    android:id="@+id/resetEffect"
-                    style="@style/FilterShowBottomButton"
-                    android:layout_gravity="right"
-                    android:layout_weight="0"
-                    android:src="@drawable/filtershow_button_geometry_straighten"
-                    android:text="@string/reset_effect" />
             </LinearLayout>
 
             <HorizontalScrollView
                 android:id="@+id/fxList"
                 android:layout_width="match_parent"
-                android:layout_height="96dip">
+                android:layout_height="96dip"
+                android:scrollbars="none" >
 
                 <LinearLayout
                     android:id="@+id/listFilters"
@@ -225,7 +210,8 @@
                 android:id="@+id/bordersList"
                 android:layout_width="match_parent"
                 android:layout_height="96dip"
-                android:visibility="gone" >
+                android:visibility="gone"
+                android:scrollbars="none" >
 
                 <LinearLayout
                     android:id="@+id/listBorders"
@@ -240,7 +226,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="96dip"
                 android:background="@color/background_main_toolbar"
-                android:visibility="gone" >
+                android:visibility="gone"
+                android:scrollbars="none" >
 
                 <LinearLayout
                     android:id="@+id/listGeometry"
@@ -276,7 +263,9 @@
                         android:id="@+id/redEyeButton"
                         style="@style/FilterShowBottomButton"
                         android:src="@drawable/photoeditor_effect_redeye"
-                        android:text="@string/redeye" />
+                        android:text="@string/redeye"
+                        android:visibility="gone" />
+
                 </LinearLayout>
             </HorizontalScrollView>
 
@@ -285,7 +274,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="96dip"
                 android:background="@color/background_main_toolbar"
-                android:visibility="gone" >
+                android:visibility="gone"
+                android:scrollbars="none" >
 
                 <LinearLayout
                     android:id="@+id/listColorsFx"
@@ -294,6 +284,12 @@
                     android:orientation="horizontal" >
 
                     <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+                        android:id="@+id/wbalanceButton"
+                        style="@style/FilterShowBottomButton"
+                        android:src="@drawable/filtershow_button_colors_contrast"
+                        android:text="@string/wbalance" />
+
+                    <com.android.gallery3d.filtershow.ui.ImageButtonTitle
                         android:id="@+id/exposureButton"
                         style="@style/FilterShowBottomButton"
                         android:src="@drawable/filtershow_button_colors_contrast"
@@ -306,12 +302,6 @@
                         android:text="@string/vibrance" />
 
                     <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                        android:id="@+id/saturationButton"
-                        style="@style/FilterShowBottomButton"
-                        android:src="@drawable/filtershow_button_colors_contrast"
-                        android:text="@string/saturation" />
-
-                    <com.android.gallery3d.filtershow.ui.ImageButtonTitle
                         android:id="@+id/contrastButton"
                         style="@style/FilterShowBottomButton"
                         android:src="@drawable/filtershow_button_colors_contrast"
@@ -336,17 +326,23 @@
                         android:text="@string/sharpen" />
 
                     <com.android.gallery3d.filtershow.ui.ImageButtonTitle
-                        android:id="@+id/tintButton"
-                        style="@style/FilterShowBottomButton"
-                        android:src="@drawable/filtershow_button_colors_contrast"
-                        android:text="@string/tint" />
-
-                    <com.android.gallery3d.filtershow.ui.ImageButtonTitle
                         android:id="@+id/curvesButtonRGB"
                         style="@style/FilterShowBottomButton"
                         android:src="@drawable/filtershow_button_colors_curve"
                         android:text="@string/curvesRGB" />
 
+                    <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+                        android:id="@+id/hueButton"
+                        style="@style/FilterShowBottomButton"
+                        android:src="@drawable/filtershow_button_colors_contrast"
+                        android:text="@string/hue" />
+
+                    <com.android.gallery3d.filtershow.ui.ImageButtonTitle
+                        android:id="@+id/saturationButton"
+                        style="@style/FilterShowBottomButton"
+                        android:src="@drawable/filtershow_button_colors_contrast"
+                        android:text="@string/saturation" />
+
                 </LinearLayout>
             </HorizontalScrollView>
         </FrameLayout>
diff --git a/res/menu/filtershow_activity_menu.xml b/res/menu/filtershow_activity_menu.xml
index 7cf4466..69c952d 100644
--- a/res/menu/filtershow_activity_menu.xml
+++ b/res/menu/filtershow_activity_menu.xml
@@ -26,12 +26,6 @@
     <item
         android:id="@+id/showImageStateButton"
         android:showAsAction="never"
+        android:visible="false"
         android:title="@string/show_imagestate_panel" />
-    <item
-        android:id="@+id/menu_settings"
-        android:enabled="false"
-        android:showAsAction="never"
-        android:orderInCategory="100"
-        android:title="@string/menu_settings"/>
-
-</menu>
\ No newline at end of file
+</menu>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 705748c..9fd7802 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,9 +19,9 @@
     <!-- configuration for album set page -->
     <color name="albumset_background">#1A1A1A</color>
     <color name="albumset_placeholder">#333</color>
-    <color name="albumset_label_background">#414143</color>
+    <color name="albumset_label_background">#EE414143</color>
     <color name="albumset_label_title">#FBFBFB</color>
-    <color name="albumset_label_count">#717173</color>
+    <color name="albumset_label_count">#A9ABAD</color>
 
     <!-- configuration for album page -->
     <color name="album_background">#1A1A1A</color>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 0bcef0b..5d8d172 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -26,7 +26,7 @@
     <dimen name="albumset_padding_bottom">7dp</dimen>
     <dimen name="albumset_slot_gap">7dp</dimen>
 
-    <dimen name="albumset_label_background_height">25dp</dimen>
+    <dimen name="albumset_label_background_height">30dp</dimen>
     <dimen name="albumset_title_offset">10dp</dimen>
     <dimen name="albumset_count_offset">10dp</dimen>
     <dimen name="albumset_title_font_size">12sp</dimen>
diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 5023566..e953fa0 100644
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -73,8 +73,10 @@
     <string name="vibrance">Vibrance</string>
     <!--  Label for the saturation filter button [CHAR LIMIT=15] -->
     <string name="saturation">Saturation</string>
-    <!--  Label for the tint filter button [CHAR LIMIT=15] -->
-    <string name="tint">Tint</string>
+    <!--  Label for the White Balance filter button [CHAR LIMIT=15] -->
+    <string name="wbalance">White Balance</string>
+    <!--  Label for the Hue filter button [CHAR LIMIT=15] -->
+    <string name="hue">Hue</string>
     <!--  Label for the shadow recovery filter button [CHAR LIMIT=15] -->
     <string name="shadow_recovery">Shadows</string>
     <!--  Label for the curves filter button [CHAR LIMIT=15] -->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 92d4308..854893e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -500,4 +500,6 @@
     <!-- Text to show with progress bar while stitching in Gallery -->
     <string name="pano_progress_text">Rendering panorama</string>
 
+    <!-- The label on the button that will save an edited image -->
+    <string name="save" msgid="8140440041190264400">Save</string>
 </resources>