Latest UI

bug:7233983
bug:7233980

Also fixes border scaling issues.

Change-Id: Ia9365800e057f481936ffdd13a5d8c5a9dab14b5
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 7915371..178f18a 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -177,7 +177,7 @@
                 android:id="@+id/filterButtonsList"
                 android:layout_width="fill_parent"
                 android:layout_height="96dip"
-                android:background="@color/background_toolbar"
+                android:background="@color/background_main_toolbar"
                 android:orientation="horizontal"
                 android:visibility="gone" >
 
@@ -239,7 +239,7 @@
                 android:id="@+id/geometryList"
                 android:layout_width="fill_parent"
                 android:layout_height="96dip"
-                android:background="@color/background_toolbar"
+                android:background="@color/background_main_toolbar"
                 android:visibility="gone" >
 
                 <LinearLayout
@@ -284,7 +284,7 @@
                 android:id="@+id/colorsFxList"
                 android:layout_width="fill_parent"
                 android:layout_height="96dip"
-                android:background="@color/background_toolbar"
+                android:background="@color/background_main_toolbar"
                 android:visibility="gone" >
 
                 <LinearLayout