diff --git a/app/src/main/java/com/trianguloy/urlchecker/activities/ConfigActivity.java b/app/src/main/java/com/trianguloy/urlchecker/activities/ConfigActivity.java
index ab8307e..54312b2 100644
--- a/app/src/main/java/com/trianguloy/urlchecker/activities/ConfigActivity.java
+++ b/app/src/main/java/com/trianguloy/urlchecker/activities/ConfigActivity.java
@@ -12,6 +12,7 @@ import com.trianguloy.urlchecker.R;
 import com.trianguloy.urlchecker.modules.AModuleConfig;
 import com.trianguloy.urlchecker.modules.AModuleData;
 import com.trianguloy.urlchecker.modules.ModuleManager;
+import com.trianguloy.urlchecker.utilities.AndroidUtils;
 import com.trianguloy.urlchecker.utilities.Animations;
 import com.trianguloy.urlchecker.utilities.GenericPref;
 import com.trianguloy.urlchecker.utilities.Inflater;
@@ -87,6 +88,7 @@ public class ConfigActivity extends Activity {
         // configure label
         final TextView title = parent.findViewById(R.id.label);
         title.setText(getString(R.string.dd, getString(module.getName())));
+        AndroidUtils.setAsClickable(title);
 
         // configuration of the module
         final View child = Inflater.inflate(config.getLayoutId(), parent.findViewById(R.id.box), this);
@@ -96,7 +98,7 @@ public class ConfigActivity extends Activity {
         title.setOnClickListener(v -> {
             boolean checked = child.getVisibility() == View.GONE;
             child.setVisibility(checked ? View.VISIBLE : View.GONE);
-            title.setCompoundDrawablesWithIntrinsicBounds(checked ? R.drawable.expanded : R.drawable.collapsed, 0, 0, 0);
+            title.setCompoundDrawablesWithIntrinsicBounds(checked ? R.drawable.arrow_down : R.drawable.arrow_right, 0, 0, 0);
         });
         title.performClick(); // initial hide
     }
diff --git a/app/src/main/java/com/trianguloy/urlchecker/modules/list/RemoveQueriesModule.java b/app/src/main/java/com/trianguloy/urlchecker/modules/list/RemoveQueriesModule.java
index 390482e..b96097d 100644
--- a/app/src/main/java/com/trianguloy/urlchecker/modules/list/RemoveQueriesModule.java
+++ b/app/src/main/java/com/trianguloy/urlchecker/modules/list/RemoveQueriesModule.java
@@ -156,8 +156,8 @@ class RemoveQueriesDialog extends AModuleDialog implements View.OnClickListener
     private void updateMoreIndicator() {
         info.setCompoundDrawablesWithIntrinsicBounds(
                 box.getChildCount() == 0 ? 0
-                        : box.getVisibility() == View.VISIBLE ? R.drawable.expanded
-                        : R.drawable.collapsed,
+                        : box.getVisibility() == View.VISIBLE ? R.drawable.arrow_down
+                        : R.drawable.arrow_right,
                 0, 0, 0);
     }
 
diff --git a/app/src/main/res/drawable-v21/open_both.xml b/app/src/main/res/drawable-v21/open_both.xml
new file mode 100644
index 0000000..b522baa
--- /dev/null
+++ b/app/src/main/res/drawable-v21/open_both.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/transparent">
+    <item
+        android:bottom="5dp"
+        android:left="5dp"
+        android:right="5dp"
+        android:top="5dp">
+        <shape android:shape="rectangle">
+            <corners android:radius="10dp" />
+            <solid android:color="@color/app" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/drawable-v21/open_left.xml b/app/src/main/res/drawable-v21/open_left.xml
new file mode 100644
index 0000000..7d11043
--- /dev/null
+++ b/app/src/main/res/drawable-v21/open_left.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:bottom="5dp"
+        android:left="5dp"
+        android:top="5dp"
+        android:drawable="?android:attr/selectableItemBackground" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/open_right.xml b/app/src/main/res/drawable-v21/open_right.xml
new file mode 100644
index 0000000..5ff4b31
--- /dev/null
+++ b/app/src/main/res/drawable-v21/open_right.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/transparent">
+
+    <!-- Normal button -->
+    <item
+        android:bottom="7dp"
+        android:right="7dp"
+        android:left="5dp"
+        android:top="7dp">
+        <shape android:shape="rectangle">
+            <corners
+                android:topRightRadius="8dp"
+                android:bottomRightRadius="8dp" />
+            <solid android:color="?android:attr/colorBackground" />
+        </shape>
+    </item>
+
+    <!-- selection button effect -->
+    <item
+        android:bottom="5dp"
+        android:right="5dp"
+        android:left="5dp"
+        android:top="5dp"
+        android:drawable="?android:attr/selectableItemBackground" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/expanded.xml b/app/src/main/res/drawable/arrow_down.xml
similarity index 69%
rename from app/src/main/res/drawable/expanded.xml
rename to app/src/main/res/drawable/arrow_down.xml
index ac7ad81..1f6d2e3 100644
--- a/app/src/main/res/drawable/expanded.xml
+++ b/app/src/main/res/drawable/arrow_down.xml
@@ -5,9 +5,6 @@
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#fff"
-        android:strokeColor="#000"
-        android:strokeWidth="0.5"
-        android:strokeLineJoin="round"
+        android:fillColor="@color/app"
         android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z" />
 </vector>
diff --git a/app/src/main/res/drawable/collapsed.xml b/app/src/main/res/drawable/arrow_right.xml
similarity index 69%
rename from app/src/main/res/drawable/collapsed.xml
rename to app/src/main/res/drawable/arrow_right.xml
index f3b3237..f8465b8 100644
--- a/app/src/main/res/drawable/collapsed.xml
+++ b/app/src/main/res/drawable/arrow_right.xml
@@ -5,9 +5,6 @@
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#fff"
-        android:strokeColor="#000"
-        android:strokeWidth="0.5"
-        android:strokeLineJoin="round"
+        android:fillColor="@color/app"
         android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z" />
 </vector>
diff --git a/app/src/main/res/drawable/ctabs_off.xml b/app/src/main/res/drawable/ctabs_off.xml
index 7bac293..5ab47f3 100644
--- a/app/src/main/res/drawable/ctabs_off.xml
+++ b/app/src/main/res/drawable/ctabs_off.xml
@@ -5,9 +5,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#fff"
-        android:strokeColor="#000"
-        android:strokeWidth="0.5"
-        android:strokeLineJoin="round"
+        android:fillColor="@color/app"
         android:pathData="M 3 6 H 5 V 17 H 3 Z M 19 6 H 21 V 17 H 19 Z M 4 4 L 7 7 L 7 19 L 17 19 L 17 18 L 19 20 L 20 19 L 17 16 L 17 4 L 7 4 L 7 5 L 5 3 L 4 4 Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ctabs_on.xml b/app/src/main/res/drawable/ctabs_on.xml
index 42a34e1..d6f781f 100644
--- a/app/src/main/res/drawable/ctabs_on.xml
+++ b/app/src/main/res/drawable/ctabs_on.xml
@@ -4,21 +4,12 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#fff"
-        android:strokeColor="#000"
-        android:strokeWidth="0.5"
-        android:strokeLineJoin="round"
+        android:fillColor="@color/app"
         android:pathData="M7,4h10v15h-10z" />
     <path
-        android:fillColor="#fff"
-        android:strokeColor="#000"
-        android:strokeWidth="0.5"
-        android:strokeLineJoin="round"
+        android:fillColor="@color/app"
         android:pathData="M3,6h2v11h-2z" />
     <path
-        android:fillColor="#fff"
-        android:strokeColor="#000"
-        android:strokeWidth="0.5"
-        android:strokeLineJoin="round"
+        android:fillColor="@color/app"
         android:pathData="M19,6h2v11h-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/format.xml b/app/src/main/res/drawable/format.xml
index 4dbe7db..7edc1b4 100644
--- a/app/src/main/res/drawable/format.xml
+++ b/app/src/main/res/drawable/format.xml
@@ -5,9 +5,6 @@
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#fff"
-        android:strokeColor="#000"
-        android:strokeWidth="0.5"
-        android:strokeLineJoin="round"
+        android:fillColor="@color/app"
         android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z" />
 </vector>
diff --git a/app/src/main/res/drawable/open_both.xml b/app/src/main/res/drawable/open_both.xml
new file mode 100644
index 0000000..cfc585e
--- /dev/null
+++ b/app/src/main/res/drawable/open_both.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@null" />
+</layer-list>
diff --git a/app/src/main/res/drawable/open_left.xml b/app/src/main/res/drawable/open_left.xml
new file mode 100644
index 0000000..490b73b
--- /dev/null
+++ b/app/src/main/res/drawable/open_left.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:drawable/btn_default" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/open_right.xml b/app/src/main/res/drawable/open_right.xml
new file mode 100644
index 0000000..490b73b
--- /dev/null
+++ b/app/src/main/res/drawable/open_right.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:drawable/btn_default" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 439d447..58d30f3 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -46,72 +46,102 @@
             android:layout_marginTop="@dimen/smallPadding"
             android:gravity="center"
             android:orientation="horizontal">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawablePadding="@dimen/smallPadding"
-                    android:onClick="onClick"
-                    android:text="@string/btn_blog"
-                    android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" /><ImageView
-            android:id="@+id/btn_openBlog"
-            android:layout_width="wrap_content"
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawablePadding="@dimen/smallPadding"
+                android:onClick="onClick"
+                android:text="@string/btn_blog"
+                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" />
+
+            <ImageButton
+                android:id="@+id/btn_openBlog"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:onClick="onClick"
+                android:padding="@dimen/smallPadding"
+                android:src="@android:drawable/ic_menu_view"
+                android:tint="?android:attr/colorAccent" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:onClick="onClick"
-            android:padding="@dimen/smallPadding"
-            android:src="@android:drawable/ic_menu_view" /></LinearLayout><LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/smallPadding"
-        android:gravity="center"
-        android:orientation="horizontal">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:drawablePadding="@dimen/smallPadding"
-                    android:onClick="onClick"
-                    android:text="@string/btn_playStore"
-                    android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" /><ImageView
-        android:id="@+id/btn_openPlay"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:onClick="onClick"
-        android:padding="@dimen/smallPadding"
-        android:src="@android:drawable/ic_menu_view" /><ImageView
-        android:id="@+id/btn_sharePlay"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:onClick="onClick"
-        android:padding="@dimen/smallPadding"
-        android:src="@android:drawable/ic_menu_share" /></LinearLayout><LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/smallPadding"
-        android:gravity="center"
-        android:orientation="horizontal">
+            android:layout_marginTop="@dimen/smallPadding"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawablePadding="@dimen/smallPadding"
+                android:onClick="onClick"
+                android:text="@string/btn_playStore"
+                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" />
+
+            <ImageButton
+                android:id="@+id/btn_openPlay"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:onClick="onClick"
+                android:padding="@dimen/smallPadding"
+                android:src="@android:drawable/ic_menu_view"
+                android:tint="?android:attr/colorAccent" />
+
+            <ImageButton
+                android:id="@+id/btn_sharePlay"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:onClick="onClick"
+                android:padding="@dimen/smallPadding"
+                android:src="@android:drawable/ic_menu_share"
+                android:tint="?android:attr/colorAccent" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/smallPadding"
+            android:gravity="center"
+            android:orientation="horizontal">
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:drawablePadding="@dimen/smallPadding"
                 android:onClick="onClick"
                 android:text="@string/btn_fDroid"
-                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" /><ImageView
-        android:id="@+id/btn_openDroid"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:onClick="onClick"
-        android:padding="@dimen/smallPadding"
-        android:src="@android:drawable/ic_menu_view" /><ImageView
-        android:id="@+id/btn_shareDroid"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:onClick="onClick"
-        android:padding="@dimen/smallPadding"
-        android:src="@android:drawable/ic_menu_share" /></LinearLayout>
+                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" />
+
+            <ImageButton
+                android:id="@+id/btn_openDroid"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:onClick="onClick"
+                android:padding="@dimen/smallPadding"
+                android:src="@android:drawable/ic_menu_view"
+                android:tint="?android:attr/colorAccent" />
+
+            <ImageButton
+                android:id="@+id/btn_shareDroid"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:onClick="onClick"
+                android:padding="@dimen/smallPadding"
+                android:src="@android:drawable/ic_menu_share"
+                android:tint="?android:attr/colorAccent" />
+        </LinearLayout>
 
         </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a666df8..20275d6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -29,7 +29,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:text="@string/app_name" />
+            android:text="@string/app_name"
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" />
 
         <TextView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/config_module.xml b/app/src/main/res/layout/config_module.xml
index 1e48ebc..c7ba2bd 100644
--- a/app/src/main/res/layout/config_module.xml
+++ b/app/src/main/res/layout/config_module.xml
@@ -16,42 +16,53 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:drawableStart="@drawable/collapsed"
-            android:drawableLeft="@drawable/collapsed"
+            android:drawableStart="@drawable/arrow_right"
+            android:drawableLeft="@drawable/arrow_right"
             android:gravity="center_vertical"
             android:padding="5dp"
-            android:textSize="18sp"
-            android:textStyle="bold" /><ImageView
-        android:layout_width="2dp"
-        android:layout_height="match_parent"
-        android:layout_marginTop="3dp"
-        android:layout_marginBottom="3dp"
-        android:background="@android:color/darker_gray"
-        android:paddingBottom="2dp"
-        android:scaleType="centerInside" /><ImageButton
-        android:id="@+id/move_up"
-        style="?android:attr/buttonBarButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:adjustViewBounds="true"
-        android:src="@android:drawable/arrow_up_float" /><ImageButton
-        android:id="@+id/move_down"
-        style="?android:attr/buttonBarButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:adjustViewBounds="true"
-        android:src="@android:drawable/arrow_down_float" /><ImageView
-        android:layout_width="2dp"
-        android:layout_height="match_parent"
-        android:layout_marginTop="3dp"
-        android:layout_marginBottom="3dp"
-        android:background="@android:color/darker_gray"
-        android:scaleType="centerInside" /><Switch
-        android:id="@+id/enable"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent" />
+            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
+            android:textStyle="bold" />
 
-        </LinearLayout>
+        <ImageView
+            android:layout_width="2dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="3dp"
+            android:layout_marginBottom="3dp"
+            android:background="@android:color/darker_gray"
+            android:paddingBottom="2dp"
+            android:scaleType="centerInside" />
+
+        <ImageButton
+            android:id="@+id/move_up"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:adjustViewBounds="true"
+            android:rotation="180"
+            android:src="@drawable/arrow_down" />
+
+        <ImageButton
+            android:id="@+id/move_down"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:adjustViewBounds="true"
+            android:src="@drawable/arrow_down" />
+
+        <ImageView
+            android:layout_width="2dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="3dp"
+            android:layout_marginBottom="3dp"
+            android:background="@android:color/darker_gray"
+            android:scaleType="centerInside" />
+
+        <Switch
+            android:id="@+id/enable"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
 
     <FrameLayout
         android:id="@+id/box"
diff --git a/app/src/main/res/layout/dialog_history.xml b/app/src/main/res/layout/dialog_history.xml
index bfa6281..7599804 100644
--- a/app/src/main/res/layout/dialog_history.xml
+++ b/app/src/main/res/layout/dialog_history.xml
@@ -10,7 +10,8 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:minHeight="0dp"
-        android:src="@android:drawable/ic_media_rew" />
+        android:src="@android:drawable/ic_media_rew"
+        android:tint="?android:attr/colorAccent" />
 
     <ImageButton
         android:id="@+id/back"
@@ -19,7 +20,8 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:minHeight="0dp"
-        android:src="@android:drawable/ic_media_previous" />
+        android:src="@android:drawable/ic_media_previous"
+        android:tint="?android:attr/colorAccent" />
 
     <ImageButton
         android:id="@+id/list"
@@ -28,7 +30,8 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:minHeight="0dp"
-        android:src="@android:drawable/ic_menu_recent_history" />
+        android:src="@android:drawable/ic_menu_recent_history"
+        android:tint="?android:attr/colorAccent" />
 
     <ImageButton
         android:id="@+id/forward"
@@ -37,7 +40,8 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:minHeight="0dp"
-        android:src="@android:drawable/ic_media_next" />
+        android:src="@android:drawable/ic_media_next"
+        android:tint="?android:attr/colorAccent" />
 
     <ImageButton
         android:id="@+id/last"
@@ -46,6 +50,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:minHeight="0dp"
-        android:src="@android:drawable/ic_media_ff" />
+        android:src="@android:drawable/ic_media_ff"
+        android:tint="?android:attr/colorAccent" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_open.xml b/app/src/main/res/layout/dialog_open.xml
index 9e770d2..3cf6133 100644
--- a/app/src/main/res/layout/dialog_open.xml
+++ b/app/src/main/res/layout/dialog_open.xml
@@ -11,19 +11,32 @@
         android:layout_height="match_parent"
         android:src="@drawable/ctabs_off" />
 
-    <Button
-        android:id="@+id/open"
+    <LinearLayout
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:text="@string/mOpen_open" />
+        android:background="@drawable/open_both"
+        android:orientation="horizontal">
 
-    <ImageButton
-        android:id="@+id/open_with"
-        style="?android:attr/buttonBarButtonStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:src="@android:drawable/arrow_down_float" />
+        <Button
+            android:id="@+id/open"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:background="@drawable/open_left"
+            android:text="@string/mOpen_open"
+            android:textColor="?android:attr/colorBackground" />
+
+        <ImageButton
+            android:id="@+id/open_with"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:background="@drawable/open_right"
+            android:paddingRight="1dp"
+            android:src="@drawable/arrow_down" />
+
+    </LinearLayout>
 
     <Button
         android:id="@+id/share"
diff --git a/app/src/main/res/values-v21/colors.xml b/app/src/main/res/values-v21/colors.xml
new file mode 100644
index 0000000..4d36144
--- /dev/null
+++ b/app/src/main/res/values-v21/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="app">?android:attr/colorAccent</color>
+</resources>
\ No newline at end of file