diff --git a/app/build.gradle b/app/build.gradle
index 34155084f..dc912a3a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,7 +47,7 @@ ext {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.39.3'
+    compile 'com.simplemobiletools:commons:2.39.4'
     compile 'joda-time:joda-time:2.9.9'
     compile 'com.facebook.stetho:stetho:1.5.0'
     compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
diff --git a/app/src/main/res/layout/widget_config_list.xml b/app/src/main/res/layout/widget_config_list.xml
index ecaaae8d5..52fe1fb02 100644
--- a/app/src/main/res/layout/widget_config_list.xml
+++ b/app/src/main/res/layout/widget_config_list.xml
@@ -22,8 +22,8 @@
 
     <Button
         android:id="@+id/config_bg_color"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="@dimen/widget_colorpicker_size"
+        android:layout_height="@dimen/widget_colorpicker_size"
         android:layout_above="@+id/config_text_color"/>
 
     <RelativeLayout
@@ -46,8 +46,8 @@
 
     <Button
         android:id="@+id/config_text_color"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="@dimen/widget_colorpicker_size"
+        android:layout_height="@dimen/widget_colorpicker_size"
         android:layout_alignParentBottom="true"/>
 
     <Button
@@ -62,4 +62,5 @@
         android:text="@android:string/ok"
         android:textColor="@android:color/white"
         android:textSize="@dimen/big_text_size"/>
+
 </RelativeLayout>
diff --git a/app/src/main/res/layout/widget_config_monthly.xml b/app/src/main/res/layout/widget_config_monthly.xml
index 5167c7016..99c03d37f 100644
--- a/app/src/main/res/layout/widget_config_monthly.xml
+++ b/app/src/main/res/layout/widget_config_monthly.xml
@@ -17,8 +17,8 @@
 
     <Button
         android:id="@+id/config_bg_color"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="@dimen/widget_colorpicker_size"
+        android:layout_height="@dimen/widget_colorpicker_size"
         android:layout_above="@+id/config_text_color"/>
 
     <RelativeLayout
@@ -41,8 +41,8 @@
 
     <Button
         android:id="@+id/config_text_color"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="@dimen/widget_colorpicker_size"
+        android:layout_height="@dimen/widget_colorpicker_size"
         android:layout_alignParentBottom="true"/>
 
     <Button