diff --git a/app/src/main/res/drawable/ic_delete_button.xml b/app/src/main/res/drawable/ic_delete_button.xml
new file mode 100644
index 000000000..59f037ced
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete_button.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="19dp"
+    android:viewportWidth="25"
+    android:viewportHeight="19">
+  <path
+      android:pathData="M4.553,5.118C4.538,5.132 4.509,5.16 4.476,5.192C4.453,5.215 4.434,5.234 4.395,5.272L2.252,7.416C2.196,7.474 2.157,7.514 2.067,7.604C2.016,7.655 1.979,7.694 1.899,7.779C1.751,7.922 1.594,8.094 1.447,8.275C1.309,8.421 1.199,8.592 1.121,8.778C0.963,9.262 0.963,9.732 1.104,10.169L1.123,10.22C1.201,10.405 1.311,10.573 1.447,10.719C1.594,10.899 1.751,11.071 1.916,11.233C1.979,11.3 2.016,11.339 2.067,11.39L2.252,11.575L4.206,13.533C4.298,13.624 4.343,13.668 4.394,13.718C4.45,13.776 4.508,13.834 4.566,13.889C4.577,13.899 7.067,16.387 7.067,16.387C7.144,16.464 7.206,16.525 7.346,16.66C7.361,16.674 7.383,16.697 7.39,16.704C7.426,16.742 7.447,16.764 7.461,16.778C7.751,17.068 8.085,17.313 8.45,17.502C8.825,17.688 9.214,17.816 9.616,17.887C9.995,17.949 10.371,17.982 10.748,17.988C10.813,17.989 10.867,17.99 10.987,17.991C11.103,17.992 11.154,17.993 11.217,17.994L18.637,17.994C18.714,17.993 18.765,17.992 18.883,17.991C19.004,17.99 19.058,17.989 19.128,17.988C19.506,17.981 19.885,17.947 20.26,17.885C20.67,17.816 21.065,17.685 21.434,17.498C21.805,17.309 22.144,17.063 22.438,16.767C22.731,16.473 22.976,16.136 23.166,15.767C23.353,15.393 23.481,15 23.55,14.594C23.613,14.215 23.646,13.835 23.65,13.453C23.654,13.375 23.655,13.3 23.657,13.134C23.659,13.055 23.659,13.02 23.66,12.977L23.66,5.988C23.659,5.934 23.659,5.899 23.657,5.822L23.656,5.741C23.655,5.64 23.653,5.564 23.65,5.488C23.646,5.129 23.614,4.753 23.555,4.382C23.482,3.97 23.354,3.58 23.172,3.215C22.981,2.842 22.738,2.508 22.447,2.217C22.156,1.924 21.819,1.678 21.45,1.49C21.083,1.306 20.695,1.178 20.295,1.107C19.912,1.046 19.535,1.014 19.158,1.009C19.033,1.004 18.923,1.003 18.678,1.003C18.598,1.002 18.504,1.001 18.399,1C18.32,1 18.257,1 18.115,1H11.792C11.509,1 11.38,1.001 11.219,1.003C10.985,1.003 10.874,1.004 10.732,1.01C10.373,1.014 9.997,1.046 9.625,1.105C9.214,1.178 8.825,1.306 8.459,1.488C8.085,1.681 7.751,1.926 7.46,2.217C7.447,2.23 7.426,2.252 7.391,2.289C7.383,2.297 7.346,2.335 7.346,2.335C7.206,2.469 7.144,2.53 7.067,2.607L6.746,2.928L4.611,5.066C4.593,5.081 4.573,5.098 4.553,5.118ZM18.115,2.259C18.255,2.259 18.317,2.259 18.394,2.259C18.494,2.26 18.583,2.26 18.668,2.262C18.906,2.262 19.005,2.263 19.125,2.268C19.459,2.272 19.774,2.299 20.087,2.349C20.356,2.396 20.628,2.486 20.882,2.614C21.129,2.739 21.357,2.906 21.555,3.105C21.755,3.305 21.921,3.533 22.049,3.783C22.173,4.033 22.263,4.307 22.313,4.59C22.361,4.891 22.388,5.205 22.392,5.521C22.395,5.601 22.396,5.668 22.398,5.76L22.399,5.838C22.4,5.919 22.4,5.955 22.401,6.001L22.401,12.965C22.4,12.999 22.4,13.036 22.399,13.117C22.397,13.273 22.395,13.34 22.392,13.422C22.388,13.757 22.361,14.073 22.309,14.385C22.261,14.666 22.171,14.941 22.043,15.198C21.916,15.445 21.747,15.677 21.546,15.879C21.346,16.08 21.116,16.247 20.864,16.376C20.608,16.505 20.335,16.596 20.052,16.643C19.741,16.695 19.423,16.723 19.104,16.729C19.039,16.73 18.987,16.731 18.87,16.732C18.749,16.733 18.694,16.734 18.625,16.736L11.229,16.735C11.173,16.734 11.119,16.733 10.999,16.732C10.883,16.731 10.832,16.73 10.77,16.729C10.451,16.725 10.137,16.697 9.826,16.646C9.551,16.598 9.277,16.507 9.02,16.379C8.779,16.255 8.55,16.087 8.351,15.888L8.302,15.836C8.253,15.785 8.232,15.763 8.208,15.742C8.082,15.621 8.025,15.565 7.957,15.497L5.462,13.002C5.439,12.981 5.425,12.968 5.416,12.96C5.371,12.917 5.334,12.879 5.299,12.842C5.227,12.772 5.187,12.733 5.097,12.643L3.143,10.686L2.957,10.5C2.918,10.461 2.887,10.429 2.816,10.353C2.661,10.2 2.531,10.057 2.409,9.907L2.371,9.864C2.339,9.831 2.313,9.794 2.293,9.753C2.245,9.585 2.245,9.407 2.293,9.239C2.312,9.2 2.338,9.164 2.368,9.133L2.411,9.085C2.531,8.936 2.659,8.794 2.796,8.661C2.887,8.566 2.918,8.533 2.957,8.495C3.055,8.396 3.099,8.352 3.154,8.294L5.097,6.351L5.286,6.163C5.323,6.125 5.339,6.109 5.36,6.089L5.401,6.051L5.401,6.051L5.401,6.051C5.432,6.024 5.448,6.009 5.465,5.993L7.637,3.818L7.957,3.497C8.025,3.429 8.082,3.374 8.208,3.252C8.232,3.231 8.253,3.209 8.3,3.16L8.351,3.107C8.55,2.907 8.779,2.74 9.029,2.61C9.277,2.487 9.551,2.397 9.834,2.347C10.135,2.299 10.449,2.272 10.764,2.268C10.902,2.263 11.001,2.262 11.229,2.262C11.392,2.259 11.516,2.259 11.792,2.259H18.115ZM12.153,12.828C12.102,12.878 12.041,12.919 11.973,12.948C11.761,13.035 11.517,12.986 11.355,12.824C11.135,12.602 11.135,12.245 11.355,12.024C11.387,11.992 11.422,11.964 11.46,11.941L13.904,9.494L11.355,6.948L11.363,6.94C11.313,6.889 11.272,6.828 11.244,6.76C11.156,6.548 11.205,6.304 11.368,6.142C11.589,5.922 11.946,5.922 12.167,6.142C12.199,6.174 12.227,6.21 12.25,6.247L14.702,8.695L17.177,6.218C17.196,6.191 17.217,6.166 17.24,6.142C17.401,5.98 17.644,5.932 17.855,6.019C18.066,6.106 18.204,6.312 18.204,6.54C18.204,6.693 18.143,6.835 18.04,6.939L18.046,6.945L15.5,9.493L17.984,11.972C18.007,11.989 18.028,12.007 18.049,12.027C18.211,12.189 18.259,12.431 18.172,12.643C18.085,12.854 17.879,12.991 17.651,12.991C17.498,12.991 17.356,12.93 17.252,12.827L17.246,12.833L14.702,10.292L12.161,12.836L12.153,12.828Z"
+      android:fillColor="@color/signal_text_primary"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M4.476,5.192L4.739,5.459L4.739,5.459L4.476,5.192ZM4.553,5.118L4.806,5.395L4.812,5.389L4.818,5.383L4.553,5.118ZM4.395,5.272L4.661,5.538L4.661,5.538L4.395,5.272ZM2.252,7.416L1.987,7.15L1.981,7.157L2.252,7.416ZM2.067,7.604L1.801,7.339H1.801L2.067,7.604ZM1.899,7.779L2.16,8.048L2.166,8.042L2.172,8.036L1.899,7.779ZM1.447,8.275L1.72,8.532L1.73,8.522L1.739,8.511L1.447,8.275ZM1.121,8.778L0.775,8.634L0.77,8.647L0.765,8.661L1.121,8.778ZM1.104,10.169L0.747,10.285L0.75,10.293L0.753,10.3L1.104,10.169ZM1.123,10.22L0.772,10.351L0.774,10.359L0.778,10.366L1.123,10.22ZM1.447,10.719L1.738,10.482L1.73,10.472L1.721,10.463L1.447,10.719ZM1.916,11.233L2.191,10.978L2.185,10.972L2.179,10.966L1.916,11.233ZM2.067,11.39L2.332,11.125L2.332,11.125L2.067,11.39ZM2.252,11.575L2.518,11.311L2.517,11.31L2.252,11.575ZM4.206,13.533L3.941,13.798L3.941,13.798L4.206,13.533ZM4.394,13.718L4.666,13.46L4.66,13.453L4.653,13.447L4.394,13.718ZM4.566,13.889L4.309,14.163L4.317,14.169L4.566,13.889ZM7.067,16.387L7.332,16.122L7.332,16.122L7.067,16.387ZM7.346,16.66L7.608,16.392L7.606,16.39L7.346,16.66ZM7.39,16.704L7.662,16.446L7.661,16.445L7.39,16.704ZM7.461,16.778L7.726,16.513L7.726,16.512L7.461,16.778ZM8.45,17.502L8.278,17.835L8.283,17.838L8.45,17.502ZM9.616,17.887L9.551,18.257L9.555,18.257L9.616,17.887ZM10.748,17.988L10.755,17.613L10.753,17.613L10.748,17.988ZM10.987,17.991L10.991,17.616L10.987,17.991ZM11.217,17.994L11.209,18.369H11.217L11.217,17.994ZM18.637,17.994L18.637,18.369L18.644,18.369L18.637,17.994ZM18.883,17.991L18.879,17.616L18.883,17.991ZM19.128,17.988L19.121,17.613L19.121,17.613L19.128,17.988ZM20.26,17.885L20.32,18.255L20.322,18.255L20.26,17.885ZM21.434,17.498L21.264,17.163L21.264,17.164L21.434,17.498ZM22.438,16.767L22.173,16.502L22.172,16.503L22.438,16.767ZM23.166,15.767L23.499,15.939L23.501,15.935L23.166,15.767ZM23.55,14.594L23.92,14.657L23.92,14.655L23.55,14.594ZM23.65,13.453L23.276,13.437L23.275,13.449L23.65,13.453ZM23.657,13.134L24.032,13.139V13.139L23.657,13.134ZM23.66,12.977L24.035,12.985V12.977L23.66,12.977ZM23.66,5.988L24.035,5.988L24.035,5.981L23.66,5.988ZM23.657,5.822L24.032,5.817L24.032,5.816L23.657,5.822ZM23.656,5.741L24.031,5.736L24.031,5.736L23.656,5.741ZM23.65,5.488L23.275,5.492L23.275,5.503L23.65,5.488ZM23.555,4.382L23.925,4.322L23.924,4.317L23.555,4.382ZM23.172,3.215L23.508,3.048L23.506,3.044L23.172,3.215ZM22.447,2.217L22.18,2.481L22.181,2.482L22.447,2.217ZM21.45,1.49L21.62,1.156L21.618,1.155L21.45,1.49ZM20.295,1.107L20.361,0.738L20.354,0.737L20.295,1.107ZM19.158,1.009L19.142,1.384L19.153,1.384L19.158,1.009ZM18.678,1.003L18.671,1.378H18.678V1.003ZM18.399,1L18.398,1.375L18.399,1ZM11.219,1.003L11.218,1.378L11.225,1.378L11.219,1.003ZM10.732,1.01L10.736,1.385L10.747,1.385L10.732,1.01ZM9.625,1.105L9.566,0.735L9.56,0.736L9.625,1.105ZM8.459,1.488L8.292,1.152L8.287,1.155L8.459,1.488ZM7.46,2.217L7.726,2.482L7.726,2.482L7.46,2.217ZM7.391,2.289L7.663,2.548L7.663,2.547L7.391,2.289ZM7.346,2.335L7.606,2.605L7.611,2.6L7.346,2.335ZM7.067,2.607L6.802,2.342V2.342L7.067,2.607ZM6.746,2.928L6.481,2.663L6.481,2.663L6.746,2.928ZM4.611,5.066L4.845,5.359L4.862,5.346L4.877,5.331L4.611,5.066ZM18.394,2.259L18.396,1.884L18.394,2.259ZM18.668,2.262L18.661,2.637L18.668,2.637L18.668,2.262ZM19.125,2.268L19.11,2.643L19.12,2.643L19.125,2.268ZM20.087,2.349L20.152,1.979L20.146,1.978L20.087,2.349ZM20.882,2.614L21.053,2.28L21.05,2.279L20.882,2.614ZM21.555,3.105L21.288,3.369L21.29,3.37L21.555,3.105ZM22.049,3.783L22.385,3.616L22.382,3.612L22.049,3.783ZM22.313,4.59L22.684,4.531L22.683,4.525L22.313,4.59ZM22.392,5.521L22.017,5.525L22.017,5.534L22.392,5.521ZM22.398,5.76L22.773,5.755L22.773,5.754L22.398,5.76ZM22.399,5.838L22.774,5.833L22.774,5.833L22.399,5.838ZM22.401,6.001L22.776,6.001L22.776,5.993L22.401,6.001ZM22.401,12.965L22.776,12.974V12.965L22.401,12.965ZM22.399,13.117L22.774,13.122V13.122L22.399,13.117ZM22.392,13.422L22.017,13.407L22.017,13.418L22.392,13.422ZM22.309,14.385L22.679,14.448L22.679,14.447L22.309,14.385ZM22.043,15.198L22.376,15.37L22.378,15.366L22.043,15.198ZM21.546,15.879L21.28,15.614L21.28,15.614L21.546,15.879ZM20.864,16.376L20.694,16.041L20.694,16.041L20.864,16.376ZM20.052,16.643L20.113,17.014L20.115,17.013L20.052,16.643ZM19.104,16.729L19.098,16.354L19.097,16.354L19.104,16.729ZM18.87,16.732L18.867,16.357H18.867L18.87,16.732ZM18.625,16.736L18.625,17.111L18.632,17.11L18.625,16.736ZM11.229,16.735L11.221,17.11H11.229L11.229,16.735ZM10.999,16.732L11.003,16.357L10.999,16.732ZM10.77,16.729L10.777,16.354L10.775,16.354L10.77,16.729ZM9.826,16.646L9.761,17.015L9.766,17.016L9.826,16.646ZM9.02,16.379L8.848,16.712L8.853,16.715L9.02,16.379ZM8.351,15.888L8.08,16.147L8.086,16.153L8.351,15.888ZM8.302,15.836L8.573,15.577L8.573,15.577L8.302,15.836ZM8.208,15.742L7.947,16.011L7.953,16.017L7.959,16.022L8.208,15.742ZM7.957,15.497L8.223,15.232L8.223,15.232L7.957,15.497ZM5.462,13.002L5.727,12.736L5.721,12.73L5.714,12.724L5.462,13.002ZM5.416,12.96L5.156,13.23L5.161,13.235L5.167,13.241L5.416,12.96ZM5.299,12.842L5.572,12.585L5.566,12.579L5.56,12.573L5.299,12.842ZM5.097,12.643L4.831,12.908L4.832,12.908L5.097,12.643ZM3.143,10.686L3.408,10.421L3.408,10.421L3.143,10.686ZM2.957,10.5L3.222,10.234H3.222L2.957,10.5ZM2.816,10.353L3.089,10.096L3.079,10.086L2.816,10.353ZM2.409,9.907L2.7,9.67L2.695,9.664L2.689,9.657L2.409,9.907ZM2.371,9.864L2.651,9.615L2.646,9.608L2.64,9.602L2.371,9.864ZM2.293,9.753L1.933,9.857L1.942,9.889L1.956,9.918L2.293,9.753ZM2.293,9.239L1.956,9.076L1.942,9.104L1.933,9.135L2.293,9.239ZM2.368,9.133L2.635,9.397L2.642,9.39L2.648,9.383L2.368,9.133ZM2.411,9.085L2.691,9.335L2.698,9.327L2.704,9.32L2.411,9.085ZM2.796,8.661L3.058,8.93L3.063,8.925L3.068,8.919L2.796,8.661ZM2.957,8.495L3.222,8.76L3.222,8.76L2.957,8.495ZM3.154,8.294L2.888,8.029L2.882,8.036L3.154,8.294ZM5.097,6.351L5.362,6.617L5.362,6.617L5.097,6.351ZM5.286,6.163L5.02,5.897L5.02,5.897L5.286,6.163ZM5.36,6.089L5.109,5.81L5.103,5.816L5.097,5.822L5.36,6.089ZM5.401,6.051L5.161,5.763L5.151,5.772L5.401,6.051ZM5.401,6.051L5.641,6.339L5.649,6.333L5.656,6.326L5.401,6.051ZM5.401,6.051L5.151,5.772L5.146,5.777L5.401,6.051ZM5.465,5.993L5.73,6.258L5.73,6.258L5.465,5.993ZM7.637,3.818L7.372,3.552L7.371,3.553L7.637,3.818ZM7.957,3.497L8.223,3.762L7.957,3.497ZM8.208,3.252L7.959,2.972L7.953,2.977L7.947,2.983L8.208,3.252ZM8.3,3.16L8.571,3.419L8.572,3.419L8.3,3.16ZM8.351,3.107L8.085,2.842L8.08,2.848L8.351,3.107ZM9.029,2.61L8.862,2.274L8.857,2.277L9.029,2.61ZM9.834,2.347L9.775,1.977L9.769,1.978L9.834,2.347ZM10.764,2.268L10.768,2.643L10.778,2.643L10.764,2.268ZM11.229,2.262V2.637L11.235,2.637L11.229,2.262ZM11.973,12.948L12.116,13.294L11.973,12.948ZM12.153,12.828L12.417,12.563L12.155,12.301L11.89,12.561L12.153,12.828ZM11.355,12.824L11.089,13.088L11.089,13.088L11.355,12.824ZM11.355,12.024L11.089,11.76L11.089,11.76L11.355,12.024ZM11.46,11.941L11.656,12.261L11.694,12.238L11.725,12.206L11.46,11.941ZM13.904,9.494L14.169,9.759L14.434,9.494L14.169,9.229L13.904,9.494ZM11.355,6.948L11.089,6.683L10.825,6.949L11.09,7.213L11.355,6.948ZM11.363,6.94L11.628,7.205L11.89,6.942L11.63,6.678L11.363,6.94ZM11.244,6.76L11.59,6.617V6.617L11.244,6.76ZM11.368,6.142L11.632,6.408L11.632,6.408L11.368,6.142ZM12.167,6.142L12.432,5.877L12.432,5.877L12.167,6.142ZM12.25,6.247L11.93,6.444L11.954,6.481L11.985,6.513L12.25,6.247ZM14.702,8.695L14.437,8.961L14.703,9.226L14.967,8.961L14.702,8.695ZM17.177,6.218L17.443,6.483L17.466,6.459L17.485,6.432L17.177,6.218ZM17.24,6.142L16.974,5.878L16.973,5.879L17.24,6.142ZM17.855,6.019L17.712,6.365L17.712,6.365L17.855,6.019ZM18.04,6.939L17.774,6.674L17.51,6.939L17.774,7.203L18.04,6.939ZM18.046,6.945L18.311,7.21L18.575,6.945L18.311,6.68L18.046,6.945ZM15.5,9.493L15.235,9.228L14.97,9.493L15.236,9.758L15.5,9.493ZM17.984,11.972L17.719,12.238L17.74,12.258L17.763,12.275L17.984,11.972ZM18.049,12.027L18.313,11.762L18.312,11.761L18.049,12.027ZM17.252,12.827L17.517,12.561L17.252,12.297L16.987,12.562L17.252,12.827ZM17.246,12.833L16.981,13.098L17.246,13.363L17.511,13.098L17.246,12.833ZM14.702,10.292L14.967,10.026L14.702,9.761L14.437,10.027L14.702,10.292ZM12.161,12.836L11.896,13.102L12.161,13.366L12.426,13.101L12.161,12.836ZM4.739,5.459C4.772,5.427 4.797,5.403 4.806,5.395L4.3,4.841C4.279,4.86 4.245,4.893 4.213,4.925L4.739,5.459ZM4.661,5.538C4.699,5.499 4.717,5.481 4.739,5.459L4.213,4.925C4.189,4.949 4.169,4.968 4.13,5.007L4.661,5.538ZM2.517,7.681L4.661,5.538L4.13,5.007L1.987,7.15L2.517,7.681ZM2.332,7.87C2.423,7.778 2.464,7.736 2.523,7.675L1.981,7.157C1.928,7.212 1.891,7.249 1.801,7.339L2.332,7.87ZM2.172,8.036C2.251,7.951 2.285,7.916 2.332,7.87L1.801,7.339C1.747,7.394 1.706,7.436 1.626,7.522L2.172,8.036ZM1.739,8.511C1.877,8.341 2.023,8.18 2.16,8.048L1.638,7.509C1.478,7.664 1.311,7.847 1.156,8.039L1.739,8.511ZM1.468,8.921C1.528,8.777 1.613,8.646 1.72,8.532L1.175,8.017C1.005,8.197 0.87,8.406 0.775,8.634L1.468,8.921ZM1.461,10.054C1.345,9.696 1.342,9.307 1.478,8.895L0.765,8.661C0.583,9.217 0.58,9.769 0.747,10.285L1.461,10.054ZM1.474,10.09L1.456,10.039L0.753,10.3L0.772,10.351L1.474,10.09ZM1.721,10.463C1.615,10.349 1.529,10.218 1.469,10.074L0.778,10.366C0.873,10.591 1.007,10.798 1.174,10.976L1.721,10.463ZM2.179,10.966C2.023,10.813 1.876,10.651 1.738,10.482L1.157,10.956C1.312,11.147 1.478,11.328 1.653,11.501L2.179,10.966ZM2.332,11.125C2.285,11.078 2.252,11.043 2.191,10.978L1.642,11.489C1.706,11.558 1.747,11.6 1.801,11.655L2.332,11.125ZM2.517,11.31L2.332,11.125L1.801,11.655L1.987,11.841L2.517,11.31ZM4.472,13.268L2.518,11.311L1.987,11.84L3.941,13.798L4.472,13.268ZM4.653,13.447C4.605,13.4 4.563,13.359 4.471,13.267L3.941,13.798C4.033,13.889 4.08,13.936 4.136,13.989L4.653,13.447ZM4.823,13.616C4.77,13.566 4.717,13.513 4.666,13.46L4.123,13.976C4.183,14.04 4.246,14.102 4.309,14.162L4.823,13.616ZM7.067,16.387C7.332,16.122 7.332,16.122 7.332,16.122C7.332,16.122 7.332,16.122 7.332,16.122C7.332,16.122 7.332,16.122 7.332,16.122C7.332,16.121 7.331,16.121 7.331,16.12C7.329,16.119 7.328,16.117 7.325,16.115C7.321,16.11 7.314,16.103 7.304,16.094C7.286,16.076 7.259,16.049 7.225,16.015C7.157,15.947 7.06,15.85 6.943,15.733C6.709,15.5 6.398,15.188 6.086,14.877C5.472,14.263 4.832,13.623 4.816,13.609L4.317,14.169C4.312,14.164 4.922,14.774 5.556,15.407C5.868,15.719 6.179,16.03 6.413,16.264C6.53,16.38 6.627,16.478 6.695,16.546C6.729,16.58 6.756,16.606 6.774,16.625C6.783,16.634 6.79,16.641 6.795,16.646C6.797,16.648 6.799,16.65 6.8,16.651C6.801,16.651 6.801,16.652 6.802,16.652C6.802,16.652 6.802,16.652 6.802,16.653C6.802,16.653 6.802,16.653 6.802,16.653C6.802,16.653 6.802,16.653 7.067,16.387ZM7.606,16.39C7.467,16.255 7.407,16.197 7.332,16.122L6.802,16.653C6.882,16.732 6.946,16.794 7.085,16.929L7.606,16.39ZM7.661,16.445C7.651,16.434 7.626,16.409 7.608,16.392L7.083,16.927C7.089,16.933 7.097,16.94 7.104,16.948C7.108,16.952 7.111,16.955 7.114,16.958C7.116,16.96 7.117,16.961 7.118,16.962C7.119,16.963 7.119,16.963 7.119,16.963L7.661,16.445ZM7.726,16.512C7.716,16.503 7.699,16.485 7.662,16.446L7.118,16.962C7.153,16.999 7.177,17.025 7.196,17.043L7.726,16.512ZM8.623,17.169C8.292,16.998 7.989,16.776 7.726,16.513L7.195,17.043C7.513,17.361 7.878,17.628 8.278,17.835L8.623,17.169ZM9.681,17.518C9.315,17.453 8.96,17.337 8.617,17.166L8.283,17.838C8.689,18.04 9.113,18.179 9.551,18.256L9.681,17.518ZM10.753,17.613C10.395,17.608 10.038,17.576 9.676,17.517L9.555,18.257C9.953,18.322 10.347,18.357 10.743,18.363L10.753,17.613ZM10.991,17.616C10.87,17.615 10.818,17.614 10.755,17.613L10.74,18.363C10.807,18.364 10.863,18.365 10.983,18.366L10.991,17.616ZM11.224,17.619C11.159,17.618 11.107,17.617 10.991,17.616L10.983,18.366C11.099,18.367 11.148,18.368 11.209,18.369L11.224,17.619ZM18.637,17.619L11.217,17.619L11.217,18.369L18.637,18.369L18.637,17.619ZM18.879,17.616C18.761,17.617 18.708,17.618 18.631,17.619L18.644,18.369C18.719,18.368 18.77,18.367 18.886,18.366L18.879,17.616ZM19.121,17.613C19.053,17.614 19,17.615 18.879,17.616L18.886,18.366C19.008,18.365 19.064,18.364 19.135,18.363L19.121,17.613ZM20.199,17.515C19.842,17.574 19.482,17.607 19.121,17.613L19.135,18.363C19.531,18.356 19.928,18.32 20.32,18.255L20.199,17.515ZM21.264,17.164C20.929,17.334 20.57,17.452 20.197,17.515L20.322,18.255C20.77,18.179 21.201,18.037 21.604,17.832L21.264,17.164ZM22.172,16.503C21.907,16.77 21.6,16.993 21.264,17.163L21.604,17.832C22.011,17.625 22.382,17.355 22.704,17.031L22.172,16.503ZM22.832,15.596C22.66,15.93 22.438,16.236 22.173,16.502L22.704,17.032C23.024,16.711 23.292,16.342 23.499,15.939L22.832,15.596ZM23.181,14.531C23.118,14.9 23.001,15.258 22.83,15.6L23.501,15.935C23.705,15.528 23.845,15.099 23.92,14.657L23.181,14.531ZM23.275,13.449C23.272,13.811 23.24,14.173 23.18,14.533L23.92,14.655C23.986,14.257 24.021,13.858 24.025,13.457L23.275,13.449ZM23.282,13.129C23.28,13.295 23.279,13.365 23.276,13.437L24.025,13.469C24.029,13.385 24.03,13.305 24.032,13.139L23.282,13.129ZM23.285,12.97C23.284,13.014 23.284,13.05 23.282,13.129L24.032,13.139C24.034,13.06 24.034,13.026 24.035,12.985L23.285,12.97ZM23.285,5.988L23.285,12.977L24.035,12.977L24.035,5.988L23.285,5.988ZM23.282,5.827C23.284,5.904 23.284,5.94 23.285,5.995L24.035,5.981C24.034,5.928 24.034,5.894 24.032,5.817L23.282,5.827ZM23.281,5.746L23.282,5.827L24.032,5.816L24.031,5.736L23.281,5.746ZM23.275,5.503C23.278,5.574 23.28,5.647 23.281,5.747L24.031,5.736C24.03,5.633 24.028,5.553 24.025,5.473L23.275,5.503ZM23.184,4.441C23.241,4.795 23.271,5.152 23.275,5.492L24.025,5.483C24.021,5.106 23.987,4.712 23.925,4.322L23.184,4.441ZM22.837,3.382C23.002,3.715 23.119,4.07 23.185,4.446L23.924,4.317C23.845,3.87 23.706,3.446 23.508,3.048L22.837,3.382ZM22.181,2.482C22.445,2.745 22.665,3.048 22.839,3.386L23.506,3.044C23.298,2.637 23.031,2.27 22.712,1.951L22.181,2.482ZM21.28,1.824C21.614,1.994 21.918,2.217 22.18,2.481L22.713,1.952C22.394,1.632 22.025,1.362 21.62,1.156L21.28,1.824ZM20.23,1.476C20.594,1.541 20.947,1.658 21.282,1.826L21.618,1.155C21.219,0.955 20.797,0.815 20.361,0.738L20.23,1.476ZM19.153,1.384C19.512,1.389 19.871,1.419 20.236,1.478L20.354,0.737C19.953,0.673 19.558,0.639 19.162,0.635L19.153,1.384ZM18.678,1.378C18.922,1.378 19.026,1.379 19.142,1.384L19.174,0.635C19.04,0.629 18.923,0.628 18.678,0.628V1.378ZM18.398,1.375C18.502,1.376 18.594,1.377 18.671,1.378L18.685,0.628C18.603,0.627 18.507,0.626 18.401,0.625L18.398,1.375ZM18.115,1.375C18.257,1.375 18.319,1.375 18.398,1.375L18.401,0.625C18.321,0.625 18.257,0.625 18.115,0.625V1.375ZM11.792,1.375H18.115V0.625H11.792V1.375ZM11.225,1.378C11.383,1.376 11.509,1.375 11.792,1.375V0.625C11.509,0.625 11.377,0.626 11.212,0.628L11.225,1.378ZM10.747,1.385C10.881,1.379 10.986,1.378 11.218,1.378L11.219,0.628C10.984,0.628 10.867,0.629 10.717,0.635L10.747,1.385ZM9.684,1.476C10.039,1.419 10.396,1.389 10.736,1.385L10.728,0.635C10.35,0.639 9.956,0.673 9.566,0.735L9.684,1.476ZM8.626,1.823C8.959,1.658 9.314,1.541 9.69,1.475L9.56,0.736C9.114,0.815 8.69,0.954 8.292,1.152L8.626,1.823ZM7.726,2.482C7.989,2.218 8.291,1.997 8.632,1.821L8.287,1.155C7.879,1.366 7.513,1.633 7.195,1.952L7.726,2.482ZM7.663,2.547C7.699,2.509 7.716,2.491 7.726,2.482L7.195,1.952C7.177,1.97 7.153,1.996 7.12,2.03L7.663,2.547ZM7.346,2.335C7.611,2.6 7.611,2.6 7.611,2.6C7.611,2.6 7.611,2.6 7.611,2.6C7.611,2.6 7.611,2.6 7.611,2.6C7.611,2.6 7.611,2.6 7.611,2.6C7.611,2.6 7.611,2.6 7.611,2.6C7.611,2.599 7.612,2.599 7.612,2.599C7.612,2.599 7.612,2.598 7.613,2.598C7.614,2.597 7.616,2.595 7.617,2.593C7.621,2.59 7.626,2.585 7.632,2.579C7.641,2.57 7.655,2.555 7.663,2.548L7.12,2.03C7.121,2.029 7.119,2.031 7.114,2.036C7.11,2.04 7.105,2.046 7.1,2.051C7.095,2.056 7.09,2.06 7.086,2.064C7.084,2.066 7.083,2.067 7.082,2.068C7.081,2.069 7.081,2.069 7.081,2.069C7.081,2.07 7.081,2.07 7.081,2.07C7.08,2.07 7.08,2.07 7.08,2.07C7.08,2.07 7.08,2.07 7.08,2.07C7.08,2.07 7.08,2.07 7.08,2.07C7.08,2.07 7.08,2.07 7.08,2.07C7.08,2.07 7.08,2.07 7.346,2.335ZM7.332,2.872C7.407,2.798 7.467,2.739 7.606,2.605L7.085,2.065C6.946,2.2 6.882,2.262 6.802,2.342L7.332,2.872ZM7.011,3.193L7.332,2.872L6.802,2.342L6.481,2.663L7.011,3.193ZM4.877,5.331L7.012,3.193L6.481,2.663L4.346,4.801L4.877,5.331ZM4.818,5.383C4.827,5.374 4.836,5.366 4.845,5.359L4.377,4.773C4.349,4.796 4.318,4.822 4.288,4.853L4.818,5.383ZM18.396,1.884C18.318,1.884 18.255,1.884 18.115,1.884V2.634C18.255,2.634 18.316,2.634 18.392,2.634L18.396,1.884ZM18.674,1.887C18.587,1.885 18.497,1.885 18.396,1.884L18.392,2.634C18.492,2.635 18.579,2.635 18.661,2.637L18.674,1.887ZM19.14,1.893C19.012,1.888 18.906,1.887 18.668,1.887L18.668,2.637C18.905,2.637 18.998,2.638 19.11,2.642L19.14,1.893ZM20.146,1.978C19.815,1.926 19.481,1.897 19.13,1.893L19.12,2.643C19.437,2.647 19.734,2.672 20.028,2.719L20.146,1.978ZM21.05,2.279C20.764,2.135 20.458,2.034 20.152,1.979L20.021,2.718C20.254,2.759 20.492,2.838 20.715,2.949L21.05,2.279ZM21.821,2.841C21.595,2.614 21.335,2.423 21.053,2.28L20.712,2.948C20.923,3.055 21.119,3.198 21.288,3.369L21.821,2.841ZM22.382,3.612C22.237,3.327 22.047,3.067 21.82,2.84L21.29,3.37C21.462,3.543 21.605,3.739 21.715,3.954L22.382,3.612ZM22.683,4.525C22.627,4.207 22.525,3.899 22.384,3.616L21.713,3.95C21.821,4.167 21.9,4.407 21.944,4.655L22.683,4.525ZM22.767,5.516C22.763,5.183 22.734,4.85 22.684,4.531L21.943,4.649C21.988,4.932 22.013,5.228 22.017,5.525L22.767,5.516ZM22.773,5.754C22.771,5.66 22.77,5.591 22.767,5.507L22.017,5.534C22.02,5.612 22.021,5.676 22.023,5.765L22.773,5.754ZM22.774,5.833L22.773,5.755L22.023,5.765L22.024,5.843L22.774,5.833ZM22.776,5.993C22.775,5.949 22.775,5.913 22.774,5.833L22.024,5.843C22.025,5.924 22.025,5.961 22.026,6.008L22.776,5.993ZM22.776,12.965L22.776,6.001L22.026,6.001L22.026,12.965L22.776,12.965ZM22.774,13.122C22.775,13.04 22.775,13.006 22.776,12.974L22.026,12.957C22.025,12.993 22.025,13.031 22.024,13.113L22.774,13.122ZM22.767,13.437C22.77,13.35 22.772,13.278 22.774,13.122L22.024,13.113C22.022,13.267 22.021,13.331 22.017,13.407L22.767,13.437ZM22.679,14.447C22.734,14.115 22.763,13.78 22.767,13.426L22.017,13.418C22.014,13.734 21.987,14.031 21.939,14.324L22.679,14.447ZM22.378,15.366C22.523,15.076 22.625,14.766 22.679,14.448L21.939,14.322C21.898,14.567 21.819,14.806 21.707,15.031L22.378,15.366ZM21.812,16.143C22.04,15.915 22.231,15.652 22.376,15.37L21.709,15.027C21.6,15.239 21.455,15.439 21.28,15.614L21.812,16.143ZM21.033,16.71C21.321,16.564 21.584,16.373 21.812,16.143L21.28,15.614C21.108,15.787 20.911,15.931 20.694,16.041L21.033,16.71ZM20.115,17.013C20.435,16.959 20.744,16.857 21.034,16.71L20.694,16.041C20.472,16.154 20.235,16.232 19.99,16.274L20.115,17.013ZM19.111,17.104C19.448,17.098 19.784,17.068 20.113,17.014L19.991,16.274C19.698,16.322 19.398,16.349 19.098,16.354L19.111,17.104ZM18.874,17.107C18.991,17.106 19.045,17.105 19.112,17.104L19.097,16.354C19.034,16.355 18.983,16.356 18.867,16.357L18.874,17.107ZM18.632,17.11C18.7,17.109 18.753,17.108 18.874,17.107L18.867,16.357C18.745,16.358 18.689,16.359 18.618,16.361L18.632,17.11ZM11.229,17.11L18.625,17.111L18.625,16.361L11.229,16.36L11.229,17.11ZM10.996,17.107C11.116,17.108 11.167,17.109 11.221,17.11L11.237,16.361C11.179,16.359 11.123,16.358 11.003,16.357L10.996,17.107ZM10.762,17.104C10.827,17.105 10.88,17.106 10.996,17.107L11.003,16.357C10.887,16.356 10.838,16.355 10.777,16.354L10.762,17.104ZM9.766,17.016C10.095,17.07 10.427,17.099 10.764,17.104L10.775,16.354C10.475,16.35 10.179,16.324 9.887,16.276L9.766,17.016ZM8.853,16.715C9.142,16.859 9.45,16.961 9.761,17.015L9.891,16.277C9.652,16.235 9.412,16.156 9.187,16.044L8.853,16.715ZM8.086,16.153C8.312,16.379 8.572,16.569 8.848,16.712L9.193,16.047C8.986,15.94 8.789,15.795 8.616,15.623L8.086,16.153ZM8.031,16.095L8.08,16.147L8.622,15.629L8.573,15.577L8.031,16.095ZM7.959,16.022C7.969,16.031 7.979,16.042 8.031,16.095L8.573,15.577C8.527,15.529 8.495,15.495 8.457,15.461L7.959,16.022ZM7.692,15.762C7.762,15.833 7.821,15.89 7.947,16.011L8.468,15.472C8.343,15.351 8.288,15.297 8.223,15.232L7.692,15.762ZM5.197,13.267L7.692,15.762L8.223,15.232L5.727,12.736L5.197,13.267ZM5.167,13.241C5.174,13.247 5.186,13.257 5.209,13.279L5.714,12.724C5.692,12.704 5.676,12.69 5.664,12.679L5.167,13.241ZM5.026,13.099C5.065,13.141 5.107,13.183 5.156,13.23L5.676,12.69C5.634,12.65 5.602,12.617 5.572,12.585L5.026,13.099ZM4.832,12.908C4.923,13 4.964,13.04 5.038,13.111L5.56,12.573C5.49,12.505 5.452,12.467 5.362,12.378L4.832,12.908ZM2.877,10.951L4.831,12.908L5.362,12.378L3.408,10.421L2.877,10.951ZM2.692,10.765L2.878,10.951L3.408,10.421L3.222,10.234L2.692,10.765ZM2.543,10.61C2.614,10.686 2.649,10.722 2.692,10.765L3.222,10.234C3.188,10.2 3.16,10.171 3.089,10.096L2.543,10.61ZM2.118,10.143C2.249,10.304 2.388,10.458 2.552,10.62L3.079,10.086C2.933,9.942 2.813,9.809 2.7,9.67L2.118,10.143ZM2.091,10.113L2.129,10.156L2.689,9.657L2.651,9.615L2.091,10.113ZM1.956,9.918C1.994,9.995 2.043,10.064 2.102,10.125L2.64,9.602C2.636,9.598 2.632,9.593 2.629,9.588L1.956,9.918ZM1.933,9.135C1.865,9.37 1.865,9.621 1.933,9.857L2.653,9.649C2.624,9.549 2.625,9.444 2.654,9.344L1.933,9.135ZM2.101,8.87C2.042,8.93 1.993,9 1.956,9.076L2.631,9.402C2.632,9.4 2.633,9.398 2.635,9.397L2.101,8.87ZM2.131,8.836L2.088,8.884L2.648,9.383L2.691,9.335L2.131,8.836ZM2.535,8.392C2.387,8.536 2.248,8.689 2.118,8.851L2.704,9.32C2.814,9.183 2.932,9.052 3.058,8.93L2.535,8.392ZM2.692,8.229C2.649,8.272 2.614,8.308 2.525,8.403L3.068,8.919C3.16,8.823 3.187,8.794 3.222,8.76L2.692,8.229ZM2.882,8.036C2.831,8.09 2.789,8.131 2.692,8.229L3.222,8.76C3.32,8.661 3.367,8.614 3.426,8.552L2.882,8.036ZM4.832,6.086L2.889,8.029L3.419,8.559L5.362,6.617L4.832,6.086ZM5.02,5.897L4.832,6.086L5.362,6.617L5.551,6.428L5.02,5.897ZM5.097,5.822C5.075,5.843 5.058,5.86 5.02,5.897L5.551,6.428C5.588,6.39 5.604,6.375 5.623,6.356L5.097,5.822ZM5.151,5.772L5.109,5.81L5.61,6.368L5.652,6.33L5.151,5.772ZM5.161,5.763L5.161,5.763L5.641,6.339L5.641,6.339L5.161,5.763ZM5.146,5.777L5.146,5.777L5.656,6.326L5.656,6.326L5.146,5.777ZM5.2,5.727C5.192,5.735 5.184,5.743 5.151,5.772L5.652,6.331C5.68,6.306 5.705,6.283 5.73,6.258L5.2,5.727ZM7.371,3.553L5.2,5.728L5.73,6.258L7.902,4.083L7.371,3.553ZM7.692,3.232L7.372,3.552L7.902,4.083L8.223,3.762L7.692,3.232ZM7.947,2.983C7.821,3.104 7.762,3.162 7.692,3.232L8.223,3.762C8.288,3.697 8.343,3.643 8.468,3.522L7.947,2.983ZM8.029,2.901C7.98,2.953 7.969,2.963 7.959,2.972L8.457,3.533C8.495,3.499 8.527,3.466 8.571,3.419L8.029,2.901ZM8.08,2.848L8.029,2.901L8.572,3.419L8.622,3.366L8.08,2.848ZM8.857,2.277C8.572,2.424 8.312,2.615 8.085,2.842L8.616,3.372C8.788,3.199 8.986,3.055 9.202,2.943L8.857,2.277ZM9.769,1.978C9.451,2.033 9.143,2.135 8.862,2.274L9.196,2.946C9.411,2.839 9.651,2.76 9.899,2.716L9.769,1.978ZM10.76,1.893C10.427,1.897 10.094,1.925 9.775,1.977L9.893,2.717C10.176,2.672 10.472,2.647 10.768,2.643L10.76,1.893ZM11.229,1.887C11,1.887 10.895,1.888 10.75,1.893L10.778,2.643C10.909,2.638 11.003,2.637 11.229,2.637V1.887ZM11.792,1.884C11.515,1.884 11.389,1.884 11.223,1.887L11.235,2.637C11.395,2.634 11.516,2.634 11.792,2.634V1.884ZM18.115,1.884H11.792V2.634H18.115V1.884ZM12.116,13.294C12.229,13.247 12.331,13.179 12.415,13.096L11.89,12.561C11.873,12.578 11.853,12.591 11.83,12.601L12.116,13.294ZM11.089,13.088C11.358,13.358 11.763,13.44 12.116,13.294L11.83,12.601C11.758,12.63 11.675,12.614 11.621,12.559L11.089,13.088ZM11.089,11.76C10.724,12.127 10.724,12.721 11.089,13.088L11.621,12.559C11.546,12.484 11.546,12.363 11.621,12.289L11.089,11.76ZM11.264,11.622C11.201,11.66 11.142,11.706 11.089,11.76L11.621,12.289C11.632,12.278 11.644,12.268 11.656,12.261L11.264,11.622ZM13.639,9.229L11.195,11.676L11.725,12.206L14.169,9.759L13.639,9.229ZM11.09,7.213L13.639,9.76L14.169,9.229L11.62,6.683L11.09,7.213ZM11.097,6.676L11.089,6.683L11.621,7.213L11.628,7.205L11.097,6.676ZM11.63,6.678C11.614,6.661 11.6,6.64 11.59,6.617L10.897,6.903C10.944,7.017 11.012,7.118 11.095,7.203L11.63,6.678ZM11.59,6.617C11.561,6.545 11.577,6.463 11.632,6.408L11.103,5.877C10.833,6.146 10.752,6.551 10.897,6.903L11.59,6.617ZM11.632,6.408C11.707,6.334 11.828,6.334 11.902,6.408L12.432,5.877C12.064,5.511 11.47,5.511 11.103,5.877L11.632,6.408ZM11.902,6.408C11.913,6.419 11.923,6.431 11.93,6.444L12.569,6.051C12.531,5.988 12.485,5.93 12.432,5.877L11.902,6.408ZM14.967,8.43L12.515,5.982L11.985,6.513L14.437,8.961L14.967,8.43ZM16.912,5.953L14.437,8.43L14.967,8.961L17.443,6.483L16.912,5.953ZM16.973,5.879C16.935,5.918 16.9,5.96 16.869,6.003L17.485,6.432C17.492,6.423 17.499,6.414 17.507,6.406L16.973,5.879ZM17.998,5.672C17.647,5.527 17.243,5.608 16.974,5.878L17.506,6.407C17.56,6.353 17.641,6.336 17.712,6.365L17.998,5.672ZM18.579,6.54C18.579,6.16 18.35,5.817 17.998,5.672L17.712,6.365C17.783,6.395 17.829,6.464 17.829,6.54H18.579ZM18.305,7.203C18.477,7.031 18.579,6.794 18.579,6.54H17.829C17.829,6.591 17.809,6.639 17.774,6.674L18.305,7.203ZM18.311,6.68L18.305,6.674L17.774,7.203L17.78,7.209L18.311,6.68ZM15.766,9.758L18.311,7.21L17.78,6.68L15.235,9.228L15.766,9.758ZM18.249,11.707L15.766,9.227L15.236,9.758L17.719,12.238L18.249,11.707ZM18.312,11.761C18.279,11.727 18.243,11.697 18.206,11.67L17.763,12.275C17.771,12.281 17.778,12.287 17.785,12.294L18.312,11.761ZM18.519,12.786C18.664,12.434 18.583,12.03 18.313,11.762L17.784,12.293C17.838,12.347 17.855,12.429 17.826,12.5L18.519,12.786ZM17.651,13.366C18.031,13.366 18.374,13.137 18.519,12.786L17.826,12.5C17.796,12.57 17.727,12.616 17.651,12.616V13.366ZM16.988,13.093C17.16,13.264 17.397,13.366 17.651,13.366V12.616C17.6,12.616 17.552,12.596 17.517,12.561L16.988,13.093ZM17.511,13.098L17.517,13.092L16.987,12.562L16.981,12.568L17.511,13.098ZM14.437,10.557L16.981,13.098L17.511,12.568L14.967,10.026L14.437,10.557ZM12.426,13.101L14.968,10.557L14.437,10.027L11.895,12.571L12.426,13.101ZM11.888,13.094L11.896,13.102L12.425,12.571L12.417,12.563L11.888,13.094Z"
+      android:fillColor="@color/signal_text_primary"/>
+</vector>
diff --git a/app/src/main/res/drawable/rounded_rectangle_num_pad_key.xml b/app/src/main/res/drawable/rounded_rectangle_num_pad_key.xml
new file mode 100644
index 000000000..57ccfc38f
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_rectangle_num_pad_key.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/num_pad_key_background"/>
+    <corners android:radius="38dp"/>
+</shape>
diff --git a/app/src/main/res/layout/create_payment_fragment.xml b/app/src/main/res/layout/create_payment_fragment.xml
index b40646412..d189a5040 100644
--- a/app/src/main/res/layout/create_payment_fragment.xml
+++ b/app/src/main/res/layout/create_payment_fragment.xml
@@ -68,152 +68,102 @@
 
             <TextView
                 android:id="@+id/create_payment_fragment_keyboard_decimal"
-                android:layout_width="@dimen/create_payment_key_size"
-                android:layout_height="@dimen/create_payment_key_size"
+                style="@style/NumPadKeyTextView"
                 android:layout_marginBottom="@dimen/create_payment_key_bottom_row_margin_bottom"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center"
                 android:text="@string/CreatePaymentFragment__decimal"
-                android:textColor="@color/signal_text_primary"
-                android:textSize="24sp"
                 app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_bottom_controls"
                 app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_0"
                 app:layout_constraintStart_toStartOf="parent" />
 
             <TextView
                 android:id="@+id/create_payment_fragment_keyboard_0"
-                android:layout_width="@dimen/create_payment_key_size"
-                android:layout_height="@dimen/create_payment_key_size"
+                style="@style/NumPadKeyTextView"
                 android:layout_marginBottom="@dimen/create_payment_key_bottom_row_margin_bottom"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center"
                 android:text="@string/CreatePaymentFragment__0"
-                android:textColor="@color/signal_text_primary"
-                android:textSize="24sp"
                 app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_bottom_controls"
                 app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_lt"
                 app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_decimal" />
 
             <ImageView
                 android:id="@+id/create_payment_fragment_keyboard_lt"
-                android:layout_width="@dimen/create_payment_key_size"
-                android:layout_height="@dimen/create_payment_key_size"
+                style="@style/NumPadKeyTextView"
                 android:layout_marginBottom="@dimen/create_payment_key_bottom_row_margin_bottom"
-                android:background="?attr/selectableItemBackground"
                 android:contentDescription="@string/CreatePaymentFragment__backspace"
-                android:gravity="center"
-                android:padding="14dp"
                 android:scaleType="centerInside"
-                android:textColor="@color/signal_text_primary"
-                android:textSize="24sp"
                 app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_bottom_controls"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_0"
-                app:srcCompat="@drawable/ic_arrow_left_20" />
+                app:srcCompat="@drawable/ic_delete_button" />
 
             <TextView
                 android:id="@+id/create_payment_fragment_keyboard_7"
-                android:layout_width="@dimen/create_payment_key_size"
-                android:layout_height="@dimen/create_payment_key_size"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center"
+                style="@style/NumPadKeyTextView"
+                android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
                 android:text="@string/CreatePaymentFragment__7"
-                android:textColor="@color/signal_text_primary"
-                android:textSize="24sp"
                 app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_decimal"
                 app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_8"
                 app:layout_constraintStart_toStartOf="parent" />
 
             <TextView
                 android:id="@+id/create_payment_fragment_keyboard_8"
-                android:layout_width="@dimen/create_payment_key_size"
-                android:layout_height="@dimen/create_payment_key_size"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center"
+                style="@style/NumPadKeyTextView"
+                android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
                 android:text="@string/CreatePaymentFragment__8"
-                android:textColor="@color/signal_text_primary"
-                android:textSize="24sp"
                 app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_decimal"
                 app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_9"
                 app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_7" />
 
             <TextView
                 android:id="@+id/create_payment_fragment_keyboard_9"
-                android:layout_width="@dimen/create_payment_key_size"
-                android:layout_height="@dimen/create_payment_key_size"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center"
+                style="@style/NumPadKeyTextView"
+                android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
                 android:text="@string/CreatePaymentFragment__9"
-                android:textColor="@color/signal_text_primary"
-                android:textSize="24sp"
                 app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_decimal"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_8" />
 
             <TextView
                 android:id="@+id/create_payment_fragment_keyboard_4"
-                android:layout_width="@dimen/create_payment_key_size"
-                android:layout_height="@dimen/create_payment_key_size"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center"
+                style="@style/NumPadKeyTextView"
+                android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
                 android:text="@string/CreatePaymentFragment__4"
-                android:textColor="@color/signal_text_primary"
-                android:textSize="24sp"
                 app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_7"
                 app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_5"
                 app:layout_constraintStart_toStartOf="parent" />
 
             <TextView
                 android:id="@+id/create_payment_fragment_keyboard_5"
-                android:layout_width="@dimen/create_payment_key_size"
-                android:layout_height="@dimen/create_payment_key_size"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center"
+                style="@style/NumPadKeyTextView"
+                android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
                 android:text="@string/CreatePaymentFragment__5"
-                android:textColor="@color/signal_text_primary"
-                android:textSize="24sp"
-                app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_7"
+                app:layout_constraintBottom_toTopOf="@+id/create_payment_fragment_keyboard_8"
                 app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_6"
                 app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_4" />
 
             <TextView
                 android:id="@+id/create_payment_fragment_keyboard_6"
-                android:layout_width="@dimen/create_payment_key_size"
-                android:layout_height="@dimen/create_payment_key_size"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center"
+                style="@style/NumPadKeyTextView"
+                android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
                 android:text="@string/CreatePaymentFragment__6"
-                android:textColor="@color/signal_text_primary"
-                android:textSize="24sp"
                 app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_7"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_5" />
 
             <TextView
                 android:id="@+id/create_payment_fragment_keyboard_1"
-                android:layout_width="@dimen/create_payment_key_size"
-                android:layout_height="@dimen/create_payment_key_size"
-                android:layout_marginTop="@dimen/create_payment_key_top_row_margin_top"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center"
+                style="@style/NumPadKeyTextView"
+                android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
                 android:text="@string/CreatePaymentFragment__1"
-                android:textColor="@color/signal_text_primary"
-                android:textSize="24sp"
                 app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_4"
                 app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_2"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintVertical_bias="1" />
+                app:layout_constraintStart_toStartOf="parent" />
 
             <TextView
                 android:id="@+id/create_payment_fragment_keyboard_2"
-                android:layout_width="@dimen/create_payment_key_size"
-                android:layout_height="@dimen/create_payment_key_size"
+                style="@style/NumPadKeyTextView"
                 android:layout_marginTop="@dimen/create_payment_key_top_row_margin_top"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center"
+                android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
                 android:text="@string/CreatePaymentFragment__2"
-                android:textColor="@color/signal_text_primary"
-                android:textSize="24sp"
                 app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_4"
                 app:layout_constraintEnd_toStartOf="@id/create_payment_fragment_keyboard_3"
                 app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_1"
@@ -222,14 +172,10 @@
 
             <TextView
                 android:id="@+id/create_payment_fragment_keyboard_3"
-                android:layout_width="@dimen/create_payment_key_size"
-                android:layout_height="@dimen/create_payment_key_size"
+                style="@style/NumPadKeyTextView"
                 android:layout_marginTop="@dimen/create_payment_key_top_row_margin_top"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center"
+                android:layout_marginBottom="@dimen/create_payment_key_bottom_padding"
                 android:text="@string/CreatePaymentFragment__3"
-                android:textColor="@color/signal_text_primary"
-                android:textSize="24sp"
                 app:layout_constraintBottom_toTopOf="@id/create_payment_fragment_keyboard_4"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/create_payment_fragment_keyboard_2"
diff --git a/app/src/main/res/values-night/dark_colors.xml b/app/src/main/res/values-night/dark_colors.xml
index 64cbcc674..1bd75d5f0 100644
--- a/app/src/main/res/values-night/dark_colors.xml
+++ b/app/src/main/res/values-night/dark_colors.xml
@@ -202,4 +202,7 @@
     <color name="message_request_bar_background_wallpaper">@color/signal_light_colorTransparent2</color>
     <color name="message_request_bar_denyForeground_wallpaper">@color/signal_colorError</color>
     <color name="message_request_bar_acceptForeground_wallpaper">@color/signal_colorNeutralInverse</color>
+
+    <color name="num_pad_key_background">@color/transparent_white_20</color>
+
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e051faf83..46a408ff6 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -191,7 +191,9 @@
     <dimen name="transfer_split_top_padding">32dp</dimen>
     <dimen name="transfer_item_spacing">24dp</dimen>
 
-    <dimen name="create_payment_key_size">70dp</dimen>
+    <dimen name="create_payment_key_width">80dp</dimen>
+    <dimen name="create_payment_key_height">70dp</dimen>
+    <dimen name="create_payment_key_bottom_padding">16dp</dimen>
     <dimen name="create_payment_key_bottom_row_margin_bottom">33dp</dimen>
     <dimen name="create_payment_key_top_row_margin_top">11dp</dimen>
 
diff --git a/app/src/main/res/values/light_colors.xml b/app/src/main/res/values/light_colors.xml
index 463874998..91be44315 100644
--- a/app/src/main/res/values/light_colors.xml
+++ b/app/src/main/res/values/light_colors.xml
@@ -199,6 +199,8 @@
 
     <color name="notification_profile_moon_tint">#5151F6</color>
 
+    <color name="num_pad_key_background">#dce5f9</color>
+
     <color name="top_toast_background_color">@color/core_white</color>
 
     <color name="sent_gift_button_tint">@color/transparent_white_70</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 022f4018a..c51ef60fd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -505,4 +505,14 @@
         <item name="android:layout_gravity">end</item>
         <item name="android:gravity">end|center_vertical</item>
     </style>
+
+    <style name="NumPadKeyTextView" parent="@android:style/TextAppearance.Widget.TextView">
+        <item name="android:layout_width">@dimen/create_payment_key_width</item>
+        <item name="android:layout_height">@dimen/create_payment_key_height</item>
+        <item name="android:background">@drawable/rounded_rectangle_num_pad_key</item>
+        <item name="android:textColor">@color/signal_text_primary</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textSize">24sp</item>
+        <item name="android:gravity">center</item>
+    </style>
 </resources>