diff --git a/res/drawable/call_button.xml b/res/drawable/call_button.xml
index c74e950..7b25fee 100644
--- a/res/drawable/call_button.xml
+++ b/res/drawable/call_button.xml
@@ -1,44 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true"
-          android:state_enabled="true" >
-        <shape android:shape="oval">
-            <gradient
-                android:startColor="#ccff00"
-                android:endColor="#99cc00"
-                android:angle="270" />
-            <stroke
-                android:width="3dp"
-                android:color="#99cc00" />
-            <corners
-                android:radius="3dp" />
-            <padding
-                android:left="10dp"
-                android:top="20dp"
-                android:right="10dp"
-                android:bottom="20dp" />
-        </shape>
-    </item>
+    <item android:state_enabled="true" android:state_pressed="true"><shape android:shape="oval">
+            <solid android:color="@color/sfl_dark_blue" />
 
-    
-    <item>        
-        <shape android:shape="oval">
-            <gradient
-                android:startColor="#99cc00"
-                android:endColor="#669900"
-                android:angle="270" />
-            <stroke
-                android:width="3dp"
-                android:color="#669900" />
-            <corners
-                android:radius="3dp" />
-            <padding
-                android:left="10dp"
-                android:top="20dp"
-                android:right="10dp"
-                android:bottom="20dp" />
-        </shape>
-    </item>
-</selector>
+            <stroke android:width="3dp" android:color="@color/sfl_action_blue" />
+        </shape></item>
+    <item><shape android:shape="oval">
+            <solid android:color="@color/sfl_light_blue" />
+
+            <stroke android:width="3dp" android:color="@color/sfl_action_blue" />
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/res/drawable/dialer_selector.xml b/res/drawable/dialer_selector.xml
new file mode 100644
index 0000000..16a4dfa
--- /dev/null
+++ b/res/drawable/dialer_selector.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true"><shape xmlns:android="http://schemas.android.com/apk/res/android">
+            <solid android:color="@color/sfl_light_blue" />
+
+            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+
+            <corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" />
+        </shape></item>
+    <item android:state_focused="true"><shape xmlns:android="http://schemas.android.com/apk/res/android">
+            <solid android:color="@color/sfl_light_blue" />
+
+            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+
+            <corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" />
+        </shape></item>
+    <item><shape xmlns:android="http://schemas.android.com/apk/res/android">
+            <solid android:color="@color/sfl_light_blue" />
+
+            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+
+            <corners android:bottomLeftRadius="5dp" android:bottomRightRadius="5dp" android:topLeftRadius="5dp" android:topRightRadius="5dp" />
+        </shape></item>
+
+</selector>
diff --git a/res/layout/clearable_edit_text.xml b/res/layout/clearable_edit_text.xml
index 609ca29..62e282c 100644
--- a/res/layout/clearable_edit_text.xml
+++ b/res/layout/clearable_edit_text.xml
@@ -7,11 +7,12 @@
         android:id="@+id/clearable_edit"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/white"
-        android:textSize="30sp"
+        android:hint="@string/dial_hint"
         android:imeActionLabel="@string/dial_action_call"
-            android:imeOptions="actionGo"
-        android:hint="@string/dial_hint" />
+        android:imeOptions="actionGo"
+        android:textColor="@color/white"
+        android:textColorHint="@color/white"
+        android:textSize="30sp" />
 
     <Button
         android:id="@+id/clearable_button_clear"
diff --git a/res/layout/frag_dialing.xml b/res/layout/frag_dialing.xml
index 43eb792..bfd57e7 100644
--- a/res/layout/frag_dialing.xml
+++ b/res/layout/frag_dialing.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:background="@drawable/item_contact_selector" />
+        android:background="@drawable/dialer_selector" />
 
     <LinearLayout
         android:id="@+id/keyboard_choice"
@@ -47,11 +47,11 @@
 
     <ImageButton
         android:id="@+id/buttonCall"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
         android:layout_below="@+id/keyboard_choice"
         android:layout_centerHorizontal="true"
-        android:background="@drawable/item_contact_selector"
+        android:background="@drawable/call_button"
         android:gravity="center_vertical"
         android:src="@drawable/ic_action_call" />