diff --git a/res/drawable/fod_icon_cherish.png b/res/drawable/fod_icon_cherish.png
new file mode 100644
index 0000000..ca423f4
Binary files /dev/null and b/res/drawable/fod_icon_cherish.png differ
diff --git a/res/drawable/fod_icon_evo1.xml b/res/drawable/fod_icon_evo1.xml
deleted file mode 100644
index f3decad..0000000
--- a/res/drawable/fod_icon_evo1.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2019-2020 The Evolution X 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="560dp"
-    android:height="560dp"
-    android:viewportWidth="560"
-    android:viewportHeight="560">
-    <path
-        android:fillColor="#fff"
-        android:fillAlpha="0.5"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1"
-        android:pathData="M335.5,369.75 L323.5,422.25 L190,303.75 L202,258.75 L334,258.75 L370,303.75 L260.5,303.75 L335.5,369.75 Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillAlpha="0.5"
-        android:strokeAlpha="0.5"
-        android:strokeWidth="1"
-        android:pathData="M196,159.75 L370,159.75 L358,204.75 L244,204.75 L196,159.75 Z" />
-    <path
-        android:fillColor="#fff"
-        android:pathData="M323.5,427.25 A5,5,0,0,1,320.18,425.99 L186.68,307.49 A5,5,0,0,1,185.17,302.49 L197.17,257.49 A5,5,0,0,1,202,253.78 L334,253.78 A5,5,0,0,1,337.9,255.66 L373.9,300.66 A5,5,0,0,1,370,308.78 L273.75,308.78 L338.8,366 A5,5,0,0,1,340.37,370.86 L328.37,423.36 A5,5,0,0,1,325,427 A5,5,0,0,1,323.5,427.25 Z M195.63,302.06 L320.51,412.91 L330,371.54 L257.24,307.54 A5,5,0,0,1,260.54,298.79 L359.64,298.79 L331.64,263.79 L205.84,263.79 Z" />
-    <path
-        android:fillColor="#fff"
-        android:pathData="M358,209.75 L244,209.75 A5,5,0,0,1,240.58,208.4 L192.58,163.4 A5,5,0,0,1,196,154.75 L370,154.75 A5,5,0,0,1,374.83,161.04 L362.83,206.04 A5,5,0,0,1,358,209.75 Z M246,199.75 L354.16,199.75 L363.49,164.75 L208.64,164.75 Z" />
-    <path
-        android:strokeColor="@*android:color/accent_device_default_dark"
-        android:strokeWidth="16"
-        android:strokeMiterLimit="10"
-        android:pathData="M280,40 C412.548,40,520,147.452,520,280 C520,412.548,412.548,520,280,520 C147.452,520,40,412.548,40,280 C40,147.452,147.452,40,280,40 Z" />
-</vector>
diff --git a/res/drawable/fod_icon_octavi.xml b/res/drawable/fod_icon_octavi.xml
deleted file mode 100644
index e1d2f7b..0000000
--- a/res/drawable/fod_icon_octavi.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="vector"
-    android:width="26dp"
-    android:height="26dp"
-    android:viewportWidth="26"
-    android:viewportHeight="26">
-    <group android:name="group">
-        <path
-            android:name="path"
-            android:pathData="M 21.025 9.82 C 21.002 10.343 20.983 10.694 20.972 11.045 C 20.972 11.092 20.959 11.137 20.934 11.176 C 20.908 11.216 20.872 11.246 20.829 11.265 Q 18.468 12.571 16.109 13.882 C 16.081 13.897 16.054 13.914 16.026 13.927 C 15.995 13.945 15.958 13.952 15.922 13.947 C 15.887 13.942 15.854 13.925 15.829 13.898 C 15.804 13.872 15.789 13.838 15.786 13.802 L 15.786 13.587 Q 15.781 12.845 15.775 12.103 C 15.775 12.019 15.768 11.934 15.775 11.849 C 15.776 11.81 15.766 11.772 15.744 11.74 C 15.723 11.708 15.692 11.683 15.656 11.669 Q 14.956 11.274 14.256 10.875 C 14.162 10.815 14.064 10.761 13.964 10.711 C 13.934 10.7 13.907 10.681 13.888 10.654 C 13.87 10.628 13.86 10.597 13.86 10.565 C 13.86 10.532 13.87 10.501 13.888 10.475 C 13.907 10.448 13.934 10.429 13.964 10.418 C 14.842 9.937 15.716 9.449 16.591 8.964 C 17.191 8.633 17.785 8.303 18.38 7.969 C 18.422 7.943 18.469 7.927 18.518 7.923 C 18.566 7.919 18.616 7.926 18.661 7.945 C 19.405 8.211 20.151 8.472 20.895 8.735 C 21.044 8.787 21.065 8.814 21.059 8.96 C 21.05 9.302 21.033 9.647 21.025 9.82 Z M 16.341 13.149 C 16.39 13.123 16.424 13.107 16.456 13.089 L 18.439 11.989 L 20.339 10.935 C 20.383 10.91 20.415 10.888 20.417 10.835 C 20.437 10.298 20.462 9.762 20.484 9.226 C 20.484 9.141 20.484 9.141 20.397 9.109 C 19.822 8.909 19.247 8.709 18.673 8.5 C 18.643 8.487 18.61 8.482 18.577 8.484 C 18.544 8.487 18.513 8.498 18.485 8.516 Q 16.685 9.516 14.878 10.516 C 14.848 10.532 14.811 10.542 14.793 10.577 L 14.883 10.629 C 15.244 10.835 15.605 11.043 15.967 11.247 C 16.078 11.301 16.171 11.386 16.236 11.491 C 16.3 11.595 16.334 11.717 16.332 11.84 C 16.332 12.094 16.332 12.348 16.338 12.601 C 16.342 12.778 16.342 12.955 16.342 13.149 Z"
-            android:fillColor="#000"
-            android:strokeWidth="1"/>
-        <path
-            android:name="path_1"
-            android:pathData="M 4.977 9.994 L 4.933 8.95 C 4.927 8.818 4.948 8.788 5.086 8.739 Q 6.219 8.339 7.351 7.939 C 7.388 7.923 7.429 7.917 7.47 7.92 C 7.51 7.923 7.549 7.935 7.584 7.956 Q 9.796 9.186 12.01 10.412 C 12.075 10.448 12.125 10.489 12.126 10.564 C 12.125 10.598 12.114 10.631 12.094 10.658 C 12.075 10.686 12.048 10.707 12.016 10.719 L 11.195 11.186 C 10.916 11.345 10.637 11.507 10.356 11.663 C 10.314 11.681 10.279 11.711 10.255 11.749 C 10.231 11.787 10.22 11.832 10.222 11.877 C 10.222 12.443 10.216 13.01 10.212 13.577 C 10.209 13.644 10.209 13.71 10.212 13.777 C 10.212 13.819 10.197 13.859 10.169 13.89 C 10.141 13.921 10.103 13.94 10.061 13.944 C 10.02 13.949 9.979 13.937 9.945 13.913 C 9.578 13.703 9.205 13.501 8.834 13.295 L 5.189 11.272 C 5.161 11.257 5.133 11.242 5.106 11.226 C 5.082 11.211 5.062 11.19 5.048 11.165 C 5.035 11.14 5.028 11.112 5.029 11.084 C 5.014 10.72 4.997 10.355 4.981 9.991 Z M 11.2 10.578 C 11.174 10.546 11.139 10.523 11.1 10.51 C 9.934 9.863 8.767 9.218 7.6 8.566 C 7.543 8.528 7.477 8.506 7.408 8.5 C 7.34 8.494 7.271 8.505 7.208 8.532 C 6.674 8.732 6.134 8.915 5.596 9.105 C 5.496 9.141 5.496 9.141 5.496 9.245 C 5.496 9.323 5.506 9.401 5.509 9.479 C 5.53 9.925 5.551 10.37 5.568 10.816 C 5.568 10.844 5.576 10.871 5.591 10.894 C 5.607 10.917 5.629 10.935 5.655 10.945 C 5.896 11.075 6.133 11.209 6.372 11.345 L 9.531 13.097 C 9.559 13.121 9.594 13.135 9.631 13.137 L 9.631 13.075 C 9.631 12.675 9.643 12.275 9.641 11.875 C 9.636 11.744 9.67 11.613 9.738 11.501 C 9.806 11.388 9.906 11.298 10.025 11.242 C 10.34 11.067 10.651 10.887 10.964 10.708 Z"
-            android:fillColor="#000"
-            android:strokeWidth="1"/>
-        <path
-            android:name="path_2"
-            android:pathData="M 10.862 17.635 L 10.862 15.252 L 10.862 15.164 C 10.863 15.127 10.877 15.091 10.902 15.063 C 10.927 15.035 10.961 15.017 10.998 15.011 C 11.035 15.006 11.072 15.014 11.104 15.034 C 11.263 15.101 11.42 15.173 11.578 15.244 C 12.032 15.444 12.486 15.644 12.938 15.852 C 12.974 15.87 13.014 15.88 13.055 15.88 C 13.096 15.88 13.136 15.87 13.172 15.852 Q 14.057 15.452 14.945 15.052 C 14.967 15.04 14.989 15.03 15.012 15.022 C 15.042 15.01 15.075 15.008 15.107 15.015 C 15.138 15.023 15.167 15.04 15.188 15.065 C 15.209 15.089 15.223 15.12 15.226 15.152 C 15.227 15.178 15.227 15.204 15.226 15.23 L 15.226 19.888 C 15.228 19.936 15.217 19.983 15.194 20.025 C 15.171 20.067 15.137 20.101 15.096 20.125 C 14.459 20.559 13.826 20.998 13.196 21.436 C 13.069 21.524 13.034 21.525 12.896 21.443 C 12.257 21.056 11.62 20.667 10.98 20.282 C 10.94 20.263 10.906 20.232 10.883 20.194 C 10.86 20.155 10.849 20.111 10.851 20.066 L 10.851 17.635 Z M 11.43 15.748 L 11.43 19.854 C 11.429 19.88 11.436 19.906 11.45 19.928 C 11.464 19.95 11.484 19.968 11.508 19.978 C 11.992 20.27 12.474 20.564 12.958 20.856 C 13.058 20.913 13.022 20.92 13.121 20.856 C 13.613 20.518 14.103 20.178 14.596 19.841 C 14.622 19.827 14.643 19.806 14.657 19.781 C 14.672 19.755 14.678 19.726 14.677 19.697 L 14.677 15.85 C 14.683 15.822 14.68 15.792 14.668 15.766 C 14.636 15.768 14.605 15.778 14.578 15.797 Q 13.994 16.058 13.411 16.32 C 13.303 16.371 13.185 16.398 13.065 16.398 C 12.945 16.398 12.827 16.371 12.719 16.32 L 11.85 15.933 Z"
-            android:fillColor="#000"
-            android:strokeWidth="1"/>
-        <path
-            android:name="path_3"
-            android:pathData="M 15.249 13.102 L 15.249 14.069 C 15.252 14.126 15.237 14.183 15.206 14.231 C 15.175 14.279 15.13 14.317 15.077 14.338 Q 14.153 14.817 13.232 15.303 C 13.177 15.336 13.115 15.353 13.051 15.353 C 12.987 15.353 12.925 15.336 12.87 15.303 Q 11.951 14.816 11.025 14.337 C 10.972 14.315 10.927 14.278 10.897 14.23 C 10.866 14.182 10.851 14.125 10.854 14.068 L 10.854 12.125 C 10.851 12.068 10.867 12.011 10.897 11.963 C 10.928 11.915 10.973 11.878 11.026 11.856 Q 11.951 11.377 12.871 10.891 C 12.926 10.858 12.988 10.841 13.052 10.841 C 13.116 10.841 13.178 10.858 13.233 10.891 Q 14.149 11.375 15.069 11.851 C 15.125 11.873 15.173 11.913 15.205 11.964 C 15.237 12.015 15.253 12.075 15.249 12.135 C 15.245 12.453 15.249 12.78 15.249 13.102 Z M 12.619 12.702 L 11.442 12.702 C 11.384 12.702 11.372 12.726 11.361 12.769 C 11.307 12.985 11.306 13.211 11.359 13.428 C 11.411 13.645 11.515 13.846 11.661 14.014 C 11.679 14.037 11.692 14.065 11.731 14.076 Z M 13.481 13.467 C 13.486 13.473 13.493 13.478 13.501 13.481 C 13.509 13.484 13.517 13.485 13.525 13.483 L 14.634 13.483 C 14.648 13.485 14.663 13.484 14.676 13.478 C 14.689 13.473 14.701 13.464 14.709 13.452 C 14.717 13.44 14.722 13.426 14.723 13.412 C 14.764 13.244 14.774 13.069 14.75 12.898 C 14.704 12.601 14.569 12.325 14.364 12.105 Z M 12.501 13.301 C 12.494 13.304 12.488 13.308 12.482 13.312 C 12.289 13.612 12.096 13.905 11.9 14.2 C 11.877 14.235 11.891 14.252 11.918 14.273 C 12 14.337 12.088 14.394 12.18 14.443 C 12.543 14.635 12.961 14.7 13.365 14.627 Z M 12.731 11.562 L 13.594 12.886 C 13.606 12.876 13.616 12.864 13.626 12.852 C 13.81 12.569 13.992 12.285 14.179 12.004 C 14.21 11.957 14.191 11.936 14.155 11.904 C 13.841 11.662 13.457 11.53 13.061 11.528 C 12.95 11.526 12.84 11.534 12.731 11.553 Z M 13.021 13.684 C 13.023 13.697 13.027 13.71 13.031 13.722 C 13.204 13.988 13.379 14.253 13.55 14.522 C 13.58 14.569 13.612 14.564 13.655 14.548 C 14.065 14.413 14.406 14.124 14.606 13.742 C 14.615 13.724 14.627 13.707 14.606 13.685 Z M 13.085 12.502 C 13.067 12.472 13.058 12.455 13.047 12.439 L 12.554 11.684 C 12.509 11.615 12.508 11.614 12.421 11.645 C 12.055 11.767 11.742 12.013 11.536 12.339 C 11.501 12.389 11.474 12.444 11.455 12.502 Z"
-            android:fillColor="#000"
-            android:strokeWidth="1"/>
-        <path
-            android:name="path_4"
-            android:pathData="M 15.154 21.186 C 15.147 21.205 15.139 21.227 15.13 21.248 L 13.13 25.908 C 13.124 25.923 13.117 25.938 13.109 25.953 C 13.103 25.968 13.092 25.98 13.079 25.988 C 13.065 25.997 13.05 26.001 13.034 26 C 13.018 26 13.003 25.995 12.99 25.986 C 12.977 25.977 12.967 25.965 12.962 25.95 C 12.949 25.923 12.939 25.896 12.927 25.868 L 10.963 21.258 C 10.958 21.246 10.954 21.233 10.948 21.222 C 10.94 21.212 10.935 21.2 10.933 21.187 C 10.932 21.174 10.934 21.161 10.939 21.15 C 10.945 21.138 10.954 21.129 10.965 21.122 C 10.982 21.112 11.001 21.108 11.021 21.109 C 11.04 21.111 11.058 21.117 11.074 21.129 L 11.474 21.359 C 11.968 21.643 12.462 21.926 12.954 22.213 C 12.983 22.234 13.018 22.245 13.054 22.245 C 13.09 22.245 13.125 22.234 13.154 22.213 C 13.754 21.859 14.362 21.513 14.966 21.158 C 14.992 21.141 15.02 21.126 15.049 21.114 C 15.065 21.108 15.082 21.106 15.098 21.111 C 15.115 21.116 15.129 21.125 15.139 21.139 C 15.149 21.153 15.154 21.169 15.154 21.186 Z M 14.064 22.319 L 14.05 22.305 L 13.96 22.354 L 13.425 22.665 C 13.314 22.736 13.184 22.774 13.052 22.774 C 12.92 22.774 12.79 22.736 12.679 22.665 C 12.479 22.551 12.285 22.438 12.089 22.325 C 12.067 22.313 12.044 22.302 12.002 22.28 L 13.037 24.709 Z"
-            android:fillColor="#000"
-            android:strokeWidth="1"/>
-        <path
-            android:name="path_5"
-            android:pathData="M 0.788 6.444 L 1.188 6.509 L 3.042 6.809 L 5.033 7.134 L 6.251 7.334 C 6.272 7.336 6.294 7.34 6.314 7.347 C 6.332 7.353 6.346 7.364 6.355 7.38 C 6.365 7.396 6.367 7.415 6.363 7.433 C 6.359 7.451 6.348 7.467 6.333 7.477 C 6.303 7.496 6.272 7.512 6.239 7.524 C 5.614 7.8 4.989 8.077 4.36 8.347 C 4.317 8.359 4.28 8.385 4.256 8.422 C 4.231 8.459 4.221 8.503 4.227 8.547 C 4.245 9.188 4.255 9.829 4.268 10.47 L 4.268 10.558 C 4.268 10.572 4.264 10.585 4.256 10.596 C 4.248 10.608 4.237 10.616 4.224 10.62 C 4.209 10.627 4.193 10.629 4.177 10.626 C 4.161 10.623 4.146 10.615 4.135 10.604 C 4.119 10.587 4.104 10.569 4.089 10.551 L 0.764 6.611 C 0.745 6.592 0.728 6.57 0.713 6.548 C 0.682 6.489 0.719 6.444 0.788 6.444 Z M 1.957 7.154 C 1.962 7.186 1.978 7.215 2.003 7.236 L 3.659 9.195 C 3.662 9.196 3.666 9.196 3.669 9.195 C 3.683 9.195 3.669 9.185 3.669 9.185 L 3.669 8.471 C 3.666 8.35 3.701 8.232 3.769 8.133 C 3.838 8.034 3.936 7.959 4.05 7.919 C 4.257 7.828 4.463 7.738 4.669 7.646 C 4.687 7.638 4.722 7.638 4.716 7.601 Z"
-            android:fillColor="#000"
-            android:strokeWidth="1"/>
-        <path
-            android:name="path_6"
-            android:pathData="M 21.747 9.5 C 21.752 9.178 21.753 8.856 21.765 8.534 C 21.765 8.434 21.732 8.392 21.637 8.351 C 20.993 8.073 20.352 7.788 19.71 7.506 C 19.663 7.485 19.598 7.474 19.61 7.406 C 19.622 7.338 19.688 7.342 19.744 7.333 L 22.857 6.826 L 25.157 6.451 C 25.178 6.446 25.199 6.442 25.22 6.441 C 25.284 6.441 25.32 6.491 25.289 6.541 C 25.272 6.567 25.253 6.59 25.232 6.612 L 21.915 10.544 L 21.889 10.575 C 21.879 10.594 21.862 10.608 21.842 10.616 C 21.822 10.624 21.8 10.625 21.78 10.619 C 21.733 10.604 21.733 10.566 21.734 10.53 L 21.734 10.198 L 21.734 9.498 Z M 24.047 7.177 L 24.037 7.156 L 21.278 7.606 C 21.296 7.642 21.325 7.646 21.35 7.657 C 21.556 7.748 21.763 7.837 21.968 7.93 C 22.074 7.97 22.166 8.041 22.231 8.135 C 22.295 8.228 22.33 8.339 22.33 8.453 C 22.33 8.553 22.33 8.648 22.325 8.745 L 22.325 9.218 Z"
-            android:fillColor="#000"
-            android:strokeWidth="1"/>
-        <path
-            android:name="path_7"
-            android:pathData="M 17.792 2.701 L 16.915 2.246 L 16.049 1.792 Q 15.059 1.274 14.071 0.756 C 13.799 0.607 13.496 0.523 13.186 0.509 C 12.835 0.494 12.487 0.573 12.177 0.737 Q 11.124 1.288 10.071 1.837 L 9.027 2.381 C 8.824 2.478 8.626 2.586 8.434 2.704 L 8.349 2.704 C 8.29 2.707 8.231 2.691 8.181 2.659 C 8.132 2.627 8.093 2.58 8.071 2.525 C 8.052 2.468 8.054 2.406 8.077 2.351 C 8.101 2.296 8.144 2.251 8.198 2.225 C 8.219 2.213 8.241 2.202 8.263 2.191 Q 10.076 1.243 11.889 0.291 C 12.249 0.101 12.649 -0.002 13.056 -0.009 C 13.478 -0.022 13.897 0.073 14.273 0.267 Q 16.129 1.236 17.982 2.208 C 18.023 2.225 18.059 2.251 18.087 2.285 C 18.115 2.319 18.135 2.359 18.144 2.402 C 18.151 2.452 18.143 2.503 18.121 2.548 C 18.099 2.593 18.065 2.632 18.023 2.658 C 17.98 2.684 17.93 2.698 17.88 2.697 C 17.849 2.709 17.821 2.701 17.792 2.701 Z"
-            android:fillColor="#000"
-            android:strokeWidth="1"/>
-        <path
-            android:name="path_8"
-            android:pathData="M 20.66 21.023 C 20.71 20.97 20.769 20.928 20.835 20.897 L 24.461 19.021 C 24.668 18.923 24.853 18.783 25.005 18.611 C 25.157 18.44 25.273 18.239 25.345 18.021 C 25.392 17.875 25.417 17.722 25.417 17.568 C 25.417 16.855 25.417 16.143 25.425 15.43 C 25.425 14.997 25.433 14.564 25.436 14.13 C 25.441 14.094 25.438 14.058 25.429 14.023 C 25.429 13.923 25.436 13.815 25.438 13.711 C 25.437 13.663 25.449 13.616 25.473 13.574 C 25.497 13.532 25.531 13.498 25.573 13.474 C 25.615 13.45 25.662 13.438 25.71 13.439 C 25.759 13.436 25.809 13.446 25.852 13.469 C 25.896 13.492 25.933 13.527 25.959 13.569 C 25.984 13.611 25.998 13.66 25.998 13.709 C 25.998 14.061 25.998 14.409 25.992 14.764 C 25.992 15.135 25.985 15.506 25.983 15.877 C 25.983 16.434 25.983 16.99 25.976 17.547 C 25.977 17.946 25.863 18.337 25.649 18.674 C 25.435 19.011 25.128 19.279 24.766 19.447 C 23.987 19.862 23.197 20.261 22.412 20.667 L 21.085 21.354 C 21.018 21.395 20.938 21.413 20.86 21.403 C 20.812 21.398 20.767 21.38 20.73 21.351 C 20.692 21.321 20.663 21.282 20.646 21.237 C 20.63 21.192 20.626 21.144 20.635 21.097 C 20.642 21.072 20.65 21.047 20.66 21.023 Z"
-            android:fillColor="#000"
-            android:strokeWidth="1"/>
-        <path
-            android:name="path_9"
-            android:pathData="M 0.565 13.749 L 0.565 14.276 Q 0.565 15.228 0.574 16.176 C 0.574 16.651 0.574 17.126 0.588 17.601 C 0.595 17.897 0.685 18.186 0.848 18.433 C 1.011 18.681 1.241 18.877 1.51 19.001 C 2.185 19.359 2.867 19.701 3.546 20.057 L 5.079 20.85 C 5.103 20.863 5.13 20.873 5.156 20.884 L 5.245 20.937 C 5.283 20.958 5.315 20.988 5.337 21.026 C 5.36 21.063 5.371 21.106 5.37 21.15 C 5.37 21.194 5.357 21.236 5.334 21.273 C 5.296 21.331 5.238 21.373 5.172 21.392 C 5.105 21.411 5.034 21.407 4.971 21.379 C 4.945 21.369 4.92 21.355 4.895 21.342 L 1.241 19.45 C 0.958 19.314 0.708 19.119 0.508 18.877 C 0.308 18.635 0.162 18.353 0.082 18.05 C 0.044 17.905 0.024 17.755 0.023 17.605 Q 0.016 16.39 0.007 15.174 C 0.007 14.705 0.007 14.237 0.002 13.768 L 0.002 13.69 C 0.006 13.621 0.037 13.556 0.088 13.509 C 0.14 13.463 0.207 13.437 0.276 13.439 C 0.344 13.436 0.41 13.458 0.463 13.501 C 0.516 13.544 0.551 13.604 0.562 13.671 C 0.562 13.697 0.563 13.723 0.565 13.749 Z"
-            android:fillColor="#000"
-            android:strokeWidth="1"/>
-    </group>
-</vector>
diff --git a/res/layout/fod_picker_preference.xml b/res/layout/fod_picker_preference.xml
index a220d13..04a54a4 100644
--- a/res/layout/fod_picker_preference.xml
+++ b/res/layout/fod_picker_preference.xml
@@ -126,7 +126,7 @@
             android:id="@+id/fodicon8_button"
             android:layout_width="@dimen/fod_picker_item_size"
             android:layout_height="@dimen/fod_picker_item_size"
-            android:src="@drawable/fod_icon_octavi"
+            android:src="@drawable/fod_icon_cherish"
             android:scaleType="centerInside"
             android:padding="@dimen/fod_picker_item_padding"
             android:layout_margin="@dimen/fod_picker_item_margin"