diff --git a/app/src/main/res/drawable/app_ic_book.xml b/app/src/main/res/drawable/app_ic_book.xml
deleted file mode 100644
index 4245846af..000000000
--- a/app/src/main/res/drawable/app_ic_book.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/app_ic_discover_selected.xml b/app/src/main/res/drawable/app_ic_discover_selected.xml
new file mode 100644
index 000000000..8f349a7a7
--- /dev/null
+++ b/app/src/main/res/drawable/app_ic_discover_selected.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/app_ic_discover_selector.xml b/app/src/main/res/drawable/app_ic_discover_selector.xml
new file mode 100644
index 000000000..7a7245854
--- /dev/null
+++ b/app/src/main/res/drawable/app_ic_discover_selector.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/app_ic_discover_unselected.xml b/app/src/main/res/drawable/app_ic_discover_unselected.xml
new file mode 100644
index 000000000..cd6cc1f0f
--- /dev/null
+++ b/app/src/main/res/drawable/app_ic_discover_unselected.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/app_ic_home.xml b/app/src/main/res/drawable/app_ic_home.xml
deleted file mode 100644
index b703f9f28..000000000
--- a/app/src/main/res/drawable/app_ic_home.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/app_ic_learn_selected.xml b/app/src/main/res/drawable/app_ic_learn_selected.xml
new file mode 100644
index 000000000..05a8c5ca9
--- /dev/null
+++ b/app/src/main/res/drawable/app_ic_learn_selected.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/app_ic_learn_selector.xml b/app/src/main/res/drawable/app_ic_learn_selector.xml
new file mode 100644
index 000000000..af8e2a3c3
--- /dev/null
+++ b/app/src/main/res/drawable/app_ic_learn_selector.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/app_ic_learn_unselected.xml b/app/src/main/res/drawable/app_ic_learn_unselected.xml
new file mode 100644
index 000000000..5362fca3e
--- /dev/null
+++ b/app/src/main/res/drawable/app_ic_learn_unselected.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/app_ic_profile.xml b/app/src/main/res/drawable/app_ic_profile.xml
deleted file mode 100644
index 1b241a689..000000000
--- a/app/src/main/res/drawable/app_ic_profile.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/app_ic_profile_selected.xml b/app/src/main/res/drawable/app_ic_profile_selected.xml
new file mode 100644
index 000000000..8a530b071
--- /dev/null
+++ b/app/src/main/res/drawable/app_ic_profile_selected.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/app_ic_profile_selector.xml b/app/src/main/res/drawable/app_ic_profile_selector.xml
new file mode 100644
index 000000000..198faf139
--- /dev/null
+++ b/app/src/main/res/drawable/app_ic_profile_selector.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/app_ic_profile_unselected.xml b/app/src/main/res/drawable/app_ic_profile_unselected.xml
new file mode 100644
index 000000000..4ad191e8c
--- /dev/null
+++ b/app/src/main/res/drawable/app_ic_profile_unselected.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/app_ic_rows.xml b/app/src/main/res/drawable/app_ic_rows.xml
deleted file mode 100644
index eabe550d3..000000000
--- a/app/src/main/res/drawable/app_ic_rows.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/menu/bottom_view_menu.xml b/app/src/main/res/menu/bottom_view_menu.xml
index 0558f5c3b..c2f596561 100644
--- a/app/src/main/res/menu/bottom_view_menu.xml
+++ b/app/src/main/res/menu/bottom_view_menu.xml
@@ -4,19 +4,19 @@