diff --git a/app/build.gradle b/app/build.gradle
index 7370067dd..41127f32e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,7 @@ android {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.0.1'
+    compile 'com.simplemobiletools:commons:2.0.2'
     compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
     compile 'com.theartofdev.edmodo:android-image-cropper:2.3.1'
     compile 'com.booking:rtlviewpager:1.0.1'
diff --git a/app/src/main/res/drawable/actionbar_gradient_background.xml b/app/src/main/res/drawable/actionbar_gradient_background.xml
index 15b617cd2..e84812125 100644
--- a/app/src/main/res/drawable/actionbar_gradient_background.xml
+++ b/app/src/main/res/drawable/actionbar_gradient_background.xml
@@ -3,5 +3,5 @@
     <gradient
         android:angle="270"
         android:endColor="@android:color/transparent"
-        android:startColor="@color/actionbar_grey"/>
+        android:startColor="@color/gradient_grey_start"/>
 </shape>
diff --git a/app/src/main/res/drawable/gradient_background.xml b/app/src/main/res/drawable/gradient_background.xml
index f23f66d58..68f8cc819 100644
--- a/app/src/main/res/drawable/gradient_background.xml
+++ b/app/src/main/res/drawable/gradient_background.xml
@@ -3,5 +3,5 @@
     <gradient
         android:angle="90"
         android:endColor="@android:color/transparent"
-        android:startColor="@color/actionbar_grey"/>
+        android:startColor="@color/gradient_grey_start"/>
 </shape>
diff --git a/app/src/main/res/layout/dialog_change_sorting.xml b/app/src/main/res/layout/dialog_change_sorting.xml
index e4cb69a21..3dea20d4b 100644
--- a/app/src/main/res/layout/dialog_change_sorting.xml
+++ b/app/src/main/res/layout/dialog_change_sorting.xml
@@ -17,7 +17,8 @@
         <RadioGroup
             android:id="@+id/sorting_dialog_radio_sorting"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/medium_margin">
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/sorting_dialog_radio_name"
@@ -53,17 +54,14 @@
 
         </RadioGroup>
 
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="1px"
-            android:layout_marginBottom="@dimen/medium_margin"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="@color/divider_grey"/>
+        <include
+            layout="@layout/divider"/>
 
         <RadioGroup
             android:id="@+id/sorting_dialog_radio_order"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin">
 
             <com.simplemobiletools.commons.views.MyCompatRadioButton
                 android:id="@+id/sorting_dialog_radio_ascending"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4ac63d746..53dc395fc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="actionbar_grey">#AA000000</color>
-
-    <!-- Color Customization -->
+    <!-- Default colors -->
     <color name="default_text_color">#FFEDEDED</color>
     <color name="default_background_color">#FF3F3F3F</color>
 </resources>