diff --git a/res/drawable/ic_account_circle.xml b/res/drawable/ic_account_circle.xml
deleted file mode 100644
index 1d7efbd..0000000
--- a/res/drawable/ic_account_circle.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
-    <path
-        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2c-2.5 0-4.71-1.28-6-3.22.03-1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08-1.29 1.94-3.5 3.22-6 3.22z"
-        android:fillColor="#FFFFFFFF"/>
-</vector>
diff --git a/res/drawable/ic_account_circle_filled_24dp.xml b/res/drawable/ic_account_circle_filled_24dp.xml
new file mode 100644
index 0000000..0b5a993
--- /dev/null
+++ b/res/drawable/ic_account_circle_filled_24dp.xml
@@ -0,0 +1,29 @@
+<!--
+  Copyright (C) 2018 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,13.82 19.38,15.49 18.36,16.83z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13c1.94,0 3.5,-1.56 3.5,-3.5S13.94,6 12,6z"/>
+</vector>
diff --git a/res/drawable/ic_address_black_24dp.xml b/res/drawable/ic_address_black_24dp.xml
deleted file mode 100644
index b0e112c..0000000
--- a/res/drawable/ic_address_black_24dp.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M10 20v-6h4v6h4c.55 0 1-.45 1-1v-7h1.7c.46 0 .68-.57.33-.87L12.67 3.6c-.38-.34-.96-.34-1.34 0l-8.36 7.53c-.34.3-.13.87.33.87H5v7c0 .55.45 1 1 1h4z" />
-</vector>
diff --git a/res/drawable/ic_bloodtype_24dp.xml b/res/drawable/ic_bloodtype_24dp.xml
new file mode 100644
index 0000000..051fc26
--- /dev/null
+++ b/res/drawable/ic_bloodtype_24dp.xml
@@ -0,0 +1,35 @@
+<!--
+  Copyright (C) 2018 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,5.52l4.25,4.24c1.11,1.11 1.75,2.66 1.75,4.23c0,1.59 -0.64,3.14 -1.75,4.26C15.11,19.37 13.6,20 12,20s-3.11,-0.63 -4.25,-1.76C6.64,17.12 6,15.57 6,13.98c0,-1.57 0.64,-3.11 1.75,-4.22L12,5.52M12,2.69L6.34,8.34C4.78,9.9 4,11.98 4,13.98s0.78,4.11 2.34,5.67C7.9,21.21 9.95,22 12,22s4.1,-0.79 5.66,-2.35c1.56,-1.56 2.34,-3.67 2.34,-5.67s-0.78,-4.08 -2.34,-5.64L12,2.69L12,2.69z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11,9h2v6h-2z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M9,13l0,-2l6,0l-0,2z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M9,18l0,-2l6,0l-0,2z"/>
+</vector>
diff --git a/res/drawable/ic_bloodtype_black_24dp.xml b/res/drawable/ic_bloodtype_black_24dp.xml
deleted file mode 100644
index 8de1732..0000000
--- a/res/drawable/ic_bloodtype_black_24dp.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M17.7,7.9l-5-4.91c-0.39-0.38-1.01-0.38-1.4,0l-5,4.91c-3.1,3.1-3.1,8.2,0,11.3c1.6,1.6,3.6,2.3,5.7,2.3s4.1-0.8,5.7-2.3 C20.8,16.1,20.8,11.1,17.7,7.9z"/>
-</vector>
diff --git a/res/drawable/ic_favorite_border_24dp.xml b/res/drawable/ic_favorite_border_24dp.xml
new file mode 100644
index 0000000..593949d
--- /dev/null
+++ b/res/drawable/ic_favorite_border_24dp.xml
@@ -0,0 +1,26 @@
+<!--
+  Copyright (C) 2018 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3C4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5C22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1l-0.1,-0.1C7.14,14.24 4,11.39 4,8.5C4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5C20,11.39 16.86,14.24 12.1,18.55z"/>
+</vector>
diff --git a/res/drawable/ic_heart_black_24dp.xml b/res/drawable/ic_heart_black_24dp.xml
deleted file mode 100644
index 40084df..0000000
--- a/res/drawable/ic_heart_black_24dp.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
-    <path
-        android:pathData="M12.67 20.74c-.38.34-.96.34-1.34 0l-.78-.71C5.3 15.27 1.87 12.16 2 8.28c.06-1.7.93-3.33 2.34-4.29 2.64-1.8 5.9-.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41.96 2.28 2.59 2.34 4.29.14 3.88-3.3 6.99-8.55 11.76l-.78.7z"
-        android:fillColor="#FFFFFFFF"/>
-</vector>
diff --git a/res/drawable/ic_home_24dp.xml b/res/drawable/ic_home_24dp.xml
new file mode 100644
index 0000000..3bbd859
--- /dev/null
+++ b/res/drawable/ic_home_24dp.xml
@@ -0,0 +1,26 @@
+<!--
+  Copyright (C) 2018 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,3L4,9v12h16V9L12,3zM18,19h-3v-6H9v6H6v-9l6,-4.5l6,4.5V19z"/>
+</vector>
diff --git a/res/drawable/ic_medication_24dp.xml b/res/drawable/ic_medication_24dp.xml
index 03c2638..17f413e 100644
--- a/res/drawable/ic_medication_24dp.xml
+++ b/res/drawable/ic_medication_24dp.xml
@@ -1,25 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!--
+  Copyright (C) 2018 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
+  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
+       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.
--->
+  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.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M5.71 3h12.57c.95 0 1.72.67 1.72 1.5S19.23 6 18.29 6H5.71C4.77 6 4 5.33 4 4.5S4.77 3 5.71 3zM6 7v12c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6zm10 9H8V9h8v7z"/>
+        android:fillColor="#FFFFFF"
+        android:pathData="M10.5,15H8v-3h2.5V9.5h3V12H16v3h-2.5v2.5h-3V15zM19,8v11c0,1.1 -0.9,2 -2,2H7c-1.1,0 -2,-0.9 -2,-2V8c0,-1.1 0.9,-2 2,-2h10C18.1,6 19,6.9 19,8zM17,8H7v11h10V8zM18,3H6v2h12V3z"/>
 </vector>
diff --git a/res/drawable/ic_mode_edit_24dp.xml b/res/drawable/ic_mode_edit_24dp.xml
deleted file mode 100644
index c1a4463..0000000
--- a/res/drawable/ic_mode_edit_24dp.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp"
-    android:tint="?android:attr/colorControlNormal">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M3 18.08v2.42c0 .28.22.5.5.5h2.42c.53 0 1.04-.21 1.41-.59L17.81 9.94l-3.75-3.75L3.59 16.66c-.38.38-.59.89-.59 1.42zM20.71 7.04a.996.996 0 0 0 0-1.41l-2.34-2.34a.996.996 0 0 0-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/>
-</vector>
diff --git a/res/drawable/ic_note_alt_24dp.xml b/res/drawable/ic_note_alt_24dp.xml
new file mode 100644
index 0000000..98e9eb5
--- /dev/null
+++ b/res/drawable/ic_note_alt_24dp.xml
@@ -0,0 +1,35 @@
+<!--
+  Copyright (C) 2018 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.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7,15h7v2h-7z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7,11h10v2h-10z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7,7h10v2h-10z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M19,3L19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2H5h0C4.86,3 4.73,3.01 4.6,3.04C4.21,3.12 3.86,3.32 3.59,3.59c-0.18,0.18 -0.33,0.4 -0.43,0.64C3.06,4.46 3,4.72 3,5v14c0,0.27 0.06,0.54 0.16,0.78c0.1,0.24 0.25,0.45 0.43,0.64c0.27,0.27 0.62,0.47 1.01,0.55C4.73,20.99 4.86,21 5,21h0h14h0c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM12,2.75c0.41,0 0.75,0.34 0.75,0.75c0,0.41 -0.34,0.75 -0.75,0.75c-0.41,0 -0.75,-0.34 -0.75,-0.75C11.25,3.09 11.59,2.75 12,2.75zM19,19H5V5h14V19z"/>
+</vector>
diff --git a/res/drawable/ic_notes_black_24dp.xml b/res/drawable/ic_notes_black_24dp.xml
deleted file mode 100644
index bca9937..0000000
--- a/res/drawable/ic_notes_black_24dp.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:autoMirrored="true"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
-    <path
-        android:pathData="M19 3h-4.18C14.4 1.84 13.3 1 12 1c-1.3 0-2.4.84-2.82 2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-7 0c.55 0 1 .45 1 1s-.45 1-1 1-1-.45-1-1 .45-1 1-1zm2 14H7v-2h7v2zm3-4H7v-2h10v2zm0-4H7V7h10v2z"
-        android:fillColor="#FFFFFFFF"/>
-</vector>
diff --git a/res/drawable/view_contact_divider.xml b/res/drawable/view_contact_divider.xml
index 238eaac..c93d413 100644
--- a/res/drawable/view_contact_divider.xml
+++ b/res/drawable/view_contact_divider.xml
@@ -13,10 +13,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:insetLeft="72dp">
-    <shape xmlns:android="http://schemas.android.com/apk/res/android"
-        android:tint="?android:attr/colorForeground">
+    <shape android:tint="?android:attr/colorForeground">
         <solid android:color="#1f000000" />
         <size
             android:height="1dp"
diff --git a/res/menu/view_info_menu.xml b/res/menu/view_info_menu.xml
index 006cdae..c902968 100644
--- a/res/menu/view_info_menu.xml
+++ b/res/menu/view_info_menu.xml
@@ -16,7 +16,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_edit"
-        android:icon="@drawable/ic_mode_edit_24dp"
+        android:icon="@drawable/ic_mode_edit"
         android:title="@string/edit_info"
         android:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/res/xml/edit_emergency_info.xml b/res/xml/edit_emergency_info.xml
index f95e6db..5abab4b 100644
--- a/res/xml/edit_emergency_info.xml
+++ b/res/xml/edit_emergency_info.xml
@@ -23,7 +23,7 @@
         <com.android.emergency.preferences.NameAutoCompletePreference
             android:enabled="false"
             android:focusable="true"
-            android:icon="@drawable/ic_account_circle"
+            android:icon="@drawable/ic_account_circle_filled_24dp"
             android:inputType="textCapWords|textPersonName"
             android:key="name"
             android:selectable="false"
@@ -34,7 +34,7 @@
         <com.android.emergency.preferences.EmergencyEditTextPreference
             android:enabled="false"
             android:focusable="true"
-            android:icon="@drawable/ic_address_black_24dp"
+            android:icon="@drawable/ic_home_24dp"
             android:key="address"
             android:selectable="false"
             android:shouldDisableView="false"
@@ -44,7 +44,7 @@
             xmlns:app="http://schemas.android.com/apk/res/com.android.emergency"
             android:enabled="false"
             android:focusable="true"
-            android:icon="@drawable/ic_bloodtype_black_24dp"
+            android:icon="@drawable/ic_bloodtype_24dp"
             android:entries="@array/blood_type_entries"
             android:entryValues="@array/blood_type_values"
             android:key="blood_type"
@@ -74,7 +74,7 @@
         <com.android.emergency.preferences.EmergencyListPreference
             android:enabled="false"
             android:focusable="true"
-            android:icon="@drawable/ic_heart_black_24dp"
+            android:icon="@drawable/ic_favorite_border_24dp"
             android:entries="@array/organ_donor_entries"
             android:entryValues="@array/organ_donor_values"
             android:key="organ_donor"
@@ -85,7 +85,7 @@
         <com.android.emergency.preferences.EmergencyEditTextPreference
             android:enabled="false"
             android:focusable="true"
-            android:icon="@drawable/ic_notes_black_24dp"
+            android:icon="@drawable/ic_note_alt_24dp"
             android:key="medical_conditions"
             android:selectable="false"
             android:shouldDisableView="false"
@@ -93,7 +93,7 @@
 
         <Preference
             android:key="edit_medical_info"
-            android:icon="@drawable/ic_mode_edit_24dp"
+            android:icon="@drawable/ic_mode_edit"
             android:title="@string/edit_medical_info">
             <intent android:action="android.emergency.EDIT_MEDICAL_INFO"/>
         </Preference>
diff --git a/res/xml/edit_medical_info.xml b/res/xml/edit_medical_info.xml
index 5795e11..0087f8a 100644
--- a/res/xml/edit_medical_info.xml
+++ b/res/xml/edit_medical_info.xml
@@ -19,7 +19,7 @@
     android:key="edit_medical_info_settings">
 
     <com.android.emergency.preferences.NameAutoCompletePreference
-        android:icon="@drawable/ic_account_circle"
+        android:icon="@drawable/ic_account_circle_filled_24dp"
         android:inputType="textCapWords|textPersonName"
         android:key="name"
         android:singleLine="true"
@@ -28,7 +28,7 @@
         style="@style/NameAutoCompletePreference" />
 
     <com.android.emergency.preferences.EmergencyEditTextPreference
-        android:icon="@drawable/ic_address_black_24dp"
+        android:icon="@drawable/ic_home_24dp"
         android:inputType="textCapWords|textPostalAddress|textMultiLine"
         android:key="address"
         android:singleLine="false"
@@ -40,7 +40,7 @@
         android:defaultValue=""
         android:entries="@array/blood_type_entries"
         android:entryValues="@array/blood_type_values"
-        android:icon="@drawable/ic_bloodtype_black_24dp"
+        android:icon="@drawable/ic_bloodtype_24dp"
         android:key="blood_type"
         android:negativeButtonText="@null"
         android:positiveButtonText="@null"
@@ -73,7 +73,7 @@
     <com.android.emergency.preferences.EmergencyListPreference
         android:entries="@array/organ_donor_entries"
         android:entryValues="@array/organ_donor_values"
-        android:icon="@drawable/ic_heart_black_24dp"
+        android:icon="@drawable/ic_favorite_border_24dp"
         android:key="organ_donor"
         android:defaultValue=""
         android:negativeButtonText="@null"
@@ -85,7 +85,7 @@
         android:capitalize="sentences"
         android:hint="@string/medical_conditions_hint"
         android:textColorHint="@color/hint_text_color"
-        android:icon="@drawable/ic_notes_black_24dp"
+        android:icon="@drawable/ic_note_alt_24dp"
         android:inputType="textMultiLine"
         android:key="medical_conditions"
         android:singleLine="false"
diff --git a/res/xml/view_emergency_info.xml b/res/xml/view_emergency_info.xml
index 87a8fc1..ebbf9c6 100644
--- a/res/xml/view_emergency_info.xml
+++ b/res/xml/view_emergency_info.xml
@@ -12,11 +12,14 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res/com.android.emergency">
+
     <com.android.emergency.preferences.EmergencyEditTextPreference
         android:enabled="false"
         android:focusable="true"
-        android:icon="@drawable/ic_address_black_24dp"
+        android:icon="@drawable/ic_home_24dp"
         android:key="address"
         android:selectable="false"
         android:shouldDisableView="false"
@@ -24,10 +27,9 @@
         android:title="@string/address" />
 
     <com.android.emergency.preferences.EmergencyListPreference
-        xmlns:app="http://schemas.android.com/apk/res/com.android.emergency"
         android:enabled="false"
         android:focusable="true"
-        android:icon="@drawable/ic_bloodtype_black_24dp"
+        android:icon="@drawable/ic_bloodtype_24dp"
         android:entries="@array/blood_type_entries"
         android:entryValues="@array/blood_type_values"
         android:key="blood_type"
@@ -60,7 +62,7 @@
     <com.android.emergency.preferences.EmergencyListPreference
         android:enabled="false"
         android:focusable="true"
-        android:icon="@drawable/ic_heart_black_24dp"
+        android:icon="@drawable/ic_favorite_border_24dp"
         android:entries="@array/organ_donor_entries"
         android:entryValues="@array/organ_donor_values"
         android:key="organ_donor"
@@ -72,7 +74,7 @@
     <com.android.emergency.preferences.EmergencyEditTextPreference
         android:enabled="false"
         android:focusable="true"
-        android:icon="@drawable/ic_notes_black_24dp"
+        android:icon="@drawable/ic_note_alt_24dp"
         android:key="medical_conditions"
         android:selectable="false"
         android:shouldDisableView="false"
diff --git a/src/com/android/emergency/preferences/ContactPreference.java b/src/com/android/emergency/preferences/ContactPreference.java
index ff5e3cc..feb8d2d 100644
--- a/src/com/android/emergency/preferences/ContactPreference.java
+++ b/src/com/android/emergency/preferences/ContactPreference.java
@@ -150,7 +150,7 @@
             icon = new CircleFramedDrawable(mContact.getPhoto(),
                     (int) getContext().getResources().getDimension(R.dimen.circle_avatar_size));
         } else {
-            icon = getContext().getResources().getDrawable(R.drawable.ic_account_circle);
+            icon = getContext().getDrawable(R.drawable.ic_account_circle_filled_24dp);
         }
         setIcon(icon);
     }