diff --git a/datacapturegallery/src/main/res/drawable/ic_components_icon.xml b/datacapturegallery/src/main/res/drawable/ic_components_icon.xml
deleted file mode 100644
index 9aa83a9dcc..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_components_icon.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20"
->
-  <path
-        android:pathData="M13.66,0.69L8,6.34V2H0V10H8V6.34L13.66,12H10V20H18V12H13.66L19.32,6.34L13.66,0.69ZM16.49,6.35L13.66,3.52L10.83,6.35L13.66,9.18L16.49,6.35ZM6,8V4H2V8H6ZM16,14V18H12V14H16ZM6,18V14H2V18H6ZM0,12H8V20H0V12Z"
-        android:fillColor="#1A73E8"
-        android:fillType="evenOdd"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_dateofbirth.xml b/datacapturegallery/src/main/res/drawable/ic_dateofbirth.xml
deleted file mode 100644
index 8ee7ad931a..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_dateofbirth.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M112.834,52.917H104.632C104.806,52.426 104.917,51.888 104.917,51.333C104.917,48.721 102.779,46.583 100.167,46.583C98.948,46.583 97.84,47.058 97,47.818C96.161,47.058 95.053,46.583 93.834,46.583C91.221,46.583 89.084,48.721 89.084,51.333C89.084,51.888 89.195,52.426 89.369,52.917H81.167V62.417H84.334V79.833H109.667V62.417H112.834V52.917ZM100.167,49.75C101.038,49.75 101.75,50.463 101.75,51.333C101.75,52.204 101.038,52.917 100.167,52.917C99.296,52.917 98.584,52.204 98.584,51.333C98.584,50.463 99.296,49.75 100.167,49.75ZM92.25,51.333C92.25,50.463 92.963,49.75 93.834,49.75C94.704,49.75 95.417,50.463 95.417,51.333C95.417,52.204 94.704,52.917 93.834,52.917C92.963,52.917 92.25,52.204 92.25,51.333ZM84.334,56.083H95.417V59.25H84.334V56.083ZM87.5,62.417H95.417V76.667H87.5V62.417ZM106.5,76.667H98.584V62.417H106.5V76.667ZM109.667,59.25H98.584V56.083H109.667V59.25Z"
-        android:fillColor="#1A73E8"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_datepicker.xml b/datacapturegallery/src/main/res/drawable/ic_datepicker.xml
deleted file mode 100644
index bb50358f58..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_datepicker.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M58,28C58,26.895 58.895,26 60,26H97H134C135.105,26 136,26.895 136,28V102C136,103.105 135.105,104 134,104H60C58.895,104 58,103.105 58,102V28Z"
-        android:fillColor="#ffffff"
-    />
-  <path
-        android:pathData="M65.95,53.65m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M65.95,64m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M65.95,74.35m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M65.95,84.7m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M76.3,53.65m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M76.3,64m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M76.3,74.35m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M76.3,84.7m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M86.65,53.65m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M86.65,64m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M86.65,74.35m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M86.65,84.7m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M97,43.3m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M97,53.65m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M97,64m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M97,74.35m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M97,84.7m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M107.35,43.3m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M107.35,53.65m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M107.35,64m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M107.35,74.35m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M107.35,84.7m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M117.7,43.3m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M117.5,53.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M117.5,53.5m-3.25,0a3.25,3.25 0,1 1,6.5 0a3.25,3.25 0,1 1,-6.5 0"
-        android:strokeWidth="0.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#1A73E8"
-    />
-  <path
-        android:pathData="M117.7,64m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M117.7,74.35m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M128.05,43.3m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M128.05,53.65m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M128.05,64m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M128.05,74.35m-2.3,0a2.3,2.3 0,1 1,4.6 0a2.3,2.3 0,1 1,-4.6 0"
-        android:fillColor="#D2E3FC"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_defaultlayout.xml b/datacapturegallery/src/main/res/drawable/ic_defaultlayout.xml
deleted file mode 100644
index 0def651466..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_defaultlayout.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M55,27C55,25.895 55.895,25 57,25H94H131C132.105,25 133,25.895 133,27V101C133,102.105 132.105,103 131,103H57C55.895,103 55,102.105 55,101V27Z"
-        android:fillColor="#ffffff"
-    />
-  <path
-        android:pathData="M73.314,45.75C73.314,45.198 73.762,44.75 74.314,44.75H123.314C123.867,44.75 124.314,45.198 124.314,45.75V45.75C124.314,46.303 123.867,46.75 123.314,46.75H74.314C73.762,46.75 73.314,46.303 73.314,45.75V45.75Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M73.314,66.751C73.314,66.198 73.762,65.751 74.314,65.751H123.314C123.867,65.751 124.314,66.198 124.314,66.751V66.751C124.314,67.303 123.867,67.751 123.314,67.751H74.314C73.762,67.751 73.314,67.303 73.314,66.751V66.751Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M73.314,87.938C73.314,87.386 73.762,86.938 74.314,86.938H123.314C123.867,86.938 124.314,87.386 124.314,87.938V87.938C124.314,88.491 123.867,88.938 123.314,88.938H74.314C73.762,88.938 73.314,88.491 73.314,87.938V87.938Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M73.314,40.75C73.314,40.198 73.762,39.75 74.314,39.75H112.314C112.867,39.75 113.314,40.198 113.314,40.75V40.75C113.314,41.303 112.867,41.75 112.314,41.75H74.314C73.762,41.75 73.314,41.303 73.314,40.75V40.75Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M73.314,61.75C73.314,61.198 73.762,60.75 74.314,60.75H112.314C112.867,60.75 113.314,61.198 113.314,61.75V61.75C113.314,62.303 112.867,62.75 112.314,62.75H74.314C73.762,62.75 73.314,62.303 73.314,61.75V61.75Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M73.314,82.938C73.314,82.386 73.762,81.938 74.314,81.938H112.314C112.867,81.938 113.314,82.386 113.314,82.938V82.938C113.314,83.491 112.867,83.938 112.314,83.938H74.314C73.762,83.938 73.314,83.491 73.314,82.938V82.938Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M65.852,46.75H67.055V39H65.857L63.816,40.45V41.632L65.761,40.241H65.852V46.75Z"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M63.188,62.245H64.326C64.326,61.386 64.901,60.806 65.776,60.806C66.636,60.806 67.146,61.38 67.146,62.132C67.146,62.761 66.888,63.147 65.905,64.173L63.252,66.934V67.751H68.473V66.725H64.896V66.633L66.604,64.915C67.962,63.55 68.354,62.911 68.354,62.014C68.354,60.741 67.307,59.812 65.852,59.812C64.289,59.812 63.188,60.822 63.188,62.245Z"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M64.831,85.431H65.798C66.808,85.431 67.431,85.947 67.431,86.774C67.431,87.58 66.765,88.117 65.814,88.117C64.874,88.117 64.225,87.628 64.155,86.865H63C63.064,88.229 64.192,89.127 65.831,89.127C67.447,89.127 68.666,88.16 68.666,86.838C68.666,85.775 68.001,85.087 66.969,84.932V84.84C67.78,84.615 68.366,83.997 68.371,83.063C68.377,81.961 67.469,81 65.868,81C64.235,81 63.226,81.94 63.145,83.256H64.284C64.354,82.445 64.918,81.988 65.798,81.988C66.669,81.988 67.184,82.531 67.184,83.213C67.184,83.96 66.604,84.486 65.766,84.486H64.831V85.431Z"
-        android:fillColor="#1A73E8"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_group_1278.xml b/datacapturegallery/src/main/res/drawable/ic_group_1278.xml
deleted file mode 100644
index b7d4ed1bec..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_group_1278.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <group>
-    <clip-path
-            android:pathData="M194,64C194,78.359 182.359,90 168,90L0,90L0,38L168,38C182.359,38 194,49.641 194,64V64Z"
-        />
-    <path
-            android:pathData="M128,76C128,79.866 124.866,83 121,83L-1,83L-1,45L121,45C124.866,45 128,48.134 128,52L128,76Z"
-            android:strokeWidth="2"
-            android:fillColor="#ffffff"
-            android:strokeColor="#4285F4"
-        />
-  </group>
-  <path
-        android:pathData="M101.5,61L109,68.5L116.5,61H101.5Z"
-        android:fillColor="#1A73E8"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_image.xml b/datacapturegallery/src/main/res/drawable/ic_image.xml
deleted file mode 100644
index 076bbcf4f0..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_image.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M64.191,45.474C64.191,43.661 65.661,42.192 67.474,42.192H96.106H128.994C130.807,42.192 132.277,43.661 132.277,45.474V85C132.277,87.209 130.486,89 128.277,89H68.191C65.982,89 64.191,87.209 64.191,85V45.474Z"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M61,42.282C61,40.469 62.469,39 64.282,39H95.043H125.803C127.616,39 129.085,40.469 129.085,42.282V81.809C129.085,84.018 127.294,85.809 125.085,85.809H65C62.791,85.809 61,84.018 61,81.809V42.282Z"
-        android:fillColor="#ffffff"
-    />
-  <path
-        android:pathData="M91.054,73.979L104.617,58.149L122.703,79.425H68.447L82.011,62.404L91.054,73.979Z"
-        android:fillColor="#D2E3FC"
-        android:fillType="evenOdd"
-    />
-  <path
-        android:pathData="M78.554,51.234m-4.787,0a4.787,4.787 0,1 1,9.574 0a4.787,4.787 0,1 1,-9.574 0"
-        android:fillColor="#D2E3FC"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_layout_icon.xml b/datacapturegallery/src/main/res/drawable/ic_layout_icon.xml
deleted file mode 100644
index 84873438b7..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_layout_icon.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20"
->
-  <path
-        android:pathData="M6,0V6H0V20H20V0H6ZM6,18H2V8H6V18ZM18,18H14V6H8V2H18V18Z"
-        android:fillColor="#1A73E8"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_modal.xml b/datacapturegallery/src/main/res/drawable/ic_modal.xml
deleted file mode 100644
index 39c29a16c7..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_modal.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M58,27C58,25.895 58.895,25 60,25H97H134C135.105,25 136,25.895 136,27V101C136,102.105 135.105,103 134,103H60C58.895,103 58,102.105 58,101V27Z"
-        android:fillColor="#ffffff"
-    />
-  <path
-        android:pathData="M68,45C68,43.895 68.895,43 70,43H124C125.105,43 126,43.895 126,45C126,46.105 125.105,47 124,47H70C68.895,47 68,46.105 68,45Z"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M68,37C68,35.895 68.895,35 70,35H118C119.105,35 120,35.895 120,37C120,38.105 119.105,39 118,39H70C68.895,39 68,38.105 68,37Z"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M68,58C68,56.895 68.895,56 70,56H111C112.105,56 113,56.895 113,58C113,59.105 112.105,60 111,60H70C68.895,60 68,59.105 68,58Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M68,66C68,64.895 68.895,64 70,64H118C119.105,64 120,64.895 120,66C120,67.105 119.105,68 118,68H70C68.895,68 68,67.105 68,66Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M68,74C68,72.895 68.895,72 70,72H104C105.105,72 106,72.895 106,74C106,75.105 105.105,76 104,76H70C68.895,76 68,75.105 68,74Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M105,87C105,85.895 105.895,85 107,85H124C125.105,85 126,85.895 126,87V91C126,92.105 125.105,93 124,93H107C105.895,93 105,92.105 105,91V87Z"
-        android:fillColor="#1A73E8"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_multiplechoice.xml b/datacapturegallery/src/main/res/drawable/ic_multiplechoice.xml
deleted file mode 100644
index 440679737c..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_multiplechoice.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M110.417,46.75H83.583C81.456,46.75 79.75,48.475 79.75,50.583V77.417C79.75,79.525 81.456,81.25 83.583,81.25H110.417C112.544,81.25 114.25,79.525 114.25,77.417V50.583C114.25,48.475 112.544,46.75 110.417,46.75ZM93.167,73.583L83.583,64L86.286,61.298L93.167,68.159L107.714,53.612L110.417,56.333L93.167,73.583Z"
-        android:fillColor="#1A73E8"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_openchoice.xml b/datacapturegallery/src/main/res/drawable/ic_openchoice.xml
deleted file mode 100644
index b6da56e6bc..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_openchoice.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M97,64m-29,0a29,29 0,1 1,58 0a29,29 0,1 1,-58 0"
-        android:fillColor="#ffffff"
-    />
-  <path
-        android:pathData="M96,35L98,35A28,28 0,0 1,126 63L126,65A28,28 0,0 1,98 93L96,93A28,28 0,0 1,68 65L68,63A28,28 0,0 1,96 35z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M109,65.5H98.5V76H95.5V65.5H85V62.5H95.5V52H98.5V62.5H109V65.5Z"
-        android:fillColor="#1A73E8"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_paginatedlayout.xml b/datacapturegallery/src/main/res/drawable/ic_paginatedlayout.xml
deleted file mode 100644
index cea4dd134c..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_paginatedlayout.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M58,27C58,25.895 58.895,25 60,25H97H134C135.105,25 136,25.895 136,27V101C136,102.105 135.105,103 134,103H60C58.895,103 58,102.105 58,101V27Z"
-        android:fillColor="#ffffff"
-    />
-  <path
-        android:pathData="M67,57C67,56.448 67.448,56 68,56H126C126.552,56 127,56.448 127,57V57C127,57.552 126.552,58 126,58H68C67.448,58 67,57.552 67,57V57Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M67,67C67,66.448 67.448,66 68,66H101C101.552,66 102,66.448 102,67V67C102,67.552 101.552,68 101,68H68C67.448,68 67,67.552 67,67V67Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M67,52C67,51.448 67.448,51 68,51H126C126.552,51 127,51.448 127,52V52C127,52.552 126.552,53 126,53H68C67.448,53 67,52.552 67,52V52Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M67,62C67,61.448 67.448,61 68,61H126C126.552,61 127,61.448 127,62V62C127,62.552 126.552,63 126,63H68C67.448,63 67,62.552 67,62V62Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M82,87.5C82,86.119 83.119,85 84.5,85V85C85.881,85 87,86.119 87,87.5V87.5C87,88.881 85.881,90 84.5,90V90C83.119,90 82,88.881 82,87.5V87.5Z"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M91,87.5C91,86.119 92.119,85 93.5,85V85C94.881,85 96,86.119 96,87.5V87.5C96,88.881 94.881,90 93.5,90V90C92.119,90 91,88.881 91,87.5V87.5Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M100,87.5C100,86.119 101.119,85 102.5,85V85C103.881,85 105,86.119 105,87.5V87.5C105,88.881 103.881,90 102.5,90V90C101.119,90 100,88.881 100,87.5V87.5Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M109,87.5C109,86.119 110.119,85 111.5,85V85C112.881,85 114,86.119 114,87.5V87.5C114,88.881 112.881,90 111.5,90V90C110.119,90 109,88.881 109,87.5V87.5Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M76.498,41.75C76.498,41.198 76.946,40.75 77.498,40.75H126.498C127.05,40.75 127.498,41.198 127.498,41.75V41.75C127.498,42.303 127.05,42.75 126.498,42.75H77.498C76.946,42.75 76.498,42.303 76.498,41.75V41.75Z"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M76.498,36.75C76.498,36.198 76.946,35.75 77.498,35.75H115.498C116.05,35.75 116.498,36.198 116.498,36.75V36.75C116.498,37.303 116.05,37.75 115.498,37.75H77.498C76.946,37.75 76.498,37.303 76.498,36.75V36.75Z"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M69.036,42.75H70.239V35H69.041L67,36.45V37.632L68.944,36.241H69.036V42.75Z"
-        android:fillColor="#1A73E8"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_rangepicker.xml b/datacapturegallery/src/main/res/drawable/ic_rangepicker.xml
deleted file mode 100644
index cd98b5d3d9..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_rangepicker.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M58,27C58,25.895 58.895,25 60,25H97H134C135.105,25 136,25.895 136,27V101C136,102.105 135.105,103 134,103H60C58.895,103 58,102.105 58,101V27Z"
-        android:fillColor="#ffffff"
-    />
-  <path
-        android:pathData="M64,49C64,43.477 68.477,39 74,39L136,39V59L74,59C68.477,59 64,54.523 64,49V49Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M74,49m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M125,79C125,84.523 120.523,89 115,89L58,89L58,69L115,69C120.523,69 125,73.477 125,79V79Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M115,79m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
-        android:fillColor="#1A73E8"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_readonlylayout.xml b/datacapturegallery/src/main/res/drawable/ic_readonlylayout.xml
deleted file mode 100644
index 34cc304577..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_readonlylayout.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M58,27C58,25.895 58.895,25 60,25H97H134C135.105,25 136,25.895 136,27V101C136,102.105 135.105,103 134,103H60C58.895,103 58,102.105 58,101V27Z"
-        android:fillColor="#ffffff"
-    />
-  <path
-        android:pathData="M67,41C67,40.448 67.448,40 68,40H126C126.552,40 127,40.448 127,41V41C127,41.552 126.552,42 126,42H68C67.448,42 67,41.552 67,41V41Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M67,51C67,50.448 67.448,50 68,50H118C118.552,50 119,50.448 119,51V51C119,51.552 118.552,52 118,52H68C67.448,52 67,51.552 67,51V51Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M67,56C67,55.448 67.448,55 68,55H94C94.552,55 95,55.448 95,56V56C95,56.552 94.552,57 94,57H68C67.448,57 67,56.552 67,56V56Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M67,36C67,35.448 67.448,35 68,35H113C113.552,35 114,35.448 114,36V36C114,36.552 113.552,37 113,37H68C67.448,37 67,36.552 67,36V36Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M67,46C67,45.448 67.448,45 68,45H126C126.552,45 127,45.448 127,46V46C127,46.552 126.552,47 126,47H68C67.448,47 67,46.552 67,46V46Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M112.5,65.167C106.042,65.167 100.527,69.184 98.292,74.854C100.527,80.524 106.042,84.542 112.5,84.542C118.959,84.542 124.474,80.524 126.709,74.854C124.474,69.184 118.959,65.167 112.5,65.167ZM106.688,74.854C106.688,71.651 109.297,69.042 112.5,69.042C115.704,69.042 118.313,71.651 118.313,74.854C118.313,78.058 115.704,80.667 112.5,80.667C109.297,80.667 106.688,78.058 106.688,74.854ZM109.013,74.854C109.013,76.779 110.576,78.342 112.5,78.342C114.425,78.342 115.988,76.779 115.988,74.854C115.988,72.929 114.425,71.367 112.5,71.367C110.576,71.367 109.013,72.929 109.013,74.854ZM101.108,74.854C103.239,79.207 107.605,81.958 112.5,81.958C117.396,81.958 121.762,79.207 123.893,74.854C121.762,70.501 117.396,67.75 112.5,67.75C107.605,67.75 103.239,70.501 101.108,74.854Z"
-        android:fillColor="#1A73E8"
-        android:fillType="evenOdd"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_reviewlayout.xml b/datacapturegallery/src/main/res/drawable/ic_reviewlayout.xml
deleted file mode 100644
index 0193a0f39d..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_reviewlayout.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M55,27C55,25.895 55.895,25 57,25H94H131C132.105,25 133,25.895 133,27V101C133,102.105 132.105,103 131,103H57C55.895,103 55,102.105 55,101V27Z"
-        android:fillColor="#ffffff"
-    />
-  <path
-        android:pathData="M84,45C84,44.448 84.448,44 85,44H121C121.552,44 122,44.448 122,45V45C122,45.552 121.552,46 121,46H85C84.448,46 84,45.552 84,45V45Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M84,66C84,65.448 84.448,65 85,65H121C121.552,65 122,65.448 122,66V66C122,66.552 121.552,67 121,67H85C84.448,67 84,66.552 84,66V66Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M84,87C84,86.448 84.448,86 85,86H121C121.552,86 122,86.448 122,87V87C122,87.552 121.552,88 121,88H85C84.448,88 84,87.552 84,87V87Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M84,40C84,39.448 84.448,39 85,39H113C113.552,39 114,39.448 114,40V40C114,40.552 113.552,41 113,41H85C84.448,41 84,40.552 84,40V40Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M84,61C84,60.448 84.448,60 85,60H113C113.552,60 114,60.448 114,61V61C114,61.552 113.552,62 113,62H85C84.448,62 84,61.552 84,61V61Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M84,82C84,81.448 84.448,81 85,81H113C113.552,81 114,81.448 114,82V82C114,82.552 113.552,83 113,83H85C84.448,83 84,82.552 84,82V82Z"
-        android:fillColor="#D2E3FC"
-    />
-  <path
-        android:pathData="M70,36.333C66.32,36.333 63.333,39.32 63.333,43C63.333,46.68 66.32,49.667 70,49.667C73.68,49.667 76.666,46.68 76.666,43C76.666,39.32 73.68,36.333 70,36.333ZM68.666,46.333L66,43.667L66.933,42.733L68.666,44.467L73.066,40.067L74,41L68.666,46.333Z"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M70,57.333C66.32,57.333 63.333,60.32 63.333,64C63.333,67.68 66.32,70.667 70,70.667C73.68,70.667 76.666,67.68 76.666,64C76.666,60.32 73.68,57.333 70,57.333ZM68.666,67.333L66,64.667L66.933,63.733L68.666,65.467L73.066,61.067L74,62L68.666,67.333Z"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M70,78.333C66.32,78.333 63.333,81.32 63.333,85C63.333,88.68 66.32,91.667 70,91.667C73.68,91.667 76.666,88.68 76.666,85C76.666,81.32 73.68,78.333 70,78.333ZM68.666,88.333L66,85.667L66.933,84.733L68.666,86.467L73.066,82.067L74,83L68.666,88.333Z"
-        android:fillColor="#1A73E8"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_singlechoice.xml b/datacapturegallery/src/main/res/drawable/ic_singlechoice.xml
deleted file mode 100644
index 6f14779e96..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_singlechoice.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M97,79.481C105.55,79.481 112.481,72.55 112.481,64C112.481,55.45 105.55,48.519 97,48.519C88.45,48.519 81.519,55.45 81.519,64C81.519,72.55 88.45,79.481 97,79.481ZM97,83C107.493,83 116,74.493 116,64C116,53.507 107.493,45 97,45C86.507,45 78,53.507 78,64C78,74.493 86.507,83 97,83Z"
-        android:fillColor="#1A73E8"
-        android:fillType="evenOdd"
-    />
-  <path
-        android:pathData="M97,64m-9.852,0a9.852,9.852 0,1 1,19.704 0a9.852,9.852 0,1 1,-19.704 0"
-        android:fillColor="#1A73E8"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_slider.xml b/datacapturegallery/src/main/res/drawable/ic_slider.xml
deleted file mode 100644
index f2ad3ce412..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_slider.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M22.056,62.944C21.473,62.944 21,63.417 21,64V64C21,64.583 21.473,65.055 22.056,65.055H171.944C172.527,65.055 173,64.583 173,64V64C173,63.417 172.527,62.944 171.944,62.944H22.056Z"
-        android:strokeAlpha="0.24"
-        android:fillColor="#1A73E8"
-        android:fillType="evenOdd"
-        android:fillAlpha="0.24"
-    />
-  <path
-        android:pathData="M22.172,62.828C21.525,62.828 21,63.353 21,64V64C21,64.647 21.525,65.172 22.172,65.172H120.628C121.275,65.172 121.8,64.647 121.8,64V64C121.8,63.353 121.275,62.828 120.628,62.828H22.172Z"
-        android:fillColor="#1A73E8"
-        android:fillType="evenOdd"
-    />
-  <path
-        android:pathData="M113.8,72C118.218,72 121.8,68.418 121.8,64C121.8,59.582 118.218,56 113.8,56C109.382,56 105.8,59.582 105.8,64C105.8,68.418 109.382,72 113.8,72Z"
-        android:fillColor="#1A73E8"
-        android:fillType="evenOdd"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_textfield.xml b/datacapturegallery/src/main/res/drawable/ic_textfield.xml
deleted file mode 100644
index 5f5609e049..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_textfield.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <group>
-    <clip-path
-            android:pathData="M0,64C0,49.641 11.641,38 26,38H194V90H26C11.641,90 0,78.359 0,64V64Z"
-        />
-    <path
-            android:pathData="M66,52C66,48.134 69.134,45 73,45L195,45V83L73,83C69.134,83 66,79.866 66,76V52Z"
-            android:strokeWidth="2"
-            android:fillColor="#ffffff"
-            android:strokeColor="#4285F4"
-        />
-    <path
-            android:pathData="M90.086,70V58.57H86.468V57.112H95.216V58.57H91.616V70H90.086ZM99.714,70.288C98.826,70.288 98.034,70.078 97.338,69.658C96.654,69.238 96.114,68.662 95.718,67.93C95.334,67.198 95.142,66.364 95.142,65.428C95.142,64.552 95.322,63.742 95.682,62.998C96.054,62.254 96.57,61.66 97.23,61.216C97.902,60.76 98.688,60.532 99.588,60.532C100.5,60.532 101.28,60.736 101.928,61.144C102.588,61.54 103.092,62.092 103.44,62.8C103.8,63.508 103.98,64.318 103.98,65.23C103.98,65.314 103.974,65.398 103.962,65.482C103.962,65.566 103.956,65.638 103.944,65.698H96.672C96.72,66.418 96.894,67.018 97.194,67.498C97.506,67.966 97.89,68.32 98.346,68.56C98.802,68.788 99.276,68.902 99.768,68.902C100.44,68.902 100.992,68.746 101.424,68.434C101.868,68.11 102.222,67.714 102.486,67.246L103.782,67.876C103.422,68.572 102.906,69.148 102.234,69.604C101.562,70.06 100.722,70.288 99.714,70.288ZM99.588,61.918C98.844,61.918 98.226,62.152 97.734,62.62C97.242,63.088 96.918,63.694 96.762,64.438H102.36C102.348,64.09 102.246,63.724 102.054,63.34C101.874,62.944 101.586,62.608 101.19,62.332C100.794,62.056 100.26,61.918 99.588,61.918ZM104.945,70L108.185,65.338L105.017,60.82H106.745L109.121,64.222L111.389,60.82H113.189L109.967,65.338L113.243,70H111.461L109.085,66.472L106.727,70H104.945ZM115.838,67.588V62.206H114.236V60.82H115.838V58.228H117.368V60.82H119.618V62.206H117.368V67.21C117.368,67.69 117.464,68.062 117.656,68.326C117.86,68.59 118.19,68.722 118.646,68.722C118.85,68.722 119.036,68.692 119.204,68.632C119.372,68.572 119.522,68.5 119.654,68.416V69.91C119.498,69.982 119.324,70.036 119.132,70.072C118.952,70.12 118.706,70.144 118.394,70.144C117.626,70.144 117.008,69.922 116.54,69.478C116.072,69.022 115.838,68.392 115.838,67.588Z"
-            android:fillColor="#1A73E8"
-        />
-    <path android:pathData="M79,50h1v27h-1z" android:fillColor="#AECBFA" />
-  </group>
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_timepicker.xml b/datacapturegallery/src/main/res/drawable/ic_timepicker.xml
deleted file mode 100644
index 7c0db332f2..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_timepicker.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M58,27C58,25.895 58.895,25 60,25H97H134C135.105,25 136,25.895 136,27V101C136,102.105 135.105,103 134,103H60C58.895,103 58,102.105 58,101V27Z"
-        android:fillColor="#ffffff"
-    />
-  <path
-        android:pathData="M97,73m-23,0a23,23 0,1 1,46 0a23,23 0,1 1,-46 0"
-        android:fillColor="#E8F0FE"
-    />
-  <path
-        android:pathData="M97,72m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:strokeWidth="1"
-        android:pathData="M88.5,84L97,72"
-        android:fillColor="#00000000"
-        android:strokeColor="#1A73E8"
-    />
-  <path
-        android:strokeWidth="1"
-        android:pathData="M86.5,83.5L86.5,83.5A3,3 0,0 1,89.5 86.5L89.5,86.5A3,3 0,0 1,86.5 89.5L86.5,89.5A3,3 0,0 1,83.5 86.5L83.5,86.5A3,3 0,0 1,86.5 83.5z"
-        android:fillColor="#00000000"
-        android:strokeColor="#1A73E8"
-    />
-  <path
-        android:pathData="M75,33.365C75,32.611 75.611,32 76.365,32H92.635C93.389,32 94,32.611 94,33.365V43.635C94,44.389 93.389,45 92.635,45H76.365C75.611,45 75,44.389 75,43.635V33.365Z"
-        android:fillColor="#E8F0FE"
-    />
-  <path
-        android:pathData="M82.025,42.153C81.509,42.153 81.05,42.003 80.649,41.704C80.254,41.398 79.948,40.987 79.731,40.471C79.521,39.949 79.416,39.369 79.416,38.732C79.416,38.095 79.521,37.518 79.731,37.002C79.948,36.48 80.254,36.069 80.649,35.77C81.044,35.464 81.502,35.311 82.025,35.311C82.541,35.311 82.996,35.464 83.391,35.77C83.786,36.069 84.092,36.48 84.308,37.002C84.525,37.518 84.633,38.095 84.633,38.732C84.633,39.369 84.525,39.949 84.308,40.471C84.092,40.987 83.786,41.398 83.391,41.704C82.996,42.003 82.541,42.153 82.025,42.153ZM82.025,41.379C82.381,41.379 82.693,41.264 82.961,41.035C83.235,40.799 83.445,40.481 83.592,40.079C83.738,39.678 83.812,39.229 83.812,38.732C83.812,38.235 83.738,37.786 83.592,37.385C83.445,36.983 83.235,36.668 82.961,36.439C82.693,36.203 82.381,36.085 82.025,36.085C81.661,36.085 81.346,36.203 81.079,36.439C80.811,36.668 80.604,36.983 80.457,37.385C80.311,37.786 80.238,38.235 80.238,38.732C80.238,39.229 80.311,39.678 80.457,40.079C80.604,40.481 80.811,40.799 81.079,41.035C81.346,41.264 81.661,41.379 82.025,41.379ZM85.74,41.78L88.778,36.238H85.424V35.464H89.629V36.295L86.456,42.153L85.74,41.78Z"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M96.998,37.417C96.826,37.417 96.68,37.359 96.559,37.245C96.444,37.124 96.387,36.977 96.387,36.805C96.387,36.639 96.444,36.499 96.559,36.385C96.68,36.264 96.826,36.203 96.998,36.203C97.164,36.203 97.304,36.264 97.419,36.385C97.54,36.499 97.6,36.639 97.6,36.805C97.6,36.977 97.54,37.124 97.419,37.245C97.304,37.359 97.164,37.417 96.998,37.417ZM96.998,41.057C96.826,41.057 96.68,41 96.559,40.885C96.444,40.764 96.387,40.618 96.387,40.446C96.387,40.28 96.444,40.14 96.559,40.025C96.68,39.904 96.826,39.844 96.998,39.844C97.164,39.844 97.304,39.904 97.419,40.025C97.54,40.14 97.6,40.28 97.6,40.446C97.6,40.618 97.54,40.764 97.419,40.885C97.304,41 97.164,41.057 96.998,41.057Z"
-        android:fillColor="#1A73E8"
-    />
-  <path
-        android:pathData="M100,33.365C100,32.611 100.611,32 101.365,32H117.635C118.389,32 119,32.611 119,33.365V43.635C119,44.389 118.389,45 117.635,45H101.365C100.611,45 100,44.389 100,43.635V33.365Z"
-        android:fillColor="#E8F0FE"
-    />
-  <path
-        android:pathData="M106.427,42.153C105.911,42.153 105.453,42.003 105.051,41.704C104.656,41.398 104.351,40.987 104.134,40.471C103.924,39.949 103.819,39.369 103.819,38.732C103.819,38.095 103.924,37.518 104.134,37.002C104.351,36.48 104.656,36.069 105.051,35.77C105.446,35.464 105.905,35.311 106.427,35.311C106.943,35.311 107.399,35.464 107.794,35.77C108.189,36.069 108.495,36.48 108.711,37.002C108.928,37.518 109.036,38.095 109.036,38.732C109.036,39.369 108.928,39.949 108.711,40.471C108.495,40.987 108.189,41.398 107.794,41.704C107.399,42.003 106.943,42.153 106.427,42.153ZM106.427,41.379C106.784,41.379 107.096,41.264 107.364,41.035C107.638,40.799 107.848,40.481 107.994,40.079C108.141,39.678 108.214,39.229 108.214,38.732C108.214,38.235 108.141,37.786 107.994,37.385C107.848,36.983 107.638,36.668 107.364,36.439C107.096,36.203 106.784,36.085 106.427,36.085C106.064,36.085 105.749,36.203 105.481,36.439C105.214,36.668 105.007,36.983 104.86,37.385C104.714,37.786 104.64,38.235 104.64,38.732C104.64,39.229 104.714,39.678 104.86,40.079C105.007,40.481 105.214,40.799 105.481,41.035C105.749,41.264 106.064,41.379 106.427,41.379ZM112.577,42.153C112.061,42.153 111.602,42.003 111.201,41.704C110.806,41.398 110.5,40.987 110.284,40.471C110.073,39.949 109.968,39.369 109.968,38.732C109.968,38.095 110.073,37.518 110.284,37.002C110.5,36.48 110.806,36.069 111.201,35.77C111.596,35.464 112.055,35.311 112.577,35.311C113.093,35.311 113.548,35.464 113.943,35.77C114.338,36.069 114.644,36.48 114.861,37.002C115.077,37.518 115.186,38.095 115.186,38.732C115.186,39.369 115.077,39.949 114.861,40.471C114.644,40.987 114.338,41.398 113.943,41.704C113.548,42.003 113.093,42.153 112.577,42.153ZM112.577,41.379C112.934,41.379 113.246,41.264 113.513,41.035C113.787,40.799 113.997,40.481 114.144,40.079C114.291,39.678 114.364,39.229 114.364,38.732C114.364,38.235 114.291,37.786 114.144,37.385C113.997,36.983 113.787,36.668 113.513,36.439C113.246,36.203 112.934,36.085 112.577,36.085C112.214,36.085 111.898,36.203 111.631,36.439C111.363,36.668 111.156,36.983 111.01,37.385C110.863,37.786 110.79,38.235 110.79,38.732C110.79,39.229 110.863,39.678 111.01,40.079C111.156,40.481 111.363,40.799 111.631,41.035C111.898,41.264 112.214,41.379 112.577,41.379Z"
-        android:fillColor="#1A73E8"
-    />
-</vector>
diff --git a/datacapturegallery/src/main/res/drawable/ic_unitoptions.xml b/datacapturegallery/src/main/res/drawable/ic_unitoptions.xml
deleted file mode 100644
index 1db4f9a0dc..0000000000
--- a/datacapturegallery/src/main/res/drawable/ic_unitoptions.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="194dp"
-    android:height="128dp"
-    android:viewportWidth="194"
-    android:viewportHeight="128"
->
-  <path
-        android:pathData="M108.872,75.872L106.884,77.86L105.904,76.88L107.892,74.892L103.188,70.188L101.2,72.176L100.22,71.196L102.208,69.208L97.504,64.504L95.516,66.492L94.536,65.512L96.524,63.524L91.792,58.792L89.832,60.78L88.824,59.8L90.812,57.812L86.108,53.108L84.12,55.096L83.14,54.088L85.128,52.1L80.2,47.2V76.6C80.2,78.924 82.076,80.8 84.4,80.8H113.8L108.872,75.872ZM85.8,75.2V60.724L100.276,75.2H85.8Z"
-        android:fillColor="#1A73E8"
-    />
-</vector>