diff --git a/app/src/main/res/drawable/btn_keyboard_key.xml b/app/src/main/res/drawable/btn_keyboard_key.xml
index f1ee659..9399750 100644
--- a/app/src/main/res/drawable/btn_keyboard_key.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2008 The Android Open Source Project
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
@@ -11,21 +10,13 @@
      limitations under the License.
 -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Toggle keys. Use checkable/checked state. -->
 
-    <item android:state_checkable="true" android:state_checked="true"
-        android:state_pressed="true"
-        android:drawable="@drawable/btn_keyboard_key_pressed_on" />
-    <item android:state_checkable="true" android:state_pressed="true"
-        android:drawable="@drawable/btn_keyboard_key_pressed_off" />
-    <item android:state_checkable="true" android:state_checked="true"
-        android:drawable="@drawable/btn_keyboard_key_normal_on" />
-    <item android:state_checkable="true"
-        android:drawable="@drawable/btn_keyboard_key_normal_off" />
+    <item android:drawable="@drawable/btn_keyboard_key_pressed_on" android:state_checkable="true" android:state_checked="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_keyboard_key_pressed_off" android:state_checkable="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_keyboard_key_normal_on" android:state_checkable="true" android:state_checked="true" />
+    <item android:drawable="@drawable/btn_keyboard_key_normal_off" android:state_checkable="true" />
     <!-- Normal keys -->
-    <item android:state_pressed="true"
-        android:drawable="@drawable/btn_keyboard_key_pressed" />
-    <item
-        android:drawable="@drawable/btn_keyboard_key_normal" />
+    <item android:drawable="@drawable/btn_keyboard_key_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_keyboard_key_normal" />
 
 </selector>
diff --git a/app/src/main/res/drawable/ic_caps_outline_vector.xml b/app/src/main/res/drawable/ic_caps_outline_vector.xml
new file mode 100644
index 0000000..f38e09f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_caps_outline_vector.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M11.979 2.295c-0.318 0-0.635 0.12-0.877 0.363L4.144 9.615C3.36 10.4 3.922 11.742 5.03 11.742h1.979v8.711c0 0.685 0.56 1.244 1.244 1.244h7.467c0.684 0 1.244-0.56 1.244-1.244v-8.71h1.978c1.108 0 1.655-1.344 0.872-2.128l-6.957-6.957c-0.243-0.242-0.56-0.363-0.877-0.363zm0 2.312c0.206 0 0.412 0.096 0.57 0.287l4.52 4.102c0.509 0.62 0.152 1.676-0.567 1.682h-1.285v8.27c0 0.54-0.364 0.984-0.809 0.984h-4.85c-0.444 0-0.808-0.444-0.808-0.985v-8.27H7.465c-0.72 0-1.084-1.062-0.574-1.68l4.52-4.103c0.157-0.191 0.361-0.287 0.568-0.287z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_caps_vector.xml b/app/src/main/res/drawable/ic_caps_vector.xml
new file mode 100644
index 0000000..26d4671
--- /dev/null
+++ b/app/src/main/res/drawable/ic_caps_vector.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M8.75 10.677H7.465c-0.72 0-1.084-1.061-0.574-1.68l4.518-4.102c0.316-0.384 0.825-0.384 1.14 0l4.52 4.102c0.508 0.619 0.153 1.674-0.567 1.68h-1.285v8.271c0 0.54-0.364 0.983-0.808 0.983h-4.85c-0.445 0-0.81-0.442-0.81-0.983zm-1.743 1.066H5.03c-1.108 0-1.668-1.344-0.884-2.128l6.957-6.957c0.485-0.485 1.269-0.485 1.754 0l6.956 6.957c0.784 0.784 0.237 2.128-0.87 2.128h-1.98v8.71c0 0.685-0.56 1.245-1.244 1.245H8.252c-0.685 0-1.245-0.56-1.245-1.244z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_enter_vector.xml b/app/src/main/res/drawable/ic_enter_vector.xml
new file mode 100644
index 0000000..de99601
--- /dev/null
+++ b/app/src/main/res/drawable/ic_enter_vector.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M3.037 12.926l5.912 5.912c0.503 0.503 1.33 0.503 1.833 0 0.503-0.503 0.503-1.33 0-1.833L7.064 13.3h13.128c0.71 0 1.291-0.58 1.291-1.29V6.062c0-0.71-0.58-1.291-1.29-1.291-0.71 0-1.292 0.58-1.292 1.29v4.657H7.064l3.718-3.705c0.503-0.504 0.503-1.33 0-1.833-0.503-0.504-1.33-0.504-1.833 0l-5.912 5.912c-0.503 0.503-0.503 1.33 0 1.833z"/>
+</vector>
diff --git a/app/src/main/res/xml/keys_layout.xml b/app/src/main/res/xml/keys_layout.xml
index 84cabb0..2f95f24 100644
--- a/app/src/main/res/xml/keys_layout.xml
+++ b/app/src/main/res/xml/keys_layout.xml
@@ -75,7 +75,7 @@
             android:codes="-1"
             android:keyWidth="15%p"
             android:keyEdgeFlags="left"
-            android:keyLabel="CAPS" />
+            android:keyIcon="@drawable/ic_caps_outline_vector" />
         <Key
             android:codes="122"
             android:keyLabel="z" />
@@ -123,8 +123,7 @@
         <Key
             android:codes="-4"
             android:keyWidth="20%p"
-            android:keyBackground="@color/colorPrimary"
             android:keyEdgeFlags="right"
-            android:keyLabel="DONE" />
+            android:keyIcon="@drawable/ic_enter_vector" />
     </Row>
 </Keyboard>