diff --git a/java/Android.bp b/java/Android.bp
index 613b451488881b0cb0fbfd36f366e9d4a2e091f1..12ea76e946dd3f63c864330a44ef18a1733ee8ce 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -45,6 +45,7 @@ android_app {
         "jsr305",
         "latinime-common",
         "androidx.legacy_legacy-support-v4",
+        "elib",
     ],
 
     // Do not compress dictionary files to mmap dict data runtime
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 8c3bc005f4ae799d4dd37c22901b1346c84a485f..8b02fa595cf457922adde41190260b40b7b232bc 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -19,7 +19,7 @@
      package="com.android.inputmethod.latin"
      android:versionCode="30">
 
-    <uses-sdk android:minSdkVersion="21"
+    <uses-sdk android:minSdkVersion="29"
          android:targetSdkVersion="30"/>
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/java/res/drawable-night/ic_emoji_activity_you.xml b/java/res/drawable-night/ic_emoji_activity_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b916d4f9e1440c3796251b85d5b465487958f3e9
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_activity_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_activity_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_activity_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_activity_activated_lxx_dark" />
+    <item
+        android:drawable="@drawable/ic_emoji_activity_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_emoticons_you.xml b/java/res/drawable-night/ic_emoji_emoticons_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a8f167ac3850ae49f1c56e721d93ce375bc41b7a
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_emoticons_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_emoticons_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_flag_you.xml b/java/res/drawable-night/ic_emoji_flag_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8bd0fd7451bd7d18c0256e475cd23fbf95286278
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_flag_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_flag_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_flag_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_flag_activated_lxx_dark" />
+    <item
+        android:drawable="@drawable/ic_emoji_flag_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_food_you.xml b/java/res/drawable-night/ic_emoji_food_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..19d7d57007c4bfeb53ec7c85f21bf61c7b057dfb
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_food_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_food_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_food_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_food_activated_lxx_dark" />
+    <item
+        android:drawable="@drawable/ic_emoji_food_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_nature_you.xml b/java/res/drawable-night/ic_emoji_nature_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6f03e50b47fc2a1303af4c690284406e679092f7
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_nature_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_dark" />
+    <item
+        android:drawable="@drawable/ic_emoji_nature_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_objects_you.xml b/java/res/drawable-night/ic_emoji_objects_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cf150f4120403653f26416b6c7da346ac85dbb47
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_objects_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_objects_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_people_you.xml b/java/res/drawable-night/ic_emoji_people_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f91b5c4f3ca0f53ce63d346df401d941d1522914
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_people_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_people_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_places_you.xml b/java/res/drawable-night/ic_emoji_places_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ace036465e75190743715db360da24b3daee48e6
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_places_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_places_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_recents_you.xml b/java/res/drawable-night/ic_emoji_recents_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..50f0e086b07639343615c690effe18eef7ba94f9
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_recents_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_recents_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable-night/ic_emoji_symbols_you.xml b/java/res/drawable-night/ic_emoji_symbols_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d2dbc220d43de0b13d31f0bc21f7b09848ffd922
--- /dev/null
+++ b/java/res/drawable-night/ic_emoji_symbols_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_dark" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_dark" />
+    <item android:drawable="@drawable/ic_emoji_symbols_normal_lxx_dark" />
+</selector>
diff --git a/java/res/drawable/btn_keyboard_key_enter_normal_you.xml b/java/res/drawable/btn_keyboard_key_enter_normal_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eea5571d2ad29a1d76576ad67e881d5e0b33ac5a
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_enter_normal_you.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/keyboard_key_enter_normal_color_you" />
+
+    <padding android:left="1dp"
+             android:top="1dp"
+             android:right="1dp"
+             android:bottom="1dp" />
+
+    <corners android:radius="@dimen/keyboard_key_corner_radius_you" />
+</shape>
diff --git a/java/res/drawable/btn_keyboard_key_enter_pressed_you.xml b/java/res/drawable/btn_keyboard_key_enter_pressed_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..413b9cbb548b66b1d41a17e1fca75e26c872c582
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_enter_pressed_you.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/keyboard_key_enter_pressed_color_you"/>
+             
+    <padding android:left="1dp"
+             android:top="1dp"
+             android:right="1dp"
+             android:bottom="1dp" />
+
+    <corners android:radius="@dimen/keyboard_key_corner_radius_you" />
+</shape>
diff --git a/java/res/drawable/btn_keyboard_key_enter_you.xml b/java/res/drawable/btn_keyboard_key_enter_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e5491baa7cc106f3c37743e6c6401baab2102b45
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_enter_you.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_enter_pressed_you" />
+    <item android:drawable="@drawable/btn_keyboard_key_enter_normal_you" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_activity_you.xml b/java/res/drawable/ic_emoji_activity_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..801f8950a819253c04c19deb6808d51861cc56a6
--- /dev/null
+++ b/java/res/drawable/ic_emoji_activity_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_activity_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_activity_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_activity_activated_lxx_light" />
+    <item
+        android:drawable="@drawable/ic_emoji_activity_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_emoticons_you.xml b/java/res/drawable/ic_emoji_emoticons_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e1820906b1b382a7372096889de07132bda3fa39
--- /dev/null
+++ b/java/res/drawable/ic_emoji_emoticons_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_emoticons_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_emoticons_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_flag_you.xml b/java/res/drawable/ic_emoji_flag_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3632cfe581a1ba6c02d7dae326befd2fd7d19df1
--- /dev/null
+++ b/java/res/drawable/ic_emoji_flag_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_flag_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_flag_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_flag_activated_lxx_light" />
+    <item
+        android:drawable="@drawable/ic_emoji_flag_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_food_you.xml b/java/res/drawable/ic_emoji_food_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9da2c48fdb615ca3faaa7588b34deece3754a72a
--- /dev/null
+++ b/java/res/drawable/ic_emoji_food_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2015, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_food_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_food_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_food_activated_lxx_light" />
+    <item
+        android:drawable="@drawable/ic_emoji_food_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_nature_you.xml b/java/res/drawable/ic_emoji_nature_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..47525ad94c5720e2e16ac1cbb660288461366965
--- /dev/null
+++ b/java/res/drawable/ic_emoji_nature_you.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_nature_activated_lxx_light" />
+    <item
+        android:drawable="@drawable/ic_emoji_nature_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_objects_you.xml b/java/res/drawable/ic_emoji_objects_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..be7f32f785b8efd76732a68e7276103be84f630f
--- /dev/null
+++ b/java/res/drawable/ic_emoji_objects_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_objects_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_objects_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_people_you.xml b/java/res/drawable/ic_emoji_people_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..88394bf77a2a1b51344f28677eca2fb0a97dea91
--- /dev/null
+++ b/java/res/drawable/ic_emoji_people_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_people_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_people_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_places_you.xml b/java/res/drawable/ic_emoji_places_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..93d74f773bb49ba8300c2fef9d0d0558a45fbb78
--- /dev/null
+++ b/java/res/drawable/ic_emoji_places_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_places_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_places_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_recents_you.xml b/java/res/drawable/ic_emoji_recents_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f06480c512ee6672af3c508160e9060f30c18287
--- /dev/null
+++ b/java/res/drawable/ic_emoji_recents_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_recents_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_recents_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/ic_emoji_symbols_you.xml b/java/res/drawable/ic_emoji_symbols_you.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fb59399f5cce6f3438edd74a18bf04511a631274
--- /dev/null
+++ b/java/res/drawable/ic_emoji_symbols_you.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_light" />
+    <item
+        android:state_selected="true"
+        android:drawable="@drawable/ic_emoji_symbols_activated_lxx_light" />
+    <item android:drawable="@drawable/ic_emoji_symbols_normal_lxx_light" />
+</selector>
diff --git a/java/res/drawable/sym_keyboard_delete_you.xml b/java/res/drawable/sym_keyboard_delete_you.xml
index 0cd188692d82f81f19654e97ad6cf137c16362d4..4ebc1a8801324fe102641ee4f63f11a1fd937136 100644
--- a/java/res/drawable/sym_keyboard_delete_you.xml
+++ b/java/res/drawable/sym_keyboard_delete_you.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/icon_color_you"
-        android:pathData="M22,3H7C6.31,3 5.77,3.35 5.41,3.88L0,12L5.41,20.11C5.77,20.64 6.31,21 7,21H22A2,2 0 0,0 24,19V5A2,2 0 0,0 22,3M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12" />
+    android:viewportHeight="24"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@color/functional_text_color_you"
+      android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.9,0.89 1.59,0.89h15c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM22,19L7.07,19L2.4,12l4.66,-7L22,5v14zM10.41,17L14,13.41 17.59,17 19,15.59 15.41,12 19,8.41 17.59,7 14,10.59 10.41,7 9,8.41 12.59,12 9,15.59z"/>
 </vector>
diff --git a/java/res/drawable/sym_keyboard_language_switch_you.xml b/java/res/drawable/sym_keyboard_language_switch_you.xml
index a110e2ab0c7fa734e989bf916dd3b6dc7374b67c..9bfbc9274c6e2f4e203a825d7f0ffbfcaf8276f0 100644
--- a/java/res/drawable/sym_keyboard_language_switch_you.xml
+++ b/java/res/drawable/sym_keyboard_language_switch_you.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/icon_color_you"
+        android:fillColor="@color/functional_text_color_you"
         android:pathData="M16.36,14C16.44,13.34 16.5,12.68 16.5,12C16.5,11.32 16.44,10.66 16.36,10H19.74C19.9,10.64 20,11.31 20,12C20,12.69 19.9,13.36 19.74,14M14.59,19.56C15.19,18.45 15.65,17.25 15.97,16H18.92C17.96,17.65 16.43,18.93 14.59,19.56M14.34,14H9.66C9.56,13.34 9.5,12.68 9.5,12C9.5,11.32 9.56,10.65 9.66,10H14.34C14.43,10.65 14.5,11.32 14.5,12C14.5,12.68 14.43,13.34 14.34,14M12,19.96C11.17,18.76 10.5,17.43 10.09,16H13.91C13.5,17.43 12.83,18.76 12,19.96M8,8H5.08C6.03,6.34 7.57,5.06 9.4,4.44C8.8,5.55 8.35,6.75 8,8M5.08,16H8C8.35,17.25 8.8,18.45 9.4,19.56C7.57,18.93 6.03,17.65 5.08,16M4.26,14C4.1,13.36 4,12.69 4,12C4,11.31 4.1,10.64 4.26,10H7.64C7.56,10.66 7.5,11.32 7.5,12C7.5,12.68 7.56,13.34 7.64,14M12,4.03C12.83,5.23 13.5,6.57 13.91,8H10.09C10.5,6.57 11.17,5.23 12,4.03M18.92,8H15.97C15.65,6.75 15.19,5.55 14.59,4.44C16.43,5.07 17.96,6.34 18.92,8M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
 </vector>
diff --git a/java/res/drawable/sym_keyboard_send_you.xml b/java/res/drawable/sym_keyboard_send_you.xml
index 674c9c1e318e2fecd0c815e7932f637fbba11d72..6f8bbdb4302d9448e95e1b9d2e79b7278b8034e7 100644
--- a/java/res/drawable/sym_keyboard_send_you.xml
+++ b/java/res/drawable/sym_keyboard_send_you.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/icon_color_you"
-        android:pathData="M2,21L23,12L2,3V10L17,12L2,14V21Z" />
+    android:viewportHeight="24"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@color/icon_color_you"
+      android:pathData="M4.01,6.03l7.51,3.22 -7.52,-1 0.01,-2.22m7.5,8.72L4,17.97v-2.22l7.51,-1M2.01,3L2,10l15,2 -15,2 0.01,7L23,12 2.01,3z"/>
 </vector>
diff --git a/java/res/drawable/sym_keyboard_settings_you.xml b/java/res/drawable/sym_keyboard_settings_you.xml
index 1f47957a2e8db6eacd6cbec85ba69f1564a2b8a2..954f098efa610f115cdb1d3b5366abbe13b17daf 100644
--- a/java/res/drawable/sym_keyboard_settings_you.xml
+++ b/java/res/drawable/sym_keyboard_settings_you.xml
@@ -1,11 +1,9 @@
-<!-- drawable/cog.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/icon_color_you"
-        android:pathData="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" />
+  <path
+      android:fillColor="@color/functional_text_color_you"
+      android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98 0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
 </vector>
diff --git a/java/res/drawable/sym_keyboard_shift_you.xml b/java/res/drawable/sym_keyboard_shift_you.xml
index dbe359e4d9340e55935690afdcf5d9bf7145d801..af3d6418dc58395debb20625fbb1786b9a6422d5 100644
--- a/java/res/drawable/sym_keyboard_shift_you.xml
+++ b/java/res/drawable/sym_keyboard_shift_you.xml
@@ -1,15 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:translateY="24"
-        android:translateX="24"
-        android:rotation="180">
-
-        <path
-            android:fillColor="@color/shift_normal_color_you"
-            android:pathData="M9,4H15V12H19.84L12,19.84L4.16,12H9V4Z" />
-    </group>
+    android:width="20dp"
+    android:height="16dp"
+    android:viewportWidth="20"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M12.75,13.5V8H14.739L10,3.261L5.261,8H7.25V13.5H12.75ZM10,0.667L19.167,9.833H14.583V15.333H5.417V9.833H0.833L10,0.667Z"
+      android:fillColor="@color/shift_normal_color_you"/>
 </vector>
diff --git a/java/res/drawable/sym_keyboard_smiley_you.xml b/java/res/drawable/sym_keyboard_smiley_you.xml
index c86ede3cca4eb471069b7ad30868c7681e8ff806..22953cda94a77937b2b979f522caaa5ac5371357 100644
--- a/java/res/drawable/sym_keyboard_smiley_you.xml
+++ b/java/res/drawable/sym_keyboard_smiley_you.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
     android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
-    <path
-        android:fillColor="@color/icon_color_you"
-        android:pathData="M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M15.5,8A1.5,1.5 0 0,1 17,9.5A1.5,1.5 0 0,1 15.5,11A1.5,1.5 0 0,1 14,9.5A1.5,1.5 0 0,1 15.5,8M8.5,8A1.5,1.5 0 0,1 10,9.5A1.5,1.5 0 0,1 8.5,11A1.5,1.5 0 0,1 7,9.5A1.5,1.5 0 0,1 8.5,8M12,17.5C9.67,17.5 7.69,16.04 6.89,14H17.11C16.3,16.04 14.33,17.5 12,17.5Z" />
+  <path
+      android:fillColor="@color/functional_text_color_you"
+      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM15.5,11c0.83,0 1.5,-0.67 1.5,-1.5S16.33,8 15.5,8 14,8.67 14,9.5s0.67,1.5 1.5,1.5zM8.5,11c0.83,0 1.5,-0.67 1.5,-1.5S9.33,8 8.5,8 7,8.67 7,9.5 7.67,11 8.5,11zM12,17.5c2.33,0 4.31,-1.46 5.11,-3.5L6.89,14c0.8,2.04 2.78,3.5 5.11,3.5z"/>
 </vector>
diff --git a/java/res/values-night/themes-you-colors.xml b/java/res/values-night/themes-you-colors.xml
index 9b109d7ea464c144664c6e7d7042fc8f4eb68335..5052a5ca0be28f2aa2ff656aa933f595b6eaa7ab 100644
--- a/java/res/values-night/themes-you-colors.xml
+++ b/java/res/values-night/themes-you-colors.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <color name="keyboard_background_you">@android:color/system_neutral1_1000</color>
-    <color name="keyboard_key_normal_color_you">@android:color/system_neutral1_800</color>
-    <color name="keyboard_key_pressed_color_you">@android:color/system_neutral1_900</color>
-    <color name="keyboard_key_text_color_you">@android:color/system_accent1_10</color>
-    <color name="functional_text_color_you">@color/keyboard_key_text_color_you</color>
-    <color name="category_page_indicator_color">@android:color/system_accent3_200</color>
-    <color name="icon_color_you">@android:color/system_accent3_100</color>
-    <color name="functional_normal_color_you">@android:color/system_neutral2_800</color>
-    <color name="functional_pressed_color_you">@android:color/system_neutral2_900</color>
-    <color name="shift_normal_color_you">@android:color/system_neutral1_400</color>
-    <color name="shift_locked_color_you">@android:color/system_accent1_10</color>
     <color name="key_hint_letter_color_you">@color/key_hint_letter_color_lxx_dark</color>
     <color name="typed_word_color_you">@color/typed_word_color_lxx_dark</color>
     <color name="auto_correct_color_you">@color/auto_correct_color_lxx_dark</color>
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 69a5d59afc87b81cc823f6dafcc203bf6a8fa861..1b9bb52262f41e3bc9bd707dcdeaa84fceb56e59 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -52,6 +52,10 @@
              {@link android.graphics.drawable.StateListDrawable}, with the following possible
              states: normal, pressed. -->
         <attr name="functionalKeyBackground" format="reference" />
+        <!-- Background image for the enterkey.  This image needs to be a
+             {@link android.graphics.drawable.StateListDrawable}, with the following possible
+             states: normal, pressed. -->
+        <attr name="enterKeyBackground" format="reference" />
         <!-- Background image for the spacebar.  This image needs to be a
              {@link android.graphics.drawable.StateListDrawable}, with the following possible
              states: normal, pressed. -->
@@ -314,6 +318,7 @@
             <enum name="stickyOn" value="4" />
             <enum name="action" value="5" />
             <enum name="spacebar" value="6" />
+            <enum name="enter" value="7" />
         </attr>
         <!-- The key action flags. -->
         <attr name="keyActionFlags" format="integer">
diff --git a/java/res/values/themes-you-colors.xml b/java/res/values/themes-you-colors.xml
index 456a10d5c9c57c57d84a8096cb5d18da804d9de1..8892601bf9a78a6e86f0fa493d0c94865d6bb329 100644
--- a/java/res/values/themes-you-colors.xml
+++ b/java/res/values/themes-you-colors.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <color name="keyboard_background_you">@android:color/system_accent3_10</color>
-    <color name="keyboard_key_normal_color_you">@android:color/system_neutral1_100</color>
-    <color name="keyboard_key_pressed_color_you">@android:color/system_neutral1_200</color>
-    <color name="keyboard_key_text_color_you">@android:color/system_accent1_900</color>
+    <color name="keyboard_background_you">@color/e_keyboard_background</color>
+    <color name="keyboard_key_normal_color_you">@color/e_keyboard_key_background</color>
+    <color name="keyboard_key_pressed_color_you">@color/e_keyboard_key_pressed_background</color>
+    <color name="keyboard_key_text_color_you">@color/e_keyboard_key_text</color>
     <color name="functional_text_color_you">@color/keyboard_key_text_color_you</color>
-    <color name="category_page_indicator_color">@android:color/system_accent3_200</color>
-    <color name="icon_color_you">@android:color/system_accent3_800</color>
-    <color name="functional_normal_color_you">@android:color/system_neutral2_100</color>
-    <color name="functional_pressed_color_you">@android:color/system_neutral2_200</color>
-    <color name="shift_normal_color_you">@android:color/system_neutral1_800</color>
-    <color name="shift_locked_color_you">@android:color/system_accent1_1000</color>
+    <color name="category_page_indicator_color">@color/e_accent</color>
+    <color name="icon_color_you">@color/keyboard_background_you</color>
+    <color name="functional_normal_color_you">@color/e_keyboard_functional_background</color>
+    <color name="functional_pressed_color_you">@color/e_keyboard_functional_pressed_background</color>
+    <color name="keyboard_key_enter_normal_color_you">@color/e_keyboard_key_enter_background</color>
+    <color name="keyboard_key_enter_pressed_color_you">@color/e_keyboard_key_enter_pressed_background</color>
+    <color name="shift_normal_color_you">@color/functional_text_color_you</color>
+    <color name="shift_locked_color_you">@color/functional_text_color_you</color>
     <color name="key_hint_letter_color_you">@color/key_hint_letter_color_lxx_light</color>
     <color name="typed_word_color_you">@color/typed_word_color_lxx_light</color>
     <color name="auto_correct_color_you">@color/auto_correct_color_lxx_light</color>
     <color name="suggested_word_color_you">@color/suggested_word_color_lxx_light</color>
     <color name="highlight_color_you">@color/highlight_color_lxx_light</color>
+    <color name="keyboard_navigation_bar">@color/keyboard_background_you</color>
 </resources>
diff --git a/java/res/values/themes-you.xml b/java/res/values/themes-you.xml
index 178513464cad09935e280ab49e0b0ae14c65f2bb..cb7bb7f52f1dd9851f0c7f85c7468faeaa3c22f8 100644
--- a/java/res/values/themes-you.xml
+++ b/java/res/values/themes-you.xml
@@ -74,6 +74,7 @@
         <item name="keyBackground">@drawable/btn_keyboard_key_you</item>
         <item name="functionalKeyBackground">@drawable/btn_keyboard_key_functional_you</item>
         <item name="spacebarBackground">@drawable/btn_keyboard_key_you</item>
+        <item name="enterKeyBackground">@drawable/btn_keyboard_key_enter_you</item>
         <item name="keyTextColor">@color/keyboard_key_text_color_you</item>
         <item name="keyTextInactivatedColor">@color/functional_text_color_you</item>
         <item name="functionalTextColor">@color/functional_text_color_you</item>
@@ -112,23 +113,23 @@
         <item name="categoryIndicatorEnabled">false</item>
         <item name="categoryPageIndicatorColor">@color/category_page_indicator_color</item>
         <item name="categoryPageIndicatorBackground">@null</item>
-        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_lxx_dark</item>
-        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_people_lxx_dark</item>
-        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_objects_lxx_dark</item>
-        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_nature_lxx_dark</item>
-        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_lxx_dark</item>
-        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_lxx_dark</item>
-        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_lxx_dark</item>
-        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_lxx_dark</item>
-        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_lxx_dark</item>
-        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_lxx_dark</item>
-        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_lxx_dark</item>
-        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_lxx_dark</item>
-        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_lxx_dark</item>
-        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_lxx_dark</item>
-        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_lxx_dark</item>
-        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_lxx_dark</item>
-        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_lxx_dark</item>
+        <item name="iconEmojiRecentsTab">@drawable/ic_emoji_recents_you</item>
+        <item name="iconEmojiCategory1Tab">@drawable/ic_emoji_people_you</item>
+        <item name="iconEmojiCategory2Tab">@drawable/ic_emoji_objects_you</item>
+        <item name="iconEmojiCategory3Tab">@drawable/ic_emoji_nature_you</item>
+        <item name="iconEmojiCategory4Tab">@drawable/ic_emoji_places_you</item>
+        <item name="iconEmojiCategory5Tab">@drawable/ic_emoji_symbols_you</item>
+        <item name="iconEmojiCategory6Tab">@drawable/ic_emoji_emoticons_you</item>
+        <item name="iconEmojiCategory7Tab">@drawable/ic_emoji_flag_you</item>
+        <item name="iconEmojiCategory8Tab">@drawable/ic_emoji_people_you</item>
+        <item name="iconEmojiCategory9Tab">@drawable/ic_emoji_nature_you</item>
+        <item name="iconEmojiCategory10Tab">@drawable/ic_emoji_food_you</item>
+        <item name="iconEmojiCategory11Tab">@drawable/ic_emoji_places_you</item>
+        <item name="iconEmojiCategory12Tab">@drawable/ic_emoji_activity_you</item>
+        <item name="iconEmojiCategory13Tab">@drawable/ic_emoji_objects_you</item>
+        <item name="iconEmojiCategory14Tab">@drawable/ic_emoji_symbols_you</item>
+        <item name="iconEmojiCategory15Tab">@drawable/ic_emoji_flag_you</item>
+        <item name="iconEmojiCategory16Tab">@drawable/ic_emoji_people_you</item>
     </style>
     <style
         name="MoreKeysKeyboard.You"
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
index 562278e3aa1ba760610470d140e7a88ea808f50f..50bac2fc3245e4ad5e5966b5d7ba2bef82cf9505 100644
--- a/java/res/xml/key_styles_enter.xml
+++ b/java/res/xml/key_styles_enter.xml
@@ -229,7 +229,7 @@
                 latin:keySpec="!icon/enter_key|!code/key_enter"
                 latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor"
                 latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="functional"
+                latin:backgroundType="enter"
                 latin:parentStyle="navigateMoreKeysStyle" />
         </case>
         <!-- keyboardTheme="LXXLight|LXXDark" -->
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index 299d1b7c5e347ba9c309000bb81f52b34e90c494..3f85fd16e5594e1cfc52eb717189bf95a22be632 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -156,6 +156,7 @@ public class Key implements Comparable<Key> {
     public static final int BACKGROUND_TYPE_STICKY_ON = 4;
     public static final int BACKGROUND_TYPE_ACTION = 5;
     public static final int BACKGROUND_TYPE_SPACEBAR = 6;
+    public static final int BACKGROUND_TYPE_ENTER = 7;
 
     private final int mActionFlags;
     private static final int ACTION_FLAGS_IS_REPEATABLE = 0x01;
@@ -555,6 +556,7 @@ public class Key implements Comparable<Key> {
         case BACKGROUND_TYPE_STICKY_ON: return "stickyOn";
         case BACKGROUND_TYPE_ACTION: return "action";
         case BACKGROUND_TYPE_SPACEBAR: return "spacebar";
+        case BACKGROUND_TYPE_ENTER: return "enter";
         default: return null;
         }
     }
@@ -978,6 +980,8 @@ public class Key implements Comparable<Key> {
             new KeyBackgroundState(android.R.attr.state_active),
             // 6: BACKGROUND_TYPE_SPACEBAR
             new KeyBackgroundState(),
+            // 7: BACKGROUND_TYPE_ENTER
+            new KeyBackgroundState(),
         };
     }
 
@@ -989,12 +993,15 @@ public class Key implements Comparable<Key> {
     @Nonnull
     public final Drawable selectBackgroundDrawable(@Nonnull final Drawable keyBackground,
             @Nonnull final Drawable functionalKeyBackground,
+            @Nonnull final Drawable enterBackground,
             @Nonnull final Drawable spacebarBackground) {
         final Drawable background;
-        if (mBackgroundType == BACKGROUND_TYPE_FUNCTIONAL) {
+        if (mBackgroundType == BACKGROUND_TYPE_FUNCTIONAL || mBackgroundType == BACKGROUND_TYPE_STICKY_OFF || mBackgroundType == BACKGROUND_TYPE_STICKY_ON) {
             background = functionalKeyBackground;
         } else if (mBackgroundType == BACKGROUND_TYPE_SPACEBAR) {
             background = spacebarBackground;
+        } else if (mBackgroundType == BACKGROUND_TYPE_ENTER) {
+            background = enterBackground;
         } else {
             background = keyBackground;
         }
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index cd5073dacec22de2d004fd551fc184500b308b8d..899ffb93334020f8e8b0e24d30b037afcafaaa26 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -93,6 +93,7 @@ public class KeyboardView extends View {
     private final float mVerticalCorrection;
     private final Drawable mKeyBackground;
     private final Drawable mFunctionalKeyBackground;
+    private final Drawable mEnterKeyBackground;
     private final Drawable mSpacebarBackground;
     private final float mSpacebarIconWidthRatio;
     private final Rect mKeyBackgroundPadding = new Rect();
@@ -139,6 +140,9 @@ public class KeyboardView extends View {
                 R.styleable.KeyboardView_functionalKeyBackground);
         mFunctionalKeyBackground = (functionalKeyBackground != null) ? functionalKeyBackground
                 : mKeyBackground;
+        final Drawable enterKeyBackground = keyboardViewAttr.getDrawable(
+                R.styleable.KeyboardView_enterKeyBackground);
+        mEnterKeyBackground = (enterKeyBackground!= null) ? enterKeyBackground : mFunctionalKeyBackground;
         final Drawable spacebarBackground = keyboardViewAttr.getDrawable(
                 R.styleable.KeyboardView_spacebarBackground);
         mSpacebarBackground = (spacebarBackground != null) ? spacebarBackground : mKeyBackground;
@@ -340,7 +344,7 @@ public class KeyboardView extends View {
 
         if (!key.isSpacer()) {
             final Drawable background = key.selectBackgroundDrawable(
-                    mKeyBackground, mFunctionalKeyBackground, mSpacebarBackground);
+                    mKeyBackground, mFunctionalKeyBackground, mEnterKeyBackground, mSpacebarBackground);
             if (background != null) {
                 onDrawKeyBackground(key, canvas, background);
             }
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 8ed3a59bf583bda57e6a2d88b986296da0da5717..85369e14cdf93fee0f3284c0f1e2d1a3a2427629 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -16,6 +16,7 @@
 
 package com.android.inputmethod.latin;
 
+import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;
 import static com.android.inputmethod.latin.common.Constants.ImeOption.FORCE_ASCII;
 import static com.android.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE;
 import static com.android.inputmethod.latin.common.Constants.ImeOption.NO_MICROPHONE_COMPAT;
@@ -72,6 +73,7 @@ import com.android.inputmethod.event.InputTransaction;
 import com.android.inputmethod.keyboard.Keyboard;
 import com.android.inputmethod.keyboard.KeyboardActionListener;
 import com.android.inputmethod.keyboard.KeyboardId;
+import com.android.inputmethod.keyboard.KeyboardLayoutSet;
 import com.android.inputmethod.keyboard.KeyboardSwitcher;
 import com.android.inputmethod.keyboard.MainKeyboardView;
 import com.android.inputmethod.latin.Suggest.OnGetSuggestedWordsCallback;
@@ -788,6 +790,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
                 cleanupInternalStateForFinishInput();
             }
         }
+        KeyboardLayoutSet.onKeyboardThemeChanged();
         super.onConfigurationChanged(conf);
     }
 
@@ -2008,11 +2011,24 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
     }
 
     private void setNavigationBarVisibility(final boolean visible) {
-        if (BuildCompatUtils.EFFECTIVE_SDK_INT > Build.VERSION_CODES.M) {
+        if (BuildCompatUtils.EFFECTIVE_SDK_INT > Build.VERSION_CODES.R) {
             // For N and later, IMEs can specify Color.TRANSPARENT to make the navigation bar
             // transparent.  For other colors the system uses the default color.
             getWindow().getWindow().setNavigationBarColor(
-                    visible ? Color.BLACK : Color.TRANSPARENT);
+                    visible ? getColor(R.color.keyboard_navigation_bar) : Color.TRANSPARENT);
+
+            if (visible) {
+                final Configuration configuration = getResources().getConfiguration();
+                final boolean isNightMode = (configuration.uiMode & Configuration.UI_MODE_NIGHT_MASK)
+                        == Configuration.UI_MODE_NIGHT_YES;
+                if (!isNightMode) {
+                    getWindow().getWindow().getInsetsController().setSystemBarsAppearance(
+                            APPEARANCE_LIGHT_NAVIGATION_BARS, APPEARANCE_LIGHT_NAVIGATION_BARS);
+                } else {
+                    getWindow().getWindow().getInsetsController().setSystemBarsAppearance(
+                            0, APPEARANCE_LIGHT_NAVIGATION_BARS);
+                }
+            }
         }
     }
 }