From f996352a4dd9ef4fa6d6a5a59372f0490909a6d0 Mon Sep 17 00:00:00 2001
From: marysoloman <nikitamarysolomanpvt@gmail.com>
Date: Wed, 13 Nov 2019 19:13:56 +0530
Subject: [PATCH 1/8] topic tab hi-fi UI

---
 .../res/color/tab_icon_color_selector.xml     |  5 ++++
 .../main/res/drawable/ic_play_icon_24dp.xml   | 14 +++-------
 .../main/res/drawable/ic_review_icon_24dp.xml | 27 +++++--------------
 .../main/res/drawable/ic_train_icon_24dp.xml  | 27 +++++--------------
 app/src/main/res/layout/topic_fragment.xml    |  8 ++++--
 app/src/main/res/values/styles.xml            | 17 ++++++++++++
 6 files changed, 46 insertions(+), 52 deletions(-)
 create mode 100644 app/src/main/res/color/tab_icon_color_selector.xml

diff --git a/app/src/main/res/color/tab_icon_color_selector.xml b/app/src/main/res/color/tab_icon_color_selector.xml
new file mode 100644
index 00000000000..2f8fd704310
--- /dev/null
+++ b/app/src/main/res/color/tab_icon_color_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="@color/white" android:state_selected="true"/>
+  <item android:color="@color/white_80"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_play_icon_24dp.xml b/app/src/main/res/drawable/ic_play_icon_24dp.xml
index abfcde6b66e..f53f1c846e7 100644
--- a/app/src/main/res/drawable/ic_play_icon_24dp.xml
+++ b/app/src/main/res/drawable/ic_play_icon_24dp.xml
@@ -1,11 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="24dp"
-  android:height="24dp"
-  android:viewportWidth="419.14468"
-  android:viewportHeight="403.60483">
-  <path
-    android:fillAlpha="1"
-    android:fillColor="#FFFFFF"
-    android:pathData="M281.781,0C280.899,0.011 279.993,0.055 279.094,0.125C243.27,6.308 223.573,44.189 220.719,77.594C216.548,107.905 229.906,146.864 263.188,153.656C268.015,154.575 273.031,154.155 277.75,152.875C317.827,139.437 335.762,91.972 329.969,52.656C328.285,27.264 309.143,-0.349 281.781,0zM129.906,1.625C107.631,2.172 90.28,24.763 86.75,46C79.309,88.074 98.448,140.352 142.281,153.656C146.387,154.549 150.634,154.641 154.781,154C184.408,149.063 196.958,115.846 195.719,89.031C194.827,53.659 176.453,12.758 139.719,2.813C136.361,1.922 133.088,1.547 129.906,1.625zM378.844,121.125C340.309,123.43 313.891,161.879 310.125,197.781C305.025,223.675 318.83,258.308 348.375,260.375C389.572,259.867 417.676,215.846 418.844,177.969C421.45,152.917 406.693,122.508 378.844,121.125zM41.563,129.656C25.168,129.515 9.045,139.335 3.688,156C-10.605,200.579 18.096,257.038 65.313,266.406C85.018,269.778 102.333,254.645 107.219,236.438C117.573,197.493 96.305,152.272 60.313,134.594C54.449,131.303 47.978,129.711 41.563,129.656zM214.313,209.594C182.173,209.662 149.53,225.972 128.719,250.25C106.241,278.547 87.828,311.477 80.625,347.188C71.874,372.894 91.708,402.478 119.188,402.656C152.246,403.575 180.658,380.873 213.531,379.188C241.421,374.936 266.394,389.443 291.469,398.938C312.818,408.069 342.319,404.569 353.219,381.594C361.792,358.175 349.173,333.204 338.719,312.406C317.397,278.649 294.554,243.17 259.594,222.094C245.581,213.408 230.008,209.56 214.313,209.594z"
-    android:strokeColor="#00000000" />
+<vector android:height="24dp" android:viewportHeight="403.60483"
+    android:viewportWidth="419.14468" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#FFFFFF"
+        android:pathData="M281.781,0C280.899,0.011 279.993,0.055 279.094,0.125C243.27,6.308 223.573,44.189 220.719,77.594C216.548,107.905 229.906,146.864 263.188,153.656C268.015,154.575 273.031,154.155 277.75,152.875C317.827,139.437 335.762,91.972 329.969,52.656C328.285,27.264 309.143,-0.349 281.781,0zM129.906,1.625C107.631,2.172 90.28,24.763 86.75,46C79.309,88.074 98.448,140.352 142.281,153.656C146.387,154.549 150.634,154.641 154.781,154C184.408,149.063 196.958,115.846 195.719,89.031C194.827,53.659 176.453,12.758 139.719,2.813C136.361,1.922 133.088,1.547 129.906,1.625zM378.844,121.125C340.309,123.43 313.891,161.879 310.125,197.781C305.025,223.675 318.83,258.308 348.375,260.375C389.572,259.867 417.676,215.846 418.844,177.969C421.45,152.917 406.693,122.508 378.844,121.125zM41.563,129.656C25.168,129.515 9.045,139.335 3.688,156C-10.605,200.579 18.096,257.038 65.313,266.406C85.018,269.778 102.333,254.645 107.219,236.438C117.573,197.493 96.305,152.272 60.313,134.594C54.449,131.303 47.978,129.711 41.563,129.656zM214.313,209.594C182.173,209.662 149.53,225.972 128.719,250.25C106.241,278.547 87.828,311.477 80.625,347.188C71.874,372.894 91.708,402.478 119.188,402.656C152.246,403.575 180.658,380.873 213.531,379.188C241.421,374.936 266.394,389.443 291.469,398.938C312.818,408.069 342.319,404.569 353.219,381.594C361.792,358.175 349.173,333.204 338.719,312.406C317.397,278.649 294.554,243.17 259.594,222.094C245.581,213.408 230.008,209.56 214.313,209.594z" android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_review_icon_24dp.xml b/app/src/main/res/drawable/ic_review_icon_24dp.xml
index ff954de75ce..85b4888b842 100644
--- a/app/src/main/res/drawable/ic_review_icon_24dp.xml
+++ b/app/src/main/res/drawable/ic_review_icon_24dp.xml
@@ -1,21 +1,8 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="24dp"
-  android:height="24dp"
-  android:viewportWidth="200"
-  android:viewportHeight="223.85">
-  <path
-    android:fillColor="#FFFFFF"
-    android:pathData="M173.57,0a51,51 0,0 1,5.34 1.09,28.43 28.43,0 0,1 20.88,24.4 26.89,26.89 0,0 1,0.2 4.11L199.99,133.33L183.57,133.33L183.57,29.68A12.46,12.46 0,0 0,174.98 17.09a12.6,12.6 0,0 0,-3.8 -0.62L28.87,16.47a12.47,12.47 0,0 0,-12.4 12.45L16.47,194.16a12.59,12.59 0,0 0,11.9 13.25c0.37,0 0.73,0 1.09,0h91.27v16.42L28.86,223.83a28.81,28.81 0,0 1,-28.59 -25.27c-0.08,-0.64 -0.18,-1.26 -0.27,-1.9L0,27.18c0.15,-0.93 0.27,-1.87 0.43,-2.79a28.19,28.19 0,0 1,19 -22.75,55.27 55.27,0 0,1 6.81,-1.63Z" />
-  <path
-    android:fillColor="#FFFFFF"
-    android:pathData="M168.06,201.78a53.84,53.84 0,0 1,-16.77 7,35.08 35.08,0 0,1 -24.1,-3.87 41.07,41.07 0,0 1,-21.51 -40.6A39.77,39.77 0,0 1,134.56 130.68a56.94,56.94 0,0 1,6.57 -1.3,24.85 24.85,0 0,1 3,0.33 39.44,39.44 0,0 1,35.05 17.75,37.88 37.88,0 0,1 6.64,23.14 38.86,38.86 0,0 1,-3.45 15,78.77 78.77,0 0,1 -4.21,7.15c2.76,0.49 4.27,2.72 6.11,4.53 4.17,4.12 8.32,8.26 12.51,12.36a8.16,8.16 0,0 1,2.13 9.08,7.68 7.68,0 0,1 -12.51,2.79c-5,-5.18 -10.3,-10.15 -15.33,-15.33A29.1,29.1 0,0 1,168.06 201.78ZM147.11,145.29a24.5,24.5 0,0 0,-22.74 35.66,24 24,0 0,0 30.87,12 24.5,24.5 0,0 0,3.28 -43.8A30.06,30.06 0,0 0,147.11 145.29Z" />
-  <path
-    android:fillColor="#FFFFFF"
-    android:pathData="M98.38,40.36h50.12a8.91,8.91 0,0 1,8.88 5.56A8.76,8.76 0,0 1,152.98 57.49a8.94,8.94 0,0 1,-3.49 0.76c-7,0.07 -14.08,0 -21.13,0L47.98,58.25a8.95,8.95 0,0 1,-1.31 -17.84h2.06Z" />
-  <path
-    android:fillColor="#FFFFFF"
-    android:pathData="M83.12,105.39c-11.69,0 -23.37,-0.07 -35,0a9.36,9.36 0,0 1,-9.38 -7.39,9.1 9.1,0 0,1 7.52,-10.43c0.24,0 0.49,-0.07 0.73,-0.09h71.48a9,9 0,0 1,9.33 7.67,9.31 9.31,0 0,1 -7.85,10.17c-0.87,0.07 -1.75,0.07 -2.63,0.07Z" />
-  <path
-    android:fillColor="#FFFFFF"
-    android:pathData="M65.87,147.99h-18a9,9 0,1 1,-0.86 -17.94h0.51q18.57,-0.12 37.12,0a8.87,8.87 0,0 1,8.78 9c0,0.21 0,0.41 0,0.62a9.26,9.26 0,0 1,-9.14 8.36Z" />
+<vector android:height="24dp" android:viewportHeight="223.85"
+    android:viewportWidth="200" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M173.57,0a51,51 0,0 1,5.34 1.09,28.43 28.43,0 0,1 20.88,24.4 26.89,26.89 0,0 1,0.2 4.11L199.99,133.33L183.57,133.33L183.57,29.68A12.46,12.46 0,0 0,174.98 17.09a12.6,12.6 0,0 0,-3.8 -0.62L28.87,16.47a12.47,12.47 0,0 0,-12.4 12.45L16.47,194.16a12.59,12.59 0,0 0,11.9 13.25c0.37,0 0.73,0 1.09,0h91.27v16.42L28.86,223.83a28.81,28.81 0,0 1,-28.59 -25.27c-0.08,-0.64 -0.18,-1.26 -0.27,-1.9L0,27.18c0.15,-0.93 0.27,-1.87 0.43,-2.79a28.19,28.19 0,0 1,19 -22.75,55.27 55.27,0 0,1 6.81,-1.63Z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M168.06,201.78a53.84,53.84 0,0 1,-16.77 7,35.08 35.08,0 0,1 -24.1,-3.87 41.07,41.07 0,0 1,-21.51 -40.6A39.77,39.77 0,0 1,134.56 130.68a56.94,56.94 0,0 1,6.57 -1.3,24.85 24.85,0 0,1 3,0.33 39.44,39.44 0,0 1,35.05 17.75,37.88 37.88,0 0,1 6.64,23.14 38.86,38.86 0,0 1,-3.45 15,78.77 78.77,0 0,1 -4.21,7.15c2.76,0.49 4.27,2.72 6.11,4.53 4.17,4.12 8.32,8.26 12.51,12.36a8.16,8.16 0,0 1,2.13 9.08,7.68 7.68,0 0,1 -12.51,2.79c-5,-5.18 -10.3,-10.15 -15.33,-15.33A29.1,29.1 0,0 1,168.06 201.78ZM147.11,145.29a24.5,24.5 0,0 0,-22.74 35.66,24 24,0 0,0 30.87,12 24.5,24.5 0,0 0,3.28 -43.8A30.06,30.06 0,0 0,147.11 145.29Z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M98.38,40.36h50.12a8.91,8.91 0,0 1,8.88 5.56A8.76,8.76 0,0 1,152.98 57.49a8.94,8.94 0,0 1,-3.49 0.76c-7,0.07 -14.08,0 -21.13,0L47.98,58.25a8.95,8.95 0,0 1,-1.31 -17.84h2.06Z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M83.12,105.39c-11.69,0 -23.37,-0.07 -35,0a9.36,9.36 0,0 1,-9.38 -7.39,9.1 9.1,0 0,1 7.52,-10.43c0.24,0 0.49,-0.07 0.73,-0.09h71.48a9,9 0,0 1,9.33 7.67,9.31 9.31,0 0,1 -7.85,10.17c-0.87,0.07 -1.75,0.07 -2.63,0.07Z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M65.87,147.99h-18a9,9 0,1 1,-0.86 -17.94h0.51q18.57,-0.12 37.12,0a8.87,8.87 0,0 1,8.78 9c0,0.21 0,0.41 0,0.62a9.26,9.26 0,0 1,-9.14 8.36Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_train_icon_24dp.xml b/app/src/main/res/drawable/ic_train_icon_24dp.xml
index 04dae36da8b..8cac55f8839 100644
--- a/app/src/main/res/drawable/ic_train_icon_24dp.xml
+++ b/app/src/main/res/drawable/ic_train_icon_24dp.xml
@@ -1,21 +1,8 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="24dp"
-  android:height="24dp"
-  android:viewportWidth="200"
-  android:viewportHeight="153.7">
-  <path
-    android:fillColor="#FFFFFF"
-    android:pathData="M45.85,0.05h5.68a19.57,19.57 0,0 1,11.38 6.57c0.14,0.16 0.82,0.1 1,-0.09 0.63,-0.52 1.12,-1.19 1.72,-1.78a20.06,20.06 0,0 1,9.57 -4.75h5.68l0.47,0.14a18.75,18.75 0,0 1,13.51 10,3.54 3.54,0 0,0 2.54,2 18.39,18.39 0,0 1,14.06 20.58c-0.13,1 0.1,1.42 1.08,1.63a16.93,16.93 0,0 1,7.13 3.51,18.61 18.61,0 0,1 6.92,11.88L126.59,55.31a23.65,23.65 0,0 1,-3.05 7.49,1.46 1.46,0 0,0 0,1.32 22.67,22.67 0,0 1,3.05 7.49L126.59,77.31a42.83,42.83 0,0 1,-2.27 6.35,17.84 17.84,0 0,1 -11.67,9c-0.78,0.21 -1.38,0.37 -1.22,1.44a18.45,18.45 0,0 1,-14.62 21,3 3,0 0,0 -2.28,1.78A18.62,18.62 0,0 1,64.3 120.31c-0.71,-0.81 -1.06,-0.82 -1.79,0a17.46,17.46 0,0 1,-12.23 6.21A18.32,18.32 0,0 1,32 116.46a2.33,2.33 0,0 0,-1.78 -1.28,18.62 18.62,0 0,1 -14.85,-21c0.14,-0.92 -0.19,-1.26 -1,-1.45a18.57,18.57 0,0 1,-13.75 -22.37,18.8 18.8,0 0,1 2.36,-5.6 2,2 0,0 0,0 -2.54A17.8,17.8 0,0 1,1 46.51a18,18 0,0 1,13.07 -12.13c1.06,-0.29 1.34,-0.67 1.19,-1.78a17.36,17.36 0,0 1,0.55 -7.58,17.93 17.93,0 0,1 13.76,-12.93 3.32,3.32 0,0 0,2.28 -1.78,28.88 28.88,0 0,1 3.57,-4.87A18.45,18.45 0,0 1,45.85 0.05ZM39.67,12.39 L41.07,13.02a17.13,17.13 0,0 1,5.89 4,3.84 3.84,0 0,1 -5.11,5.71c-0.44,-0.32 -0.84,-0.66 -1.27,-1a10.91,10.91 0,0 0,-17.44 11.14,2.5 2.5,0 0,0 1.78,2 18.17,18.17 0,0 1,6.84 4.3,3.66 3.66,0 0,1 1.08,3.83 3.76,3.76 0,0 1,-2.89 2.74,4.44 4.44,0 0,1 -4.11,-1.49 10.42,10.42 0,0 0,-7 -2.62,10.87 10.87,0 0,0 -2.49,21.5c1,0.22 2,0.21 2.94,0.36a3.78,3.78 0,0 1,3.18 4.06,3.68 3.68,0 0,1 -3.36,3.51 16.6,16.6 0,0 1,-8.26 -1.64c-1.38,-0.67 -1.58,-0.65 -2.17,0.83a10.9,10.9 0,1 0,19.6 -0.7,20.61 20.61,0 0,0 -2,-2.8 3.85,3.85 0,1 1,5.72 -5.14,18.09 18.09,0 0,1 5.2,15.35c-0.14,1.26 0.18,1.63 1.32,1.92a18.62,18.62 0,0 1,13.88 18.21,3.72 3.72,0 0,1 -3.36,3.64 3.81,3.81 0,0 1,-4.2 -3,16 16,0 0,1 -0.27,-2 10.81,10.81 0,0 0,-8.78 -9.57c-0.93,-0.14 -2,-0.6 -2.84,0.47a18.29,18.29 0,0 1,-8.21 5.7,2.57 2.57,0 0,0 -1.36,1.37 11,11 0,0 0,5.48 12.95c0.79,0.38 1.19,0.3 1.63,-0.54a3.69,3.69 0,0 1,4.09 -1.87,3.81 3.81,0 0,1 3,3c0.12,0.69 0.21,1.38 0.28,2.08a10.8,10.8 0,0 0,15.44 8.5,11.22 11.22,0 0,0 6.37,-10.86c0.05,-11.4 0,-22.81 0,-34.21 0,-0.39 0,-0.78 -0.07,-1.44l-1.44,0.85a17.06,17.06 0,0 1,-9.76 2.58,3.73 3.73,0 0,1 -3.56,-3.33 3.81,3.81 0,0 1,3 -4.21c0.65,-0.12 1.3,-0.19 1.95,-0.26a10.58,10.58 0,0 0,8.28 -5.35,12.1 12.1,0 0,0 1.56,-6.53q0,-17.73 0,-35.44a14.82,14.82 0,0 0,-0.41 -3.57,10.78 10.78,0 0,0 -12.5,-8.26A10.11,10.11 0,0 0,39.67 12.39ZM67.28,71.31c0,0.68 -0.08,1.11 -0.08,1.54 0,3.57 0.07,7.08 0.09,10.62 0,8.55 -0.07,17.11 0.18,25.66a9.65,9.65 0,0 0,6.38 8.77,10.43 10.43,0 0,0 11,-1.27 11.48,11.48 0,0 0,4.43 -8.86,3.62 3.62,0 0,1 2.88,-3.56 3.77,3.77 0,0 1,4.27 2c0.41,0.76 0.78,0.76 1.45,0.46a10.87,10.87 0,0 0,5.59 -13,2.48 2.48,0 0,0 -1.29,-1.3 19.92,19.92 0,0 1,-8.31 -5.76,1.78 1.78,0 0,0 -1.22,-0.59 10.47,10.47 0,0 0,-7.78 3.69,12.82 12.82,0 0,0 -2.83,7.72 3.68,3.68 0,0 1,-4.08 3.23h0a3.76,3.76 0,0 1,-3.47 -3.67,16.61 16.61,0 0,1 1.34,-7.13 18.49,18.49 0,0 1,12.72 -11.11c0.71,-0.2 1.29,-0.32 1.25,-1.32a36.88,36.88 0,0 1,0.08 -6.13,17 17,0 0,1 5.05,-9.79 3.83,3.83 0,0 1,5.78 5c-0.34,0.46 -0.72,0.9 -1.08,1.35a10.91,10.91 0,1 0,18.51 2.24c-0.59,-1.39 -0.78,-1.43 -2.1,-0.81a16.94,16.94 0,0 1,-8 1.7,3.82 3.82,0 0,1 -0.43,-7.59c0.53,-0.08 1.06,-0.17 1.59,-0.22a10.54,10.54 0,0 0,9.81 -10.48,10.78 10.78,0 0,0 -13.71,-10.82 14.85,14.85 0,0 0,-5.19 3,3.74 3.74,0 0,1 -5.27,-0.42l0,0a3.8,3.8 0,0 1,0.32 -5.35,16.5 16.5,0 0,1 6.53,-4.1 2.73,2.73 0,0 0,2.17 -2.48,18.5 18.5,0 0,0 0.27,-2.58 10.93,10.93 0,0 0,-14 -10.17,19.81 19.81,0 0,0 -4.85,2.83 3.84,3.84 0,0 1,-5.43 -0.29h0a3.71,3.71 0,0 1,0.08 -5.25,3.79 3.79,0 0,1 0.38,-0.32 66.05,66.05 0,0 1,5.74 -3.78,12.88 12.88,0 0,1 1.18,-0.59c-0.39,-0.52 -0.65,-0.93 -1,-1.28a10.79,10.79 0,0 0,-12.36 -2.42,11.16 11.16,0 0,0 -6.53,10.88c-0.06,5.84 0.1,11.68 0.1,17.53s-0.12,11.93 -0.1,17.9a12.3,12.3 0,0 0,2.47 8,11.9 11.9,0 0,0 9,4.24 3.56,3.56 0,0 1,3.38 3.73c0,0.12 0,0.25 0,0.36a3.71,3.71 0,0 1,-3.64 3.48,17.57 17.57,0 0,1 -9.11,-2.26 18.23,18.23 0,0 1,-2 -1.12Z" />
-  <path
-    android:fillColor="#FFFFFF"
-    android:pathData="M74.33,45.08c0.11,1.1 0.19,2.21 0.35,3.29a17.57,17.57 0,0 0,5.11 9.78,3.83 3.83,0 0,0 5.76,-5c-0.39,-0.53 -0.84,-1 -1.23,-1.54a10.33,10.33 0,0 1,-2.08 -5.32,11.11 11.11,0 0,1 2.92,-8.84 3.89,3.89 0,0 0,1.18 -3.6,3.87 3.87,0 0,0 -6.7,-1.78A18.51,18.51 0,0 0,74.33 45.08Z" />
-  <path
-    android:fillColor="#FFFFFF"
-    android:pathData="M52.53,44.99a18.81,18.81 0,0 1,-5.22 12.89,3.81 3.81,0 0,1 -5.32,0.74 2,2 0,0 1,-0.27 -0.23,3.73 3.73,0 0,1 -0.53,-5.25 3.39,3.39 0,0 1,0.31 -0.34,11.51 11.51,0 0,0 3.06,-9.06 10.77,10.77 0,0 0,-2.08 -5.2c-0.37,-0.54 -0.81,-1 -1.18,-1.56a3.84,3.84 0,0 1,5.67 -5.16,17.06 17.06,0 0,1 4.87,8.57C52.19,41.89 52.3,43.46 52.53,44.99Z" />
-  <path
-    android:fillColor="#FFFFFF"
-    android:pathData="M74.33,45.08a18.57,18.57 0,0 1,5.3 -13.07,3.87 3.87,0 0,1 6.7,1.78 3.88,3.88 0,0 1,-1.18 3.6,11.1 11.1,0 0,0 -2.92,8.85 10.37,10.37 0,0 0,2.08 5.32c0.38,0.52 0.84,1 1.23,1.53a3.84,3.84 0,0 1,-5.76 5.05,17.6 17.6,0 0,1 -5.11,-9.78C74.52,47.31 74.44,46.18 74.33,45.08Z" />
-  <path
-    android:fillColor="#FFFFFF"
-    android:pathData="M123.63,145.21l8.49,8.49 8.5,-8.49 -21.2,-21.21 50.89,-50.89 21.2,21.2 8.49,-8.49L191.51,77.31l8.49,-8.49 -12.71,-12.71 8.49,-8.49 -8.49,-8.49 -8.49,8.49 -12.71,-12.71 -8.49,8.49 -8.49,-8.49 -8.49,8.49 21.2,21.2 -50.9,50.89L89.72,94.31l-8.49,8.49 8.49,8.5 -8.49,8.49 12.71,12.71 -8.49,8.49 8.49,8.49 8.49,-8.49 12.71,12.71Z" />
+<vector android:height="24dp" android:viewportHeight="153.7"
+    android:viewportWidth="200" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M45.85,0.05h5.68a19.57,19.57 0,0 1,11.38 6.57c0.14,0.16 0.82,0.1 1,-0.09 0.63,-0.52 1.12,-1.19 1.72,-1.78a20.06,20.06 0,0 1,9.57 -4.75h5.68l0.47,0.14a18.75,18.75 0,0 1,13.51 10,3.54 3.54,0 0,0 2.54,2 18.39,18.39 0,0 1,14.06 20.58c-0.13,1 0.1,1.42 1.08,1.63a16.93,16.93 0,0 1,7.13 3.51,18.61 18.61,0 0,1 6.92,11.88L126.59,55.31a23.65,23.65 0,0 1,-3.05 7.49,1.46 1.46,0 0,0 0,1.32 22.67,22.67 0,0 1,3.05 7.49L126.59,77.31a42.83,42.83 0,0 1,-2.27 6.35,17.84 17.84,0 0,1 -11.67,9c-0.78,0.21 -1.38,0.37 -1.22,1.44a18.45,18.45 0,0 1,-14.62 21,3 3,0 0,0 -2.28,1.78A18.62,18.62 0,0 1,64.3 120.31c-0.71,-0.81 -1.06,-0.82 -1.79,0a17.46,17.46 0,0 1,-12.23 6.21A18.32,18.32 0,0 1,32 116.46a2.33,2.33 0,0 0,-1.78 -1.28,18.62 18.62,0 0,1 -14.85,-21c0.14,-0.92 -0.19,-1.26 -1,-1.45a18.57,18.57 0,0 1,-13.75 -22.37,18.8 18.8,0 0,1 2.36,-5.6 2,2 0,0 0,0 -2.54A17.8,17.8 0,0 1,1 46.51a18,18 0,0 1,13.07 -12.13c1.06,-0.29 1.34,-0.67 1.19,-1.78a17.36,17.36 0,0 1,0.55 -7.58,17.93 17.93,0 0,1 13.76,-12.93 3.32,3.32 0,0 0,2.28 -1.78,28.88 28.88,0 0,1 3.57,-4.87A18.45,18.45 0,0 1,45.85 0.05ZM39.67,12.39 L41.07,13.02a17.13,17.13 0,0 1,5.89 4,3.84 3.84,0 0,1 -5.11,5.71c-0.44,-0.32 -0.84,-0.66 -1.27,-1a10.91,10.91 0,0 0,-17.44 11.14,2.5 2.5,0 0,0 1.78,2 18.17,18.17 0,0 1,6.84 4.3,3.66 3.66,0 0,1 1.08,3.83 3.76,3.76 0,0 1,-2.89 2.74,4.44 4.44,0 0,1 -4.11,-1.49 10.42,10.42 0,0 0,-7 -2.62,10.87 10.87,0 0,0 -2.49,21.5c1,0.22 2,0.21 2.94,0.36a3.78,3.78 0,0 1,3.18 4.06,3.68 3.68,0 0,1 -3.36,3.51 16.6,16.6 0,0 1,-8.26 -1.64c-1.38,-0.67 -1.58,-0.65 -2.17,0.83a10.9,10.9 0,1 0,19.6 -0.7,20.61 20.61,0 0,0 -2,-2.8 3.85,3.85 0,1 1,5.72 -5.14,18.09 18.09,0 0,1 5.2,15.35c-0.14,1.26 0.18,1.63 1.32,1.92a18.62,18.62 0,0 1,13.88 18.21,3.72 3.72,0 0,1 -3.36,3.64 3.81,3.81 0,0 1,-4.2 -3,16 16,0 0,1 -0.27,-2 10.81,10.81 0,0 0,-8.78 -9.57c-0.93,-0.14 -2,-0.6 -2.84,0.47a18.29,18.29 0,0 1,-8.21 5.7,2.57 2.57,0 0,0 -1.36,1.37 11,11 0,0 0,5.48 12.95c0.79,0.38 1.19,0.3 1.63,-0.54a3.69,3.69 0,0 1,4.09 -1.87,3.81 3.81,0 0,1 3,3c0.12,0.69 0.21,1.38 0.28,2.08a10.8,10.8 0,0 0,15.44 8.5,11.22 11.22,0 0,0 6.37,-10.86c0.05,-11.4 0,-22.81 0,-34.21 0,-0.39 0,-0.78 -0.07,-1.44l-1.44,0.85a17.06,17.06 0,0 1,-9.76 2.58,3.73 3.73,0 0,1 -3.56,-3.33 3.81,3.81 0,0 1,3 -4.21c0.65,-0.12 1.3,-0.19 1.95,-0.26a10.58,10.58 0,0 0,8.28 -5.35,12.1 12.1,0 0,0 1.56,-6.53q0,-17.73 0,-35.44a14.82,14.82 0,0 0,-0.41 -3.57,10.78 10.78,0 0,0 -12.5,-8.26A10.11,10.11 0,0 0,39.67 12.39ZM67.28,71.31c0,0.68 -0.08,1.11 -0.08,1.54 0,3.57 0.07,7.08 0.09,10.62 0,8.55 -0.07,17.11 0.18,25.66a9.65,9.65 0,0 0,6.38 8.77,10.43 10.43,0 0,0 11,-1.27 11.48,11.48 0,0 0,4.43 -8.86,3.62 3.62,0 0,1 2.88,-3.56 3.77,3.77 0,0 1,4.27 2c0.41,0.76 0.78,0.76 1.45,0.46a10.87,10.87 0,0 0,5.59 -13,2.48 2.48,0 0,0 -1.29,-1.3 19.92,19.92 0,0 1,-8.31 -5.76,1.78 1.78,0 0,0 -1.22,-0.59 10.47,10.47 0,0 0,-7.78 3.69,12.82 12.82,0 0,0 -2.83,7.72 3.68,3.68 0,0 1,-4.08 3.23h0a3.76,3.76 0,0 1,-3.47 -3.67,16.61 16.61,0 0,1 1.34,-7.13 18.49,18.49 0,0 1,12.72 -11.11c0.71,-0.2 1.29,-0.32 1.25,-1.32a36.88,36.88 0,0 1,0.08 -6.13,17 17,0 0,1 5.05,-9.79 3.83,3.83 0,0 1,5.78 5c-0.34,0.46 -0.72,0.9 -1.08,1.35a10.91,10.91 0,1 0,18.51 2.24c-0.59,-1.39 -0.78,-1.43 -2.1,-0.81a16.94,16.94 0,0 1,-8 1.7,3.82 3.82,0 0,1 -0.43,-7.59c0.53,-0.08 1.06,-0.17 1.59,-0.22a10.54,10.54 0,0 0,9.81 -10.48,10.78 10.78,0 0,0 -13.71,-10.82 14.85,14.85 0,0 0,-5.19 3,3.74 3.74,0 0,1 -5.27,-0.42l0,0a3.8,3.8 0,0 1,0.32 -5.35,16.5 16.5,0 0,1 6.53,-4.1 2.73,2.73 0,0 0,2.17 -2.48,18.5 18.5,0 0,0 0.27,-2.58 10.93,10.93 0,0 0,-14 -10.17,19.81 19.81,0 0,0 -4.85,2.83 3.84,3.84 0,0 1,-5.43 -0.29h0a3.71,3.71 0,0 1,0.08 -5.25,3.79 3.79,0 0,1 0.38,-0.32 66.05,66.05 0,0 1,5.74 -3.78,12.88 12.88,0 0,1 1.18,-0.59c-0.39,-0.52 -0.65,-0.93 -1,-1.28a10.79,10.79 0,0 0,-12.36 -2.42,11.16 11.16,0 0,0 -6.53,10.88c-0.06,5.84 0.1,11.68 0.1,17.53s-0.12,11.93 -0.1,17.9a12.3,12.3 0,0 0,2.47 8,11.9 11.9,0 0,0 9,4.24 3.56,3.56 0,0 1,3.38 3.73c0,0.12 0,0.25 0,0.36a3.71,3.71 0,0 1,-3.64 3.48,17.57 17.57,0 0,1 -9.11,-2.26 18.23,18.23 0,0 1,-2 -1.12Z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M74.33,45.08c0.11,1.1 0.19,2.21 0.35,3.29a17.57,17.57 0,0 0,5.11 9.78,3.83 3.83,0 0,0 5.76,-5c-0.39,-0.53 -0.84,-1 -1.23,-1.54a10.33,10.33 0,0 1,-2.08 -5.32,11.11 11.11,0 0,1 2.92,-8.84 3.89,3.89 0,0 0,1.18 -3.6,3.87 3.87,0 0,0 -6.7,-1.78A18.51,18.51 0,0 0,74.33 45.08Z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M52.53,44.99a18.81,18.81 0,0 1,-5.22 12.89,3.81 3.81,0 0,1 -5.32,0.74 2,2 0,0 1,-0.27 -0.23,3.73 3.73,0 0,1 -0.53,-5.25 3.39,3.39 0,0 1,0.31 -0.34,11.51 11.51,0 0,0 3.06,-9.06 10.77,10.77 0,0 0,-2.08 -5.2c-0.37,-0.54 -0.81,-1 -1.18,-1.56a3.84,3.84 0,0 1,5.67 -5.16,17.06 17.06,0 0,1 4.87,8.57C52.19,41.89 52.3,43.46 52.53,44.99Z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M74.33,45.08a18.57,18.57 0,0 1,5.3 -13.07,3.87 3.87,0 0,1 6.7,1.78 3.88,3.88 0,0 1,-1.18 3.6,11.1 11.1,0 0,0 -2.92,8.85 10.37,10.37 0,0 0,2.08 5.32c0.38,0.52 0.84,1 1.23,1.53a3.84,3.84 0,0 1,-5.76 5.05,17.6 17.6,0 0,1 -5.11,-9.78C74.52,47.31 74.44,46.18 74.33,45.08Z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M123.63,145.21l8.49,8.49 8.5,-8.49 -21.2,-21.21 50.89,-50.89 21.2,21.2 8.49,-8.49L191.51,77.31l8.49,-8.49 -12.71,-12.71 8.49,-8.49 -8.49,-8.49 -8.49,8.49 -12.71,-12.71 -8.49,8.49 -8.49,-8.49 -8.49,8.49 21.2,21.2 -50.9,50.89L89.72,94.31l-8.49,8.49 8.49,8.5 -8.49,8.49 12.71,12.71 -8.49,8.49 8.49,8.49 8.49,-8.49 12.71,12.71Z"/>
 </vector>
diff --git a/app/src/main/res/layout/topic_fragment.xml b/app/src/main/res/layout/topic_fragment.xml
index 3b65bf68ccb..333bbccf45d 100644
--- a/app/src/main/res/layout/topic_fragment.xml
+++ b/app/src/main/res/layout/topic_fragment.xml
@@ -22,6 +22,7 @@
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
         app:titleTextColor="@color/white"
+        android:textSize="20dp"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
 
       <com.google.android.material.tabs.TabLayout
@@ -32,9 +33,12 @@
         app:tabGravity="fill"
         app:tabIndicatorColor="@android:color/white"
         app:tabIndicatorHeight="2dp"
+        android:textSize="14sp"
+        app:tabIconTint="@color/tab_icon_color_selector"
         app:tabMode="fixed"
-        app:tabTextAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TabWidget"
-        app:tabTextColor="@android:color/white" />
+        style="@style/AppTabLayout"
+        app:tabTextAppearance="@style/AppTabTextAppearance"
+        app:tabTextColor="@color/tab_icon_color_selector" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.viewpager.widget.ViewPager
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d2a3dd35ef1..6420a841430 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -79,4 +79,21 @@
     <item name="android:textSize">14sp</item>
     <item name="android:clickable">false</item>
   </style>
+  <style name="AppTabLayout" parent="Widget.Design.TabLayout">
+    <item name="tabIndicatorColor">@color/white</item>
+    <item name="tabIndicatorHeight">4dp</item>
+    <item name="tabPaddingStart">6dp</item>
+    <item name="tabPaddingEnd">6dp</item>
+    <item name="tabBackground">?attr/selectableItemBackground</item>
+    <item name="tabTextAppearance">@style/AppTabTextAppearance</item>
+    <item name="tabIconTint">@color/tab_icon_color_selector</item>
+    <item name="tabSelectedTextColor">@color/white</item>
+  </style>
+
+  <!-- for text -->
+  <style name="AppTabTextAppearance" parent="TextAppearance.Design.Tab">
+    <item name="android:textSize">12sp</item>
+    <item name="android:textColor">@color/tab_icon_color_selector</item>
+    <item name="textAllCaps">true</item>
+  </style>
 </resources>

From ca80c190e1deeb77a22bcf47fc2938e82ad0588b Mon Sep 17 00:00:00 2001
From: marysoloman <nikitamarysolomanpvt@gmail.com>
Date: Wed, 13 Nov 2019 19:14:28 +0530
Subject: [PATCH 2/8] nit

---
 app/src/main/res/values/styles.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6420a841430..94bef576fc0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -79,6 +79,7 @@
     <item name="android:textSize">14sp</item>
     <item name="android:clickable">false</item>
   </style>
+
   <style name="AppTabLayout" parent="Widget.Design.TabLayout">
     <item name="tabIndicatorColor">@color/white</item>
     <item name="tabIndicatorHeight">4dp</item>
@@ -89,10 +90,9 @@
     <item name="tabIconTint">@color/tab_icon_color_selector</item>
     <item name="tabSelectedTextColor">@color/white</item>
   </style>
-
   <!-- for text -->
   <style name="AppTabTextAppearance" parent="TextAppearance.Design.Tab">
-    <item name="android:textSize">12sp</item>
+    <item name="android:textSize">14sp</item>
     <item name="android:textColor">@color/tab_icon_color_selector</item>
     <item name="textAllCaps">true</item>
   </style>

From 48bf899a1d0f43cfc9402f9cf2ad4e6fb046db55 Mon Sep 17 00:00:00 2001
From: marysoloman <nikitamarysolomanpvt@gmail.com>
Date: Wed, 13 Nov 2019 19:17:37 +0530
Subject: [PATCH 3/8] nit

---
 app/src/main/res/color/tab_icon_color_selector.xml | 2 +-
 app/src/main/res/values/colors.xml                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/color/tab_icon_color_selector.xml b/app/src/main/res/color/tab_icon_color_selector.xml
index 2f8fd704310..7da1e738447 100644
--- a/app/src/main/res/color/tab_icon_color_selector.xml
+++ b/app/src/main/res/color/tab_icon_color_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:color="@color/white" android:state_selected="true"/>
-  <item android:color="@color/white_80"/>
+  <item android:color="@color/white_70"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f378cbaf477..0dc303e805a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -27,6 +27,7 @@
   <!-- BASIC COLORS -->
   <color name="white">#FFFFFF</color>
   <color name="white_80">#CCFFFFFF</color>
+  <color name="white_70">#B3FFFFFF</color>
   <color name="black">#000000</color>
   <!-- AUDIO COMPONENT -->
   <color name="audioComponentBackground">@color/oppiaDarkBlue</color>

From 3057fabbcc9405528032f14a398039260818932b Mon Sep 17 00:00:00 2001
From: marysoloman <nikitamarysolomanpvt@gmail.com>
Date: Wed, 13 Nov 2019 19:26:15 +0530
Subject: [PATCH 4/8] nit

---
 .../res/color/tab_icon_color_selector.xml     |  2 +-
 .../main/res/drawable/ic_play_icon_24dp.xml   | 14 +++++++---
 .../main/res/drawable/ic_review_icon_24dp.xml | 27 ++++++++++++++-----
 .../main/res/drawable/ic_train_icon_24dp.xml  | 27 ++++++++++++++-----
 4 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/app/src/main/res/color/tab_icon_color_selector.xml b/app/src/main/res/color/tab_icon_color_selector.xml
index 7da1e738447..33c81a116ae 100644
--- a/app/src/main/res/color/tab_icon_color_selector.xml
+++ b/app/src/main/res/color/tab_icon_color_selector.xml
@@ -2,4 +2,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
   <item android:color="@color/white" android:state_selected="true"/>
   <item android:color="@color/white_70"/>
-</selector>
\ No newline at end of file
+</selector>
diff --git a/app/src/main/res/drawable/ic_play_icon_24dp.xml b/app/src/main/res/drawable/ic_play_icon_24dp.xml
index f53f1c846e7..abfcde6b66e 100644
--- a/app/src/main/res/drawable/ic_play_icon_24dp.xml
+++ b/app/src/main/res/drawable/ic_play_icon_24dp.xml
@@ -1,5 +1,11 @@
-<vector android:height="24dp" android:viewportHeight="403.60483"
-    android:viewportWidth="419.14468" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillAlpha="1" android:fillColor="#FFFFFF"
-        android:pathData="M281.781,0C280.899,0.011 279.993,0.055 279.094,0.125C243.27,6.308 223.573,44.189 220.719,77.594C216.548,107.905 229.906,146.864 263.188,153.656C268.015,154.575 273.031,154.155 277.75,152.875C317.827,139.437 335.762,91.972 329.969,52.656C328.285,27.264 309.143,-0.349 281.781,0zM129.906,1.625C107.631,2.172 90.28,24.763 86.75,46C79.309,88.074 98.448,140.352 142.281,153.656C146.387,154.549 150.634,154.641 154.781,154C184.408,149.063 196.958,115.846 195.719,89.031C194.827,53.659 176.453,12.758 139.719,2.813C136.361,1.922 133.088,1.547 129.906,1.625zM378.844,121.125C340.309,123.43 313.891,161.879 310.125,197.781C305.025,223.675 318.83,258.308 348.375,260.375C389.572,259.867 417.676,215.846 418.844,177.969C421.45,152.917 406.693,122.508 378.844,121.125zM41.563,129.656C25.168,129.515 9.045,139.335 3.688,156C-10.605,200.579 18.096,257.038 65.313,266.406C85.018,269.778 102.333,254.645 107.219,236.438C117.573,197.493 96.305,152.272 60.313,134.594C54.449,131.303 47.978,129.711 41.563,129.656zM214.313,209.594C182.173,209.662 149.53,225.972 128.719,250.25C106.241,278.547 87.828,311.477 80.625,347.188C71.874,372.894 91.708,402.478 119.188,402.656C152.246,403.575 180.658,380.873 213.531,379.188C241.421,374.936 266.394,389.443 291.469,398.938C312.818,408.069 342.319,404.569 353.219,381.594C361.792,358.175 349.173,333.204 338.719,312.406C317.397,278.649 294.554,243.17 259.594,222.094C245.581,213.408 230.008,209.56 214.313,209.594z" android:strokeColor="#00000000"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="24dp"
+  android:height="24dp"
+  android:viewportWidth="419.14468"
+  android:viewportHeight="403.60483">
+  <path
+    android:fillAlpha="1"
+    android:fillColor="#FFFFFF"
+    android:pathData="M281.781,0C280.899,0.011 279.993,0.055 279.094,0.125C243.27,6.308 223.573,44.189 220.719,77.594C216.548,107.905 229.906,146.864 263.188,153.656C268.015,154.575 273.031,154.155 277.75,152.875C317.827,139.437 335.762,91.972 329.969,52.656C328.285,27.264 309.143,-0.349 281.781,0zM129.906,1.625C107.631,2.172 90.28,24.763 86.75,46C79.309,88.074 98.448,140.352 142.281,153.656C146.387,154.549 150.634,154.641 154.781,154C184.408,149.063 196.958,115.846 195.719,89.031C194.827,53.659 176.453,12.758 139.719,2.813C136.361,1.922 133.088,1.547 129.906,1.625zM378.844,121.125C340.309,123.43 313.891,161.879 310.125,197.781C305.025,223.675 318.83,258.308 348.375,260.375C389.572,259.867 417.676,215.846 418.844,177.969C421.45,152.917 406.693,122.508 378.844,121.125zM41.563,129.656C25.168,129.515 9.045,139.335 3.688,156C-10.605,200.579 18.096,257.038 65.313,266.406C85.018,269.778 102.333,254.645 107.219,236.438C117.573,197.493 96.305,152.272 60.313,134.594C54.449,131.303 47.978,129.711 41.563,129.656zM214.313,209.594C182.173,209.662 149.53,225.972 128.719,250.25C106.241,278.547 87.828,311.477 80.625,347.188C71.874,372.894 91.708,402.478 119.188,402.656C152.246,403.575 180.658,380.873 213.531,379.188C241.421,374.936 266.394,389.443 291.469,398.938C312.818,408.069 342.319,404.569 353.219,381.594C361.792,358.175 349.173,333.204 338.719,312.406C317.397,278.649 294.554,243.17 259.594,222.094C245.581,213.408 230.008,209.56 214.313,209.594z"
+    android:strokeColor="#00000000" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_review_icon_24dp.xml b/app/src/main/res/drawable/ic_review_icon_24dp.xml
index 85b4888b842..ff954de75ce 100644
--- a/app/src/main/res/drawable/ic_review_icon_24dp.xml
+++ b/app/src/main/res/drawable/ic_review_icon_24dp.xml
@@ -1,8 +1,21 @@
-<vector android:height="24dp" android:viewportHeight="223.85"
-    android:viewportWidth="200" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M173.57,0a51,51 0,0 1,5.34 1.09,28.43 28.43,0 0,1 20.88,24.4 26.89,26.89 0,0 1,0.2 4.11L199.99,133.33L183.57,133.33L183.57,29.68A12.46,12.46 0,0 0,174.98 17.09a12.6,12.6 0,0 0,-3.8 -0.62L28.87,16.47a12.47,12.47 0,0 0,-12.4 12.45L16.47,194.16a12.59,12.59 0,0 0,11.9 13.25c0.37,0 0.73,0 1.09,0h91.27v16.42L28.86,223.83a28.81,28.81 0,0 1,-28.59 -25.27c-0.08,-0.64 -0.18,-1.26 -0.27,-1.9L0,27.18c0.15,-0.93 0.27,-1.87 0.43,-2.79a28.19,28.19 0,0 1,19 -22.75,55.27 55.27,0 0,1 6.81,-1.63Z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M168.06,201.78a53.84,53.84 0,0 1,-16.77 7,35.08 35.08,0 0,1 -24.1,-3.87 41.07,41.07 0,0 1,-21.51 -40.6A39.77,39.77 0,0 1,134.56 130.68a56.94,56.94 0,0 1,6.57 -1.3,24.85 24.85,0 0,1 3,0.33 39.44,39.44 0,0 1,35.05 17.75,37.88 37.88,0 0,1 6.64,23.14 38.86,38.86 0,0 1,-3.45 15,78.77 78.77,0 0,1 -4.21,7.15c2.76,0.49 4.27,2.72 6.11,4.53 4.17,4.12 8.32,8.26 12.51,12.36a8.16,8.16 0,0 1,2.13 9.08,7.68 7.68,0 0,1 -12.51,2.79c-5,-5.18 -10.3,-10.15 -15.33,-15.33A29.1,29.1 0,0 1,168.06 201.78ZM147.11,145.29a24.5,24.5 0,0 0,-22.74 35.66,24 24,0 0,0 30.87,12 24.5,24.5 0,0 0,3.28 -43.8A30.06,30.06 0,0 0,147.11 145.29Z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M98.38,40.36h50.12a8.91,8.91 0,0 1,8.88 5.56A8.76,8.76 0,0 1,152.98 57.49a8.94,8.94 0,0 1,-3.49 0.76c-7,0.07 -14.08,0 -21.13,0L47.98,58.25a8.95,8.95 0,0 1,-1.31 -17.84h2.06Z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M83.12,105.39c-11.69,0 -23.37,-0.07 -35,0a9.36,9.36 0,0 1,-9.38 -7.39,9.1 9.1,0 0,1 7.52,-10.43c0.24,0 0.49,-0.07 0.73,-0.09h71.48a9,9 0,0 1,9.33 7.67,9.31 9.31,0 0,1 -7.85,10.17c-0.87,0.07 -1.75,0.07 -2.63,0.07Z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M65.87,147.99h-18a9,9 0,1 1,-0.86 -17.94h0.51q18.57,-0.12 37.12,0a8.87,8.87 0,0 1,8.78 9c0,0.21 0,0.41 0,0.62a9.26,9.26 0,0 1,-9.14 8.36Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="24dp"
+  android:height="24dp"
+  android:viewportWidth="200"
+  android:viewportHeight="223.85">
+  <path
+    android:fillColor="#FFFFFF"
+    android:pathData="M173.57,0a51,51 0,0 1,5.34 1.09,28.43 28.43,0 0,1 20.88,24.4 26.89,26.89 0,0 1,0.2 4.11L199.99,133.33L183.57,133.33L183.57,29.68A12.46,12.46 0,0 0,174.98 17.09a12.6,12.6 0,0 0,-3.8 -0.62L28.87,16.47a12.47,12.47 0,0 0,-12.4 12.45L16.47,194.16a12.59,12.59 0,0 0,11.9 13.25c0.37,0 0.73,0 1.09,0h91.27v16.42L28.86,223.83a28.81,28.81 0,0 1,-28.59 -25.27c-0.08,-0.64 -0.18,-1.26 -0.27,-1.9L0,27.18c0.15,-0.93 0.27,-1.87 0.43,-2.79a28.19,28.19 0,0 1,19 -22.75,55.27 55.27,0 0,1 6.81,-1.63Z" />
+  <path
+    android:fillColor="#FFFFFF"
+    android:pathData="M168.06,201.78a53.84,53.84 0,0 1,-16.77 7,35.08 35.08,0 0,1 -24.1,-3.87 41.07,41.07 0,0 1,-21.51 -40.6A39.77,39.77 0,0 1,134.56 130.68a56.94,56.94 0,0 1,6.57 -1.3,24.85 24.85,0 0,1 3,0.33 39.44,39.44 0,0 1,35.05 17.75,37.88 37.88,0 0,1 6.64,23.14 38.86,38.86 0,0 1,-3.45 15,78.77 78.77,0 0,1 -4.21,7.15c2.76,0.49 4.27,2.72 6.11,4.53 4.17,4.12 8.32,8.26 12.51,12.36a8.16,8.16 0,0 1,2.13 9.08,7.68 7.68,0 0,1 -12.51,2.79c-5,-5.18 -10.3,-10.15 -15.33,-15.33A29.1,29.1 0,0 1,168.06 201.78ZM147.11,145.29a24.5,24.5 0,0 0,-22.74 35.66,24 24,0 0,0 30.87,12 24.5,24.5 0,0 0,3.28 -43.8A30.06,30.06 0,0 0,147.11 145.29Z" />
+  <path
+    android:fillColor="#FFFFFF"
+    android:pathData="M98.38,40.36h50.12a8.91,8.91 0,0 1,8.88 5.56A8.76,8.76 0,0 1,152.98 57.49a8.94,8.94 0,0 1,-3.49 0.76c-7,0.07 -14.08,0 -21.13,0L47.98,58.25a8.95,8.95 0,0 1,-1.31 -17.84h2.06Z" />
+  <path
+    android:fillColor="#FFFFFF"
+    android:pathData="M83.12,105.39c-11.69,0 -23.37,-0.07 -35,0a9.36,9.36 0,0 1,-9.38 -7.39,9.1 9.1,0 0,1 7.52,-10.43c0.24,0 0.49,-0.07 0.73,-0.09h71.48a9,9 0,0 1,9.33 7.67,9.31 9.31,0 0,1 -7.85,10.17c-0.87,0.07 -1.75,0.07 -2.63,0.07Z" />
+  <path
+    android:fillColor="#FFFFFF"
+    android:pathData="M65.87,147.99h-18a9,9 0,1 1,-0.86 -17.94h0.51q18.57,-0.12 37.12,0a8.87,8.87 0,0 1,8.78 9c0,0.21 0,0.41 0,0.62a9.26,9.26 0,0 1,-9.14 8.36Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_train_icon_24dp.xml b/app/src/main/res/drawable/ic_train_icon_24dp.xml
index 8cac55f8839..04dae36da8b 100644
--- a/app/src/main/res/drawable/ic_train_icon_24dp.xml
+++ b/app/src/main/res/drawable/ic_train_icon_24dp.xml
@@ -1,8 +1,21 @@
-<vector android:height="24dp" android:viewportHeight="153.7"
-    android:viewportWidth="200" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M45.85,0.05h5.68a19.57,19.57 0,0 1,11.38 6.57c0.14,0.16 0.82,0.1 1,-0.09 0.63,-0.52 1.12,-1.19 1.72,-1.78a20.06,20.06 0,0 1,9.57 -4.75h5.68l0.47,0.14a18.75,18.75 0,0 1,13.51 10,3.54 3.54,0 0,0 2.54,2 18.39,18.39 0,0 1,14.06 20.58c-0.13,1 0.1,1.42 1.08,1.63a16.93,16.93 0,0 1,7.13 3.51,18.61 18.61,0 0,1 6.92,11.88L126.59,55.31a23.65,23.65 0,0 1,-3.05 7.49,1.46 1.46,0 0,0 0,1.32 22.67,22.67 0,0 1,3.05 7.49L126.59,77.31a42.83,42.83 0,0 1,-2.27 6.35,17.84 17.84,0 0,1 -11.67,9c-0.78,0.21 -1.38,0.37 -1.22,1.44a18.45,18.45 0,0 1,-14.62 21,3 3,0 0,0 -2.28,1.78A18.62,18.62 0,0 1,64.3 120.31c-0.71,-0.81 -1.06,-0.82 -1.79,0a17.46,17.46 0,0 1,-12.23 6.21A18.32,18.32 0,0 1,32 116.46a2.33,2.33 0,0 0,-1.78 -1.28,18.62 18.62,0 0,1 -14.85,-21c0.14,-0.92 -0.19,-1.26 -1,-1.45a18.57,18.57 0,0 1,-13.75 -22.37,18.8 18.8,0 0,1 2.36,-5.6 2,2 0,0 0,0 -2.54A17.8,17.8 0,0 1,1 46.51a18,18 0,0 1,13.07 -12.13c1.06,-0.29 1.34,-0.67 1.19,-1.78a17.36,17.36 0,0 1,0.55 -7.58,17.93 17.93,0 0,1 13.76,-12.93 3.32,3.32 0,0 0,2.28 -1.78,28.88 28.88,0 0,1 3.57,-4.87A18.45,18.45 0,0 1,45.85 0.05ZM39.67,12.39 L41.07,13.02a17.13,17.13 0,0 1,5.89 4,3.84 3.84,0 0,1 -5.11,5.71c-0.44,-0.32 -0.84,-0.66 -1.27,-1a10.91,10.91 0,0 0,-17.44 11.14,2.5 2.5,0 0,0 1.78,2 18.17,18.17 0,0 1,6.84 4.3,3.66 3.66,0 0,1 1.08,3.83 3.76,3.76 0,0 1,-2.89 2.74,4.44 4.44,0 0,1 -4.11,-1.49 10.42,10.42 0,0 0,-7 -2.62,10.87 10.87,0 0,0 -2.49,21.5c1,0.22 2,0.21 2.94,0.36a3.78,3.78 0,0 1,3.18 4.06,3.68 3.68,0 0,1 -3.36,3.51 16.6,16.6 0,0 1,-8.26 -1.64c-1.38,-0.67 -1.58,-0.65 -2.17,0.83a10.9,10.9 0,1 0,19.6 -0.7,20.61 20.61,0 0,0 -2,-2.8 3.85,3.85 0,1 1,5.72 -5.14,18.09 18.09,0 0,1 5.2,15.35c-0.14,1.26 0.18,1.63 1.32,1.92a18.62,18.62 0,0 1,13.88 18.21,3.72 3.72,0 0,1 -3.36,3.64 3.81,3.81 0,0 1,-4.2 -3,16 16,0 0,1 -0.27,-2 10.81,10.81 0,0 0,-8.78 -9.57c-0.93,-0.14 -2,-0.6 -2.84,0.47a18.29,18.29 0,0 1,-8.21 5.7,2.57 2.57,0 0,0 -1.36,1.37 11,11 0,0 0,5.48 12.95c0.79,0.38 1.19,0.3 1.63,-0.54a3.69,3.69 0,0 1,4.09 -1.87,3.81 3.81,0 0,1 3,3c0.12,0.69 0.21,1.38 0.28,2.08a10.8,10.8 0,0 0,15.44 8.5,11.22 11.22,0 0,0 6.37,-10.86c0.05,-11.4 0,-22.81 0,-34.21 0,-0.39 0,-0.78 -0.07,-1.44l-1.44,0.85a17.06,17.06 0,0 1,-9.76 2.58,3.73 3.73,0 0,1 -3.56,-3.33 3.81,3.81 0,0 1,3 -4.21c0.65,-0.12 1.3,-0.19 1.95,-0.26a10.58,10.58 0,0 0,8.28 -5.35,12.1 12.1,0 0,0 1.56,-6.53q0,-17.73 0,-35.44a14.82,14.82 0,0 0,-0.41 -3.57,10.78 10.78,0 0,0 -12.5,-8.26A10.11,10.11 0,0 0,39.67 12.39ZM67.28,71.31c0,0.68 -0.08,1.11 -0.08,1.54 0,3.57 0.07,7.08 0.09,10.62 0,8.55 -0.07,17.11 0.18,25.66a9.65,9.65 0,0 0,6.38 8.77,10.43 10.43,0 0,0 11,-1.27 11.48,11.48 0,0 0,4.43 -8.86,3.62 3.62,0 0,1 2.88,-3.56 3.77,3.77 0,0 1,4.27 2c0.41,0.76 0.78,0.76 1.45,0.46a10.87,10.87 0,0 0,5.59 -13,2.48 2.48,0 0,0 -1.29,-1.3 19.92,19.92 0,0 1,-8.31 -5.76,1.78 1.78,0 0,0 -1.22,-0.59 10.47,10.47 0,0 0,-7.78 3.69,12.82 12.82,0 0,0 -2.83,7.72 3.68,3.68 0,0 1,-4.08 3.23h0a3.76,3.76 0,0 1,-3.47 -3.67,16.61 16.61,0 0,1 1.34,-7.13 18.49,18.49 0,0 1,12.72 -11.11c0.71,-0.2 1.29,-0.32 1.25,-1.32a36.88,36.88 0,0 1,0.08 -6.13,17 17,0 0,1 5.05,-9.79 3.83,3.83 0,0 1,5.78 5c-0.34,0.46 -0.72,0.9 -1.08,1.35a10.91,10.91 0,1 0,18.51 2.24c-0.59,-1.39 -0.78,-1.43 -2.1,-0.81a16.94,16.94 0,0 1,-8 1.7,3.82 3.82,0 0,1 -0.43,-7.59c0.53,-0.08 1.06,-0.17 1.59,-0.22a10.54,10.54 0,0 0,9.81 -10.48,10.78 10.78,0 0,0 -13.71,-10.82 14.85,14.85 0,0 0,-5.19 3,3.74 3.74,0 0,1 -5.27,-0.42l0,0a3.8,3.8 0,0 1,0.32 -5.35,16.5 16.5,0 0,1 6.53,-4.1 2.73,2.73 0,0 0,2.17 -2.48,18.5 18.5,0 0,0 0.27,-2.58 10.93,10.93 0,0 0,-14 -10.17,19.81 19.81,0 0,0 -4.85,2.83 3.84,3.84 0,0 1,-5.43 -0.29h0a3.71,3.71 0,0 1,0.08 -5.25,3.79 3.79,0 0,1 0.38,-0.32 66.05,66.05 0,0 1,5.74 -3.78,12.88 12.88,0 0,1 1.18,-0.59c-0.39,-0.52 -0.65,-0.93 -1,-1.28a10.79,10.79 0,0 0,-12.36 -2.42,11.16 11.16,0 0,0 -6.53,10.88c-0.06,5.84 0.1,11.68 0.1,17.53s-0.12,11.93 -0.1,17.9a12.3,12.3 0,0 0,2.47 8,11.9 11.9,0 0,0 9,4.24 3.56,3.56 0,0 1,3.38 3.73c0,0.12 0,0.25 0,0.36a3.71,3.71 0,0 1,-3.64 3.48,17.57 17.57,0 0,1 -9.11,-2.26 18.23,18.23 0,0 1,-2 -1.12Z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M74.33,45.08c0.11,1.1 0.19,2.21 0.35,3.29a17.57,17.57 0,0 0,5.11 9.78,3.83 3.83,0 0,0 5.76,-5c-0.39,-0.53 -0.84,-1 -1.23,-1.54a10.33,10.33 0,0 1,-2.08 -5.32,11.11 11.11,0 0,1 2.92,-8.84 3.89,3.89 0,0 0,1.18 -3.6,3.87 3.87,0 0,0 -6.7,-1.78A18.51,18.51 0,0 0,74.33 45.08Z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M52.53,44.99a18.81,18.81 0,0 1,-5.22 12.89,3.81 3.81,0 0,1 -5.32,0.74 2,2 0,0 1,-0.27 -0.23,3.73 3.73,0 0,1 -0.53,-5.25 3.39,3.39 0,0 1,0.31 -0.34,11.51 11.51,0 0,0 3.06,-9.06 10.77,10.77 0,0 0,-2.08 -5.2c-0.37,-0.54 -0.81,-1 -1.18,-1.56a3.84,3.84 0,0 1,5.67 -5.16,17.06 17.06,0 0,1 4.87,8.57C52.19,41.89 52.3,43.46 52.53,44.99Z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M74.33,45.08a18.57,18.57 0,0 1,5.3 -13.07,3.87 3.87,0 0,1 6.7,1.78 3.88,3.88 0,0 1,-1.18 3.6,11.1 11.1,0 0,0 -2.92,8.85 10.37,10.37 0,0 0,2.08 5.32c0.38,0.52 0.84,1 1.23,1.53a3.84,3.84 0,0 1,-5.76 5.05,17.6 17.6,0 0,1 -5.11,-9.78C74.52,47.31 74.44,46.18 74.33,45.08Z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M123.63,145.21l8.49,8.49 8.5,-8.49 -21.2,-21.21 50.89,-50.89 21.2,21.2 8.49,-8.49L191.51,77.31l8.49,-8.49 -12.71,-12.71 8.49,-8.49 -8.49,-8.49 -8.49,8.49 -12.71,-12.71 -8.49,8.49 -8.49,-8.49 -8.49,8.49 21.2,21.2 -50.9,50.89L89.72,94.31l-8.49,8.49 8.49,8.5 -8.49,8.49 12.71,12.71 -8.49,8.49 8.49,8.49 8.49,-8.49 12.71,12.71Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="24dp"
+  android:height="24dp"
+  android:viewportWidth="200"
+  android:viewportHeight="153.7">
+  <path
+    android:fillColor="#FFFFFF"
+    android:pathData="M45.85,0.05h5.68a19.57,19.57 0,0 1,11.38 6.57c0.14,0.16 0.82,0.1 1,-0.09 0.63,-0.52 1.12,-1.19 1.72,-1.78a20.06,20.06 0,0 1,9.57 -4.75h5.68l0.47,0.14a18.75,18.75 0,0 1,13.51 10,3.54 3.54,0 0,0 2.54,2 18.39,18.39 0,0 1,14.06 20.58c-0.13,1 0.1,1.42 1.08,1.63a16.93,16.93 0,0 1,7.13 3.51,18.61 18.61,0 0,1 6.92,11.88L126.59,55.31a23.65,23.65 0,0 1,-3.05 7.49,1.46 1.46,0 0,0 0,1.32 22.67,22.67 0,0 1,3.05 7.49L126.59,77.31a42.83,42.83 0,0 1,-2.27 6.35,17.84 17.84,0 0,1 -11.67,9c-0.78,0.21 -1.38,0.37 -1.22,1.44a18.45,18.45 0,0 1,-14.62 21,3 3,0 0,0 -2.28,1.78A18.62,18.62 0,0 1,64.3 120.31c-0.71,-0.81 -1.06,-0.82 -1.79,0a17.46,17.46 0,0 1,-12.23 6.21A18.32,18.32 0,0 1,32 116.46a2.33,2.33 0,0 0,-1.78 -1.28,18.62 18.62,0 0,1 -14.85,-21c0.14,-0.92 -0.19,-1.26 -1,-1.45a18.57,18.57 0,0 1,-13.75 -22.37,18.8 18.8,0 0,1 2.36,-5.6 2,2 0,0 0,0 -2.54A17.8,17.8 0,0 1,1 46.51a18,18 0,0 1,13.07 -12.13c1.06,-0.29 1.34,-0.67 1.19,-1.78a17.36,17.36 0,0 1,0.55 -7.58,17.93 17.93,0 0,1 13.76,-12.93 3.32,3.32 0,0 0,2.28 -1.78,28.88 28.88,0 0,1 3.57,-4.87A18.45,18.45 0,0 1,45.85 0.05ZM39.67,12.39 L41.07,13.02a17.13,17.13 0,0 1,5.89 4,3.84 3.84,0 0,1 -5.11,5.71c-0.44,-0.32 -0.84,-0.66 -1.27,-1a10.91,10.91 0,0 0,-17.44 11.14,2.5 2.5,0 0,0 1.78,2 18.17,18.17 0,0 1,6.84 4.3,3.66 3.66,0 0,1 1.08,3.83 3.76,3.76 0,0 1,-2.89 2.74,4.44 4.44,0 0,1 -4.11,-1.49 10.42,10.42 0,0 0,-7 -2.62,10.87 10.87,0 0,0 -2.49,21.5c1,0.22 2,0.21 2.94,0.36a3.78,3.78 0,0 1,3.18 4.06,3.68 3.68,0 0,1 -3.36,3.51 16.6,16.6 0,0 1,-8.26 -1.64c-1.38,-0.67 -1.58,-0.65 -2.17,0.83a10.9,10.9 0,1 0,19.6 -0.7,20.61 20.61,0 0,0 -2,-2.8 3.85,3.85 0,1 1,5.72 -5.14,18.09 18.09,0 0,1 5.2,15.35c-0.14,1.26 0.18,1.63 1.32,1.92a18.62,18.62 0,0 1,13.88 18.21,3.72 3.72,0 0,1 -3.36,3.64 3.81,3.81 0,0 1,-4.2 -3,16 16,0 0,1 -0.27,-2 10.81,10.81 0,0 0,-8.78 -9.57c-0.93,-0.14 -2,-0.6 -2.84,0.47a18.29,18.29 0,0 1,-8.21 5.7,2.57 2.57,0 0,0 -1.36,1.37 11,11 0,0 0,5.48 12.95c0.79,0.38 1.19,0.3 1.63,-0.54a3.69,3.69 0,0 1,4.09 -1.87,3.81 3.81,0 0,1 3,3c0.12,0.69 0.21,1.38 0.28,2.08a10.8,10.8 0,0 0,15.44 8.5,11.22 11.22,0 0,0 6.37,-10.86c0.05,-11.4 0,-22.81 0,-34.21 0,-0.39 0,-0.78 -0.07,-1.44l-1.44,0.85a17.06,17.06 0,0 1,-9.76 2.58,3.73 3.73,0 0,1 -3.56,-3.33 3.81,3.81 0,0 1,3 -4.21c0.65,-0.12 1.3,-0.19 1.95,-0.26a10.58,10.58 0,0 0,8.28 -5.35,12.1 12.1,0 0,0 1.56,-6.53q0,-17.73 0,-35.44a14.82,14.82 0,0 0,-0.41 -3.57,10.78 10.78,0 0,0 -12.5,-8.26A10.11,10.11 0,0 0,39.67 12.39ZM67.28,71.31c0,0.68 -0.08,1.11 -0.08,1.54 0,3.57 0.07,7.08 0.09,10.62 0,8.55 -0.07,17.11 0.18,25.66a9.65,9.65 0,0 0,6.38 8.77,10.43 10.43,0 0,0 11,-1.27 11.48,11.48 0,0 0,4.43 -8.86,3.62 3.62,0 0,1 2.88,-3.56 3.77,3.77 0,0 1,4.27 2c0.41,0.76 0.78,0.76 1.45,0.46a10.87,10.87 0,0 0,5.59 -13,2.48 2.48,0 0,0 -1.29,-1.3 19.92,19.92 0,0 1,-8.31 -5.76,1.78 1.78,0 0,0 -1.22,-0.59 10.47,10.47 0,0 0,-7.78 3.69,12.82 12.82,0 0,0 -2.83,7.72 3.68,3.68 0,0 1,-4.08 3.23h0a3.76,3.76 0,0 1,-3.47 -3.67,16.61 16.61,0 0,1 1.34,-7.13 18.49,18.49 0,0 1,12.72 -11.11c0.71,-0.2 1.29,-0.32 1.25,-1.32a36.88,36.88 0,0 1,0.08 -6.13,17 17,0 0,1 5.05,-9.79 3.83,3.83 0,0 1,5.78 5c-0.34,0.46 -0.72,0.9 -1.08,1.35a10.91,10.91 0,1 0,18.51 2.24c-0.59,-1.39 -0.78,-1.43 -2.1,-0.81a16.94,16.94 0,0 1,-8 1.7,3.82 3.82,0 0,1 -0.43,-7.59c0.53,-0.08 1.06,-0.17 1.59,-0.22a10.54,10.54 0,0 0,9.81 -10.48,10.78 10.78,0 0,0 -13.71,-10.82 14.85,14.85 0,0 0,-5.19 3,3.74 3.74,0 0,1 -5.27,-0.42l0,0a3.8,3.8 0,0 1,0.32 -5.35,16.5 16.5,0 0,1 6.53,-4.1 2.73,2.73 0,0 0,2.17 -2.48,18.5 18.5,0 0,0 0.27,-2.58 10.93,10.93 0,0 0,-14 -10.17,19.81 19.81,0 0,0 -4.85,2.83 3.84,3.84 0,0 1,-5.43 -0.29h0a3.71,3.71 0,0 1,0.08 -5.25,3.79 3.79,0 0,1 0.38,-0.32 66.05,66.05 0,0 1,5.74 -3.78,12.88 12.88,0 0,1 1.18,-0.59c-0.39,-0.52 -0.65,-0.93 -1,-1.28a10.79,10.79 0,0 0,-12.36 -2.42,11.16 11.16,0 0,0 -6.53,10.88c-0.06,5.84 0.1,11.68 0.1,17.53s-0.12,11.93 -0.1,17.9a12.3,12.3 0,0 0,2.47 8,11.9 11.9,0 0,0 9,4.24 3.56,3.56 0,0 1,3.38 3.73c0,0.12 0,0.25 0,0.36a3.71,3.71 0,0 1,-3.64 3.48,17.57 17.57,0 0,1 -9.11,-2.26 18.23,18.23 0,0 1,-2 -1.12Z" />
+  <path
+    android:fillColor="#FFFFFF"
+    android:pathData="M74.33,45.08c0.11,1.1 0.19,2.21 0.35,3.29a17.57,17.57 0,0 0,5.11 9.78,3.83 3.83,0 0,0 5.76,-5c-0.39,-0.53 -0.84,-1 -1.23,-1.54a10.33,10.33 0,0 1,-2.08 -5.32,11.11 11.11,0 0,1 2.92,-8.84 3.89,3.89 0,0 0,1.18 -3.6,3.87 3.87,0 0,0 -6.7,-1.78A18.51,18.51 0,0 0,74.33 45.08Z" />
+  <path
+    android:fillColor="#FFFFFF"
+    android:pathData="M52.53,44.99a18.81,18.81 0,0 1,-5.22 12.89,3.81 3.81,0 0,1 -5.32,0.74 2,2 0,0 1,-0.27 -0.23,3.73 3.73,0 0,1 -0.53,-5.25 3.39,3.39 0,0 1,0.31 -0.34,11.51 11.51,0 0,0 3.06,-9.06 10.77,10.77 0,0 0,-2.08 -5.2c-0.37,-0.54 -0.81,-1 -1.18,-1.56a3.84,3.84 0,0 1,5.67 -5.16,17.06 17.06,0 0,1 4.87,8.57C52.19,41.89 52.3,43.46 52.53,44.99Z" />
+  <path
+    android:fillColor="#FFFFFF"
+    android:pathData="M74.33,45.08a18.57,18.57 0,0 1,5.3 -13.07,3.87 3.87,0 0,1 6.7,1.78 3.88,3.88 0,0 1,-1.18 3.6,11.1 11.1,0 0,0 -2.92,8.85 10.37,10.37 0,0 0,2.08 5.32c0.38,0.52 0.84,1 1.23,1.53a3.84,3.84 0,0 1,-5.76 5.05,17.6 17.6,0 0,1 -5.11,-9.78C74.52,47.31 74.44,46.18 74.33,45.08Z" />
+  <path
+    android:fillColor="#FFFFFF"
+    android:pathData="M123.63,145.21l8.49,8.49 8.5,-8.49 -21.2,-21.21 50.89,-50.89 21.2,21.2 8.49,-8.49L191.51,77.31l8.49,-8.49 -12.71,-12.71 8.49,-8.49 -8.49,-8.49 -8.49,8.49 -12.71,-12.71 -8.49,8.49 -8.49,-8.49 -8.49,8.49 21.2,21.2 -50.9,50.89L89.72,94.31l-8.49,8.49 8.49,8.5 -8.49,8.49 12.71,12.71 -8.49,8.49 8.49,8.49 8.49,-8.49 12.71,12.71Z" />
 </vector>

From 13be89292516837d4d03407634ab424d39ee1160 Mon Sep 17 00:00:00 2001
From: marysoloman <nikitamarysolomanpvt@gmail.com>
Date: Wed, 13 Nov 2019 19:31:40 +0530
Subject: [PATCH 5/8] nit

---
 app/src/main/res/layout/topic_fragment.xml | 10 +++++-----
 app/src/main/res/values/styles.xml         |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/topic_fragment.xml b/app/src/main/res/layout/topic_fragment.xml
index 333bbccf45d..52dc112f1e1 100644
--- a/app/src/main/res/layout/topic_fragment.xml
+++ b/app/src/main/res/layout/topic_fragment.xml
@@ -21,22 +21,22 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
-        app:titleTextColor="@color/white"
         android:textSize="20dp"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:titleTextColor="@color/white" />
 
       <com.google.android.material.tabs.TabLayout
         android:id="@+id/topic_tabs_container"
+        style="@style/AppTabLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textSize="14sp"
         app:tabBackground="@color/colorPrimary"
         app:tabGravity="fill"
+        app:tabIconTint="@color/tab_icon_color_selector"
         app:tabIndicatorColor="@android:color/white"
         app:tabIndicatorHeight="2dp"
-        android:textSize="14sp"
-        app:tabIconTint="@color/tab_icon_color_selector"
         app:tabMode="fixed"
-        style="@style/AppTabLayout"
         app:tabTextAppearance="@style/AppTabTextAppearance"
         app:tabTextColor="@color/tab_icon_color_selector" />
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 94bef576fc0..25411bbe293 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -94,6 +94,7 @@
   <style name="AppTabTextAppearance" parent="TextAppearance.Design.Tab">
     <item name="android:textSize">14sp</item>
     <item name="android:textColor">@color/tab_icon_color_selector</item>
+    <item name="android:fontFamily">sans-serif</item>
     <item name="textAllCaps">true</item>
   </style>
 </resources>

From 922383966d277ff946e8b661fb4e4ae855b60de5 Mon Sep 17 00:00:00 2001
From: marysoloman <nikitamarysolomanpvt@gmail.com>
Date: Wed, 13 Nov 2019 19:56:35 +0530
Subject: [PATCH 6/8] nit

---
 app/src/main/res/layout/topic_fragment.xml | 2 +-
 app/src/main/res/values/styles.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/topic_fragment.xml b/app/src/main/res/layout/topic_fragment.xml
index 52dc112f1e1..3ba6f688db7 100644
--- a/app/src/main/res/layout/topic_fragment.xml
+++ b/app/src/main/res/layout/topic_fragment.xml
@@ -20,7 +20,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
+        android:background="@color/colorPrimary"
         android:textSize="20dp"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:titleTextColor="@color/white" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 25411bbe293..92b84197896 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -94,7 +94,7 @@
   <style name="AppTabTextAppearance" parent="TextAppearance.Design.Tab">
     <item name="android:textSize">14sp</item>
     <item name="android:textColor">@color/tab_icon_color_selector</item>
-    <item name="android:fontFamily">sans-serif</item>
+    <item name="android:fontFamily">sans-serif-medium</item>
     <item name="textAllCaps">true</item>
   </style>
 </resources>

From 2cf9e48283568c4d3fadbc8e50802b66cab1673b Mon Sep 17 00:00:00 2001
From: marysoloman <nikitamarysolomanpvt@gmail.com>
Date: Wed, 13 Nov 2019 20:08:00 +0530
Subject: [PATCH 7/8] nit

---
 app/src/main/res/layout/topic_fragment.xml | 4 ++--
 app/src/main/res/values/styles.xml         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/topic_fragment.xml b/app/src/main/res/layout/topic_fragment.xml
index 3ba6f688db7..5aa9bf81ae1 100644
--- a/app/src/main/res/layout/topic_fragment.xml
+++ b/app/src/main/res/layout/topic_fragment.xml
@@ -20,7 +20,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="@color/colorPrimary"
+        android:background="@color/oppiaPrimaryDark"
         android:textSize="20dp"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:titleTextColor="@color/white" />
@@ -31,7 +31,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textSize="14sp"
-        app:tabBackground="@color/colorPrimary"
+        app:tabBackground="@color/oppiaPrimaryDark"
         app:tabGravity="fill"
         app:tabIconTint="@color/tab_icon_color_selector"
         app:tabIndicatorColor="@android:color/white"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 92b84197896..015ae55ca3d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -79,7 +79,7 @@
     <item name="android:textSize">14sp</item>
     <item name="android:clickable">false</item>
   </style>
-
+  <!-- TOPIC TABLAYOUT STYLE -->
   <style name="AppTabLayout" parent="Widget.Design.TabLayout">
     <item name="tabIndicatorColor">@color/white</item>
     <item name="tabIndicatorHeight">4dp</item>
@@ -90,7 +90,7 @@
     <item name="tabIconTint">@color/tab_icon_color_selector</item>
     <item name="tabSelectedTextColor">@color/white</item>
   </style>
-  <!-- for text -->
+
   <style name="AppTabTextAppearance" parent="TextAppearance.Design.Tab">
     <item name="android:textSize">14sp</item>
     <item name="android:textColor">@color/tab_icon_color_selector</item>

From f41b6a17ea3571487046f9f9b97f13715899805f Mon Sep 17 00:00:00 2001
From: marysoloman <nikitamarysolomanpvt@gmail.com>
Date: Wed, 13 Nov 2019 20:11:49 +0530
Subject: [PATCH 8/8] nit

---
 app/src/main/res/values/styles.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 015ae55ca3d..32ea68db2f9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -83,8 +83,8 @@
   <style name="AppTabLayout" parent="Widget.Design.TabLayout">
     <item name="tabIndicatorColor">@color/white</item>
     <item name="tabIndicatorHeight">4dp</item>
-    <item name="tabPaddingStart">6dp</item>
-    <item name="tabPaddingEnd">6dp</item>
+    <item name="tabPaddingStart">8dp</item>
+    <item name="tabPaddingEnd">8dp</item>
     <item name="tabBackground">?attr/selectableItemBackground</item>
     <item name="tabTextAppearance">@style/AppTabTextAppearance</item>
     <item name="tabIconTint">@color/tab_icon_color_selector</item>