diff --git a/app/build.gradle b/app/build.gradle
index 46ffe660..13e690a9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
         applicationId "com.tlongdev.bktf"
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 42
-        versionName "2.1.0"
+        versionCode 43
+        versionName "2.1.1"
 
         applicationVariants.all { variant ->
             variant.outputs.each { output ->
@@ -23,8 +23,6 @@ android {
             }
         }
 
-        vectorDrawables.useSupportLibrary = true
-
         Properties keys = new Properties()
         if (project.rootProject.file('keys.properties').exists()) {
             keys.load(project.rootProject.file('keys.properties').newDataInputStream())
diff --git a/app/src/main/java/com/tlongdev/bktf/ui/NavigationDrawerManager.java b/app/src/main/java/com/tlongdev/bktf/ui/NavigationDrawerManager.java
index 78b9b467..bd0bf32b 100644
--- a/app/src/main/java/com/tlongdev/bktf/ui/NavigationDrawerManager.java
+++ b/app/src/main/java/com/tlongdev/bktf/ui/NavigationDrawerManager.java
@@ -115,6 +115,9 @@ public void update(User user) {
 
     public void setUserMenuItem(MenuItem userMenuItem) {
         mUserMenuItem = userMenuItem;
+        if (mUserMenuItem != null) {
+            mUserMenuItem.setEnabled(mProfileManager.isSignedIn());
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/tlongdev/bktf/ui/activity/MainActivity.java b/app/src/main/java/com/tlongdev/bktf/ui/activity/MainActivity.java
index 0b0d51cf..70e1deea 100644
--- a/app/src/main/java/com/tlongdev/bktf/ui/activity/MainActivity.java
+++ b/app/src/main/java/com/tlongdev/bktf/ui/activity/MainActivity.java
@@ -22,7 +22,6 @@
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.design.widget.NavigationView;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.GravityCompat;
@@ -86,12 +85,6 @@ public class MainActivity extends AppCompatActivity {
      */
     private boolean mUserStateChanged = false;
 
-    /**
-     * Listener to be notified when the drawer opens. Mainly for fragments with toolbars so we can
-     * expand the fragment's toolbar when the drawer opens.
-     */
-    private OnDrawerOpenedListener mDrawerListener;
-
     /**
      * Listener for the navigation drawer.
      */
@@ -259,39 +252,26 @@ private void switchFragment(int position) {
         FragmentManager fragmentManager = getSupportFragmentManager();
         FragmentTransaction transaction = fragmentManager.beginTransaction();
         transaction.setCustomAnimations(R.anim.simple_fade_in, R.anim.simple_fade_out);
-        Fragment newFragment;
 
         //Initialize fragments and add them is the drawer listener
         switch (position) {
             case 0:
-                newFragment = new RecentsFragment();
-                mDrawerListener = (RecentsFragment) newFragment;
-                transaction.replace(R.id.container, newFragment);
+                transaction.replace(R.id.container, new RecentsFragment());
                 break;
             case 1:
-                newFragment = new UnusualFragment();
-                mDrawerListener = (UnusualFragment) newFragment;
-                transaction.replace(R.id.container, newFragment);
+                transaction.replace(R.id.container, new UnusualFragment());
                 break;
             case 2:
-                newFragment = UserFragment.newInstance();
-                mDrawerListener = (UserFragment) newFragment;
-                transaction.replace(R.id.container, newFragment);
+                transaction.replace(R.id.container, UserFragment.newInstance());
                 break;
             case 3:
-                newFragment = new FavoritesFragment();
-                mDrawerListener = (FavoritesFragment) newFragment;
-                transaction.replace(R.id.container, newFragment);
+                transaction.replace(R.id.container, new FavoritesFragment());
                 break;
             case 4:
-                newFragment = new ConverterFragment();
-                mDrawerListener = null;
-                transaction.replace(R.id.container, newFragment);
+                transaction.replace(R.id.container, new ConverterFragment());
                 break;
             case 5:
-                newFragment = new CalculatorFragment();
-                mDrawerListener = (CalculatorFragment) newFragment;
-                transaction.replace(R.id.container, newFragment);
+                transaction.replace(R.id.container, new CalculatorFragment());
                 break;
             default:
                 throw new IllegalArgumentException("unknown fragment to switch to: " + position);
@@ -323,10 +303,7 @@ private void restoreNavigationIcon() {
             @Override
             public void onDrawerOpened(View drawerView) {
                 super.onDrawerOpened(drawerView);
-                //Notify the listeners
-                if (mDrawerListener != null) {
-                    mDrawerListener.onDrawerOpened();
-                }
+                Utility.hideKeyboard(MainActivity.this);
             }
         };
 
@@ -340,15 +317,4 @@ public void run() {
 
         mDrawerLayout.addDrawerListener(mDrawerToggle);
     }
-
-    /**
-     * Interface for listening drawer open events.
-     */
-    public interface OnDrawerOpenedListener {
-
-        /**
-         * Called when the navigation drawer is opened.
-         */
-        void onDrawerOpened();
-    }
 }
diff --git a/app/src/main/java/com/tlongdev/bktf/ui/fragment/CalculatorFragment.java b/app/src/main/java/com/tlongdev/bktf/ui/fragment/CalculatorFragment.java
index fdcde13b..79af94bc 100644
--- a/app/src/main/java/com/tlongdev/bktf/ui/fragment/CalculatorFragment.java
+++ b/app/src/main/java/com/tlongdev/bktf/ui/fragment/CalculatorFragment.java
@@ -62,7 +62,7 @@
  * Calculator fragment. Let's the user create a list of items and it will calculate the total value
  * of the items
  */
-public class CalculatorFragment extends BptfFragment implements CalculatorView, MainActivity.OnDrawerOpenedListener{
+public class CalculatorFragment extends BptfFragment implements CalculatorView {
 
     @Inject CalculatorPresenter mPresenter;
 
@@ -189,11 +189,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return true;
     }
 
-    @Override
-    public void onDrawerOpened() {
-        expandToolbar();
-    }
-
     @Override
     public void updatePrices(Price totalPrice) {
         try {
@@ -206,14 +201,6 @@ public void updatePrices(Price totalPrice) {
         }
     }
 
-    /**
-     * Fully expand the toolbar with animation.
-     */
-    private void expandToolbar() {
-        AppBarLayout.Behavior behavior = (AppBarLayout.Behavior) ((CoordinatorLayout.LayoutParams) mAppBarLayout.getLayoutParams()).getBehavior();
-        behavior.onNestedFling(mCoordinatorLayout, mAppBarLayout, null, 0, -1000, true);
-    }
-
     @Override
     public void showItems(List<Item> items, List<Integer> count, Price totalPrice) {
         updatePrices(totalPrice);
diff --git a/app/src/main/java/com/tlongdev/bktf/ui/fragment/FavoritesFragment.java b/app/src/main/java/com/tlongdev/bktf/ui/fragment/FavoritesFragment.java
index 0c3a608e..08545335 100644
--- a/app/src/main/java/com/tlongdev/bktf/ui/fragment/FavoritesFragment.java
+++ b/app/src/main/java/com/tlongdev/bktf/ui/fragment/FavoritesFragment.java
@@ -63,7 +63,7 @@
  * A simple {@link Fragment} subclass.
  */
 public class FavoritesFragment extends BptfFragment implements FavoritesView,
-        MainActivity.OnDrawerOpenedListener, FavoritesAdapter.OnMoreListener {
+        FavoritesAdapter.OnMoreListener {
 
     @Inject FavoritesPresenter mPresenter;
 
@@ -177,11 +177,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    public void onDrawerOpened() {
-        expandToolbar();
-    }
-
     @OnClick(R.id.fab)
     public void addItem() {
         startActivityForResult(new Intent(getActivity(), ItemChooserActivity.class), MainActivity.REQUEST_NEW_ITEM);
@@ -193,14 +188,6 @@ public void showFavorites(List<Item> items) {
         mAdapter.notifyDataSetChanged();
     }
 
-    /**
-     * Fully expand the toolbar with animation.
-     */
-    private void expandToolbar() {
-        AppBarLayout.Behavior behavior = (AppBarLayout.Behavior) ((CoordinatorLayout.LayoutParams) mAppBarLayout.getLayoutParams()).getBehavior();
-        behavior.onNestedFling(mCoordinatorLayout, mAppBarLayout, null, 0, -1000, true);
-    }
-
     @Override
     public void onMoreClicked(View view, final Item item) {
         PopupMenu menu = new PopupMenu(getActivity(), view);
diff --git a/app/src/main/java/com/tlongdev/bktf/ui/fragment/RecentsFragment.java b/app/src/main/java/com/tlongdev/bktf/ui/fragment/RecentsFragment.java
index d43abe6d..5b1aadb5 100644
--- a/app/src/main/java/com/tlongdev/bktf/ui/fragment/RecentsFragment.java
+++ b/app/src/main/java/com/tlongdev/bktf/ui/fragment/RecentsFragment.java
@@ -56,7 +56,6 @@
 import com.tlongdev.bktf.model.Item;
 import com.tlongdev.bktf.model.Price;
 import com.tlongdev.bktf.presenter.fragment.RecentsPresenter;
-import com.tlongdev.bktf.ui.activity.MainActivity;
 import com.tlongdev.bktf.ui.activity.PriceHistoryActivity;
 import com.tlongdev.bktf.ui.activity.SearchActivity;
 import com.tlongdev.bktf.ui.view.fragment.RecentsView;
@@ -72,7 +71,7 @@
  * recents fragment. Shows a list of all the prices orderd by the time of the price update.
  */
 public class RecentsFragment extends BptfFragment implements RecentsView,
-        SwipeRefreshLayout.OnRefreshListener, MainActivity.OnDrawerOpenedListener, RecentsAdapter.OnMoreListener {
+        SwipeRefreshLayout.OnRefreshListener, RecentsAdapter.OnMoreListener {
 
     @Inject RecentsPresenter mPresenter;
 
@@ -202,20 +201,6 @@ public void onRefresh() {
         mPresenter.downloadPrices();
     }
 
-    @Override
-    public void onDrawerOpened() {
-        expandToolbar();
-    }
-
-    /**
-     * Fully expand the toolbar with animation.
-     */
-    private void expandToolbar() {
-        AppBarLayout.Behavior behavior = (AppBarLayout.Behavior) ((CoordinatorLayout.LayoutParams)
-                mAppBarLayout.getLayoutParams()).getBehavior();
-        behavior.onNestedFling(mCoordinatorLayout, mAppBarLayout, null, 0, -1000, true);
-    }
-
     @Override
     public void showPrices(Cursor prices) {
         mAdapter.swapCursor(prices);
diff --git a/app/src/main/java/com/tlongdev/bktf/ui/fragment/UnusualFragment.java b/app/src/main/java/com/tlongdev/bktf/ui/fragment/UnusualFragment.java
index ec89d9de..716f2b78 100644
--- a/app/src/main/java/com/tlongdev/bktf/ui/fragment/UnusualFragment.java
+++ b/app/src/main/java/com/tlongdev/bktf/ui/fragment/UnusualFragment.java
@@ -43,11 +43,9 @@
 import com.tlongdev.bktf.adapter.UnusualAdapter;
 import com.tlongdev.bktf.model.Item;
 import com.tlongdev.bktf.presenter.fragment.UnusualPresenter;
-import com.tlongdev.bktf.ui.activity.MainActivity;
 import com.tlongdev.bktf.ui.activity.SearchActivity;
 import com.tlongdev.bktf.ui.activity.UnusualActivity;
 import com.tlongdev.bktf.ui.view.fragment.UnusualView;
-import com.tlongdev.bktf.util.Utility;
 
 import java.util.List;
 
@@ -62,7 +60,7 @@
  * hats or effects.
  */
 public class UnusualFragment extends BptfFragment implements UnusualView,
-        MainActivity.OnDrawerOpenedListener, TextWatcher, UnusualAdapter.OnItemClickListener {
+        TextWatcher, UnusualAdapter.OnItemClickListener {
 
     @Inject UnusualPresenter mPresenter;
     @Inject Context mContext;
@@ -217,7 +215,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     //Show hats sorted by their average price
                     mPresenter.loadUnusualHats("", mCurrentSort);
 
-                    effectMenuItem.setIcon(R.drawable.ic_star_outline_white);
+                    effectMenuItem.setIcon(R.drawable.ic_star_outline_white_24dp);
                     getActivity().setTitle(getString(R.string.title_unusuals));
 
                     mSearchInput.setHint("Name");
@@ -225,7 +223,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     //Show effects
                     mPresenter.loadUnusualEffects("", mCurrentSort);
 
-                    effectMenuItem.setIcon(R.drawable.ic_star_white);
+                    effectMenuItem.setIcon(R.drawable.ic_star_white_24dp);
                     getActivity().setTitle(getString(R.string.title_effects));
 
                     mSearchInput.setHint("Effect");
@@ -242,20 +240,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
     }
 
-    /**
-     * Fully expand the toolbar with animation.
-     */
-    private void expandToolbar() {
-        AppBarLayout.Behavior behavior = (AppBarLayout.Behavior) ((CoordinatorLayout.LayoutParams) mAppBarLayout.getLayoutParams()).getBehavior();
-        behavior.onNestedFling(mCoordinatorLayout, mAppBarLayout, null, 0, -1000, true);
-    }
-
-    @Override
-    public void onDrawerOpened() {
-        expandToolbar();
-        Utility.hideKeyboard(getActivity());
-    }
-
     @Override
     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
     }
diff --git a/app/src/main/java/com/tlongdev/bktf/ui/fragment/UserFragment.java b/app/src/main/java/com/tlongdev/bktf/ui/fragment/UserFragment.java
index 531e05cc..d5c6594a 100644
--- a/app/src/main/java/com/tlongdev/bktf/ui/fragment/UserFragment.java
+++ b/app/src/main/java/com/tlongdev/bktf/ui/fragment/UserFragment.java
@@ -49,7 +49,6 @@
 import com.tlongdev.bktf.customtabs.WebViewFallback;
 import com.tlongdev.bktf.model.User;
 import com.tlongdev.bktf.presenter.fragment.UserPresenter;
-import com.tlongdev.bktf.ui.activity.MainActivity;
 import com.tlongdev.bktf.ui.activity.SearchActivity;
 import com.tlongdev.bktf.ui.activity.UserBackpackActivity;
 import com.tlongdev.bktf.ui.view.fragment.UserView;
@@ -68,7 +67,7 @@
 /**
  * Fragment for displaying the user profile.
  */
-public class UserFragment extends BptfFragment implements UserView, View.OnClickListener, MainActivity.OnDrawerOpenedListener {
+public class UserFragment extends BptfFragment implements UserView, View.OnClickListener {
 
     private static final String USER_PARAM = "user_param";
 
@@ -334,8 +333,8 @@ public void updateUserPage(User user) {
         }
 
         //Load drawables for player statuses
-        Drawable statusOk = getResources().getDrawable(R.drawable.ic_done_white);
-        Drawable statusBad = getResources().getDrawable(R.drawable.ic_close_white);
+        Drawable statusOk = getResources().getDrawable(R.drawable.ic_done_white_48dp);
+        Drawable statusBad = getResources().getDrawable(R.drawable.ic_close_white_48dp);
         if (statusOk != null) statusOk.setColorFilter(0xFF00FF00, PorterDuff.Mode.MULTIPLY);
         if (statusBad != null) statusBad.setColorFilter(0xFFFF0000, PorterDuff.Mode.MULTIPLY);
 
@@ -412,19 +411,6 @@ public void updateUserPage(User user) {
             backpackSlots.setText("?/?");
     }
 
-    @Override
-    public void onDrawerOpened() {
-        expandToolbar();
-    }
-
-    /**
-     * Fully expand the toolbar with animation.
-     */
-    private void expandToolbar() {
-        AppBarLayout.Behavior behavior = (AppBarLayout.Behavior) ((CoordinatorLayout.LayoutParams) mAppBarLayout.getLayoutParams()).getBehavior();
-        behavior.onNestedFling(mCoordinatorLayout, mAppBarLayout, null, 0, -1000, true);
-    }
-
     @Override
     public void showRefreshingAnimation() {
         mSwipeRefreshLayout.post(new Runnable() {
diff --git a/app/src/main/res/drawable/ic_account_white.xml b/app/src/main/res/drawable/ic_account_white.xml
deleted file mode 100644
index 9067d6dc..00000000
--- a/app/src/main/res/drawable/ic_account_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_account_white_wrapper.xml b/app/src/main/res/drawable/ic_account_white_wrapper.xml
deleted file mode 100644
index 37545a28..00000000
--- a/app/src/main/res/drawable/ic_account_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_account_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_add_white.xml b/app/src/main/res/drawable/ic_add_white.xml
deleted file mode 100644
index 17bec97a..00000000
--- a/app/src/main/res/drawable/ic_add_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M19,13H13V19H11V13H5V11H11V5H13V11H19V13Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_arrow_forward.xml b/app/src/main/res/drawable/ic_arrow_forward.xml
deleted file mode 100644
index 216d919d..00000000
--- a/app/src/main/res/drawable/ic_arrow_forward.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_calculator_white.xml b/app/src/main/res/drawable/ic_calculator_white.xml
deleted file mode 100644
index 91d273ea..00000000
--- a/app/src/main/res/drawable/ic_calculator_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M7,2H17A2,2 0 0,1 19,4V20A2,2 0 0,1 17,22H7A2,2 0 0,1 5,20V4A2,2 0 0,1 7,2M7,4V8H17V4H7M7,10V12H9V10H7M11,10V12H13V10H11M15,10V12H17V10H15M7,14V16H9V14H7M11,14V16H13V14H11M15,14V16H17V14H15M7,18V20H9V18H7M11,18V20H13V18H11M15,18V20H17V18H15Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_calculator_white_wrapper.xml b/app/src/main/res/drawable/ic_calculator_white_wrapper.xml
deleted file mode 100644
index e184ea17..00000000
--- a/app/src/main/res/drawable/ic_calculator_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_calculator_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_close_white.xml b/app/src/main/res/drawable/ic_close_white.xml
deleted file mode 100644
index 2627973e..00000000
--- a/app/src/main/res/drawable/ic_close_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_done_white.xml b/app/src/main/res/drawable/ic_done_white.xml
deleted file mode 100644
index d861c946..00000000
--- a/app/src/main/res/drawable/ic_done_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_favorite_white.xml b/app/src/main/res/drawable/ic_favorite_white.xml
deleted file mode 100644
index 8872f5b7..00000000
--- a/app/src/main/res/drawable/ic_favorite_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_favorite_white_wrapper.xml b/app/src/main/res/drawable/ic_favorite_white_wrapper.xml
deleted file mode 100644
index 15bb878b..00000000
--- a/app/src/main/res/drawable/ic_favorite_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_favorite_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_feedback_white.xml b/app/src/main/res/drawable/ic_feedback_white.xml
deleted file mode 100644
index 769d0a85..00000000
--- a/app/src/main/res/drawable/ic_feedback_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M13,10H11V6H13M13,14H11V12H13M20,2H4A2,2 0 0,0 2,4V22L6,18H20A2,2 0 0,0 22,16V4C22,2.89 21.1,2 20,2Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_feedback_white_wrapper.xml b/app/src/main/res/drawable/ic_feedback_white_wrapper.xml
deleted file mode 100644
index b00e62e1..00000000
--- a/app/src/main/res/drawable/ic_feedback_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_feedback_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_filter_white.xml b/app/src/main/res/drawable/ic_filter_white.xml
deleted file mode 100644
index da543c21..00000000
--- a/app/src/main/res/drawable/ic_filter_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M6,13H18V11H6M3,6V8H21V6M10,18H14V16H10V18Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_gift_white.xml b/app/src/main/res/drawable/ic_gift_white.xml
deleted file mode 100644
index bd087c51..00000000
--- a/app/src/main/res/drawable/ic_gift_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M22,12V20A2,2 0 0,1 20,22H4A2,2 0 0,1 2,20V12A1,1 0 0,1 1,11V8A2,2 0 0,1 3,6H6.17C6.06,5.69 6,5.35 6,5A3,3 0 0,1 9,2C10,2 10.88,2.5 11.43,3.24V3.23L12,4L12.57,3.23V3.24C13.12,2.5 14,2 15,2A3,3 0 0,1 18,5C18,5.35 17.94,5.69 17.83,6H21A2,2 0 0,1 23,8V11A1,1 0 0,1 22,12M4,20H11V12H4V20M20,20V12H13V20H20M9,4A1,1 0 0,0 8,5A1,1 0 0,0 9,6A1,1 0 0,0 10,5A1,1 0 0,0 9,4M15,4A1,1 0 0,0 14,5A1,1 0 0,0 15,6A1,1 0 0,0 16,5A1,1 0 0,0 15,4M3,8V10H11V8H3M13,8V10H21V8H13Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_github_white.xml b/app/src/main/res/drawable/ic_github_white.xml
deleted file mode 100644
index ad996351..00000000
--- a/app/src/main/res/drawable/ic_github_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_github_white_wrapper.xml b/app/src/main/res/drawable/ic_github_white_wrapper.xml
deleted file mode 100644
index 5bde3f31..00000000
--- a/app/src/main/res/drawable/ic_github_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_github_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_help_white.xml b/app/src/main/res/drawable/ic_help_white.xml
deleted file mode 100644
index cfa9c9a8..00000000
--- a/app/src/main/res/drawable/ic_help_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M10,19H13V22H10V19M12,2C17.35,2.22 19.68,7.62 16.5,11.67C15.67,12.67 14.33,13.33 13.67,14.17C13,15 13,16 13,17H10C10,15.33 10,13.92 10.67,12.92C11.33,11.92 12.67,11.33 13.5,10.67C15.92,8.43 15.32,5.26 12,5A3,3 0 0,0 9,8H6A6,6 0 0,1 12,2Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_history_white.xml b/app/src/main/res/drawable/ic_history_white.xml
deleted file mode 100644
index 3cbfa399..00000000
--- a/app/src/main/res/drawable/ic_history_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M11,7V12.11L15.71,14.9L16.5,13.62L12.5,11.25V7M12.5,2C8.97,2 5.91,3.92 4.27,6.77L2,4.5V11H8.5L5.75,8.25C6.96,5.73 9.5,4 12.5,4A7.5,7.5 0 0,1 20,11.5A7.5,7.5 0 0,1 12.5,19C9.23,19 6.47,16.91 5.44,14H3.34C4.44,18.03 8.11,21 12.5,21C17.74,21 22,16.75 22,11.5A9.5,9.5 0 0,0 12.5,2Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_history_white_wrapper.xml b/app/src/main/res/drawable/ic_history_white_wrapper.xml
deleted file mode 100644
index c294587b..00000000
--- a/app/src/main/res/drawable/ic_history_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_history_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_info_white.xml b/app/src/main/res/drawable/ic_info_white.xml
deleted file mode 100644
index 8b77cd28..00000000
--- a/app/src/main/res/drawable/ic_info_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M11,9H13V7H11M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M11,17H13V11H11V17Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_info_white_wrapper.xml b/app/src/main/res/drawable/ic_info_white_wrapper.xml
deleted file mode 100644
index 8a62e450..00000000
--- a/app/src/main/res/drawable/ic_info_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_info_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_money_white.xml b/app/src/main/res/drawable/ic_money_white.xml
deleted file mode 100644
index 0bc36ebe..00000000
--- a/app/src/main/res/drawable/ic_money_white.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-
-    <path
-        android:fillColor="#fff"
-        android:pathData="M11.8 10.9c-2.27-.59-3-1.2-3-2.15 0-1.09 1.01-1.85 2.7-1.85 1.78 0 2.44 .85 2.5 2.1h2.21c-.07-1.72-1.12-3.3-3.21-3.81V3h-3v2.16c-1.94 .42 -3.5 1.68-3.5 3.61 0 2.31 1.91 3.46 4.7 4.13 2.5 .6 3 1.48 3 2.41 0 .69-.49 1.79-2.7 1.79-2.06 0-2.87-.92-2.98-2.1h-2.2c.12 2.19 1.76 3.42 3.68 3.83V21h3v-2.15c1.95-.37 3.5-1.5 3.5-3.55 0-2.84-2.43-3.81-4.7-4.4z"/>
-    <path
-        android:pathData="M0 0h24v24H0z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_money_white_wrapper.xml b/app/src/main/res/drawable/ic_money_white_wrapper.xml
deleted file mode 100644
index c880fe8b..00000000
--- a/app/src/main/res/drawable/ic_money_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_money_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_more_vert_white.xml b/app/src/main/res/drawable/ic_more_vert_white.xml
deleted file mode 100644
index e4d5d32c..00000000
--- a/app/src/main/res/drawable/ic_more_vert_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_new_releases_white.xml b/app/src/main/res/drawable/ic_new_releases_white.xml
deleted file mode 100644
index ab120e8b..00000000
--- a/app/src/main/res/drawable/ic_new_releases_white.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-
-    <path
-        android:pathData="M0 0h24v24H0z"/>
-
-    <path
-        android:fillColor="#fff"
-        android:pathData="M23 12l-2.44-2.78 .34 -3.68-3.61-.82-1.89-3.18L12 3 8.6 1.54 6.71 4.72l-3.61 .81 .34 3.68L1 12l2.44 2.78-.34 3.69 3.61 .82 1.89 3.18L12 21l3.4 1.46 1.89-3.18 3.61-.82-.34-3.68L23 12zm-10 5h-2v-2h2v2zm0-4h-2V7h2v6z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_new_releases_white_wrapper.xml b/app/src/main/res/drawable/ic_new_releases_white_wrapper.xml
deleted file mode 100644
index a5b7ec3c..00000000
--- a/app/src/main/res/drawable/ic_new_releases_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_new_releases_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search_white.xml b/app/src/main/res/drawable/ic_search_white.xml
deleted file mode 100644
index 70a4c28c..00000000
--- a/app/src/main/res/drawable/ic_search_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search_white_wrapper.xml b/app/src/main/res/drawable/ic_search_white_wrapper.xml
deleted file mode 100644
index eb83fb42..00000000
--- a/app/src/main/res/drawable/ic_search_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_search_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_white.xml b/app/src/main/res/drawable/ic_settings_white.xml
deleted file mode 100644
index f17d3b60..00000000
--- a/app/src/main/res/drawable/ic_settings_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_white_wrapper.xml b/app/src/main/res/drawable/ic_settings_white_wrapper.xml
deleted file mode 100644
index fa8531c0..00000000
--- a/app/src/main/res/drawable/ic_settings_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_settings_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_sort_white.xml b/app/src/main/res/drawable/ic_sort_white.xml
deleted file mode 100644
index d008df54..00000000
--- a/app/src/main/res/drawable/ic_sort_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M3,13H15V11H3M3,6V8H21V6M3,18H9V16H3V18Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_sort_white_wrapper.xml b/app/src/main/res/drawable/ic_sort_white_wrapper.xml
deleted file mode 100644
index c1eb00bb..00000000
--- a/app/src/main/res/drawable/ic_sort_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_sort_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_star_outline_white.xml b/app/src/main/res/drawable/ic_star_outline_white.xml
deleted file mode 100644
index 0215628b..00000000
--- a/app/src/main/res/drawable/ic_star_outline_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M12,15.39L8.24,17.66L9.23,13.38L5.91,10.5L10.29,10.13L12,6.09L13.71,10.13L18.09,10.5L14.77,13.38L15.76,17.66M22,9.24L14.81,8.63L12,2L9.19,8.63L2,9.24L7.45,13.97L5.82,21L12,17.27L18.18,21L16.54,13.97L22,9.24Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_star_outline_white_wrapper.xml b/app/src/main/res/drawable/ic_star_outline_white_wrapper.xml
deleted file mode 100644
index cfbb3421..00000000
--- a/app/src/main/res/drawable/ic_star_outline_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_star_outline_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_star_white.xml b/app/src/main/res/drawable/ic_star_white.xml
deleted file mode 100644
index 9859d32d..00000000
--- a/app/src/main/res/drawable/ic_star_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M12,17.27L18.18,21L16.54,13.97L22,9.24L14.81,8.62L12,2L9.19,8.62L2,9.24L7.45,13.97L5.82,21L12,17.27Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_star_white_wrapper.xml b/app/src/main/res/drawable/ic_star_white_wrapper.xml
deleted file mode 100644
index 8e6886b5..00000000
--- a/app/src/main/res/drawable/ic_star_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_star_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_steam_white.xml b/app/src/main/res/drawable/ic_steam_white.xml
deleted file mode 100644
index 685dc04c..00000000
--- a/app/src/main/res/drawable/ic_steam_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M20.14,7.79C21.33,7.79 22.29,8.75 22.29,9.93C22.29,11.11 21.33,12.07 20.14,12.07A2.14,2.14 0 0,1 18,9.93C18,8.75 18.96,7.79 20.14,7.79M3,6.93A3,3 0 0,1 6,9.93V10.24L12.33,13.54C12.84,13.15 13.46,12.93 14.14,12.93L16.29,9.93C16.29,7.8 18,6.07 20.14,6.07A3.86,3.86 0 0,1 24,9.93A3.86,3.86 0 0,1 20.14,13.79L17.14,15.93A3,3 0 0,1 14.14,18.93C12.5,18.93 11.14,17.59 11.14,15.93C11.14,15.89 11.14,15.85 11.14,15.82L4.64,12.44C4.17,12.75 3.6,12.93 3,12.93A3,3 0 0,1 0,9.93A3,3 0 0,1 3,6.93M15.03,14.94C15.67,15.26 15.92,16.03 15.59,16.67C15.27,17.3 14.5,17.55 13.87,17.23L12.03,16.27C12.19,17.29 13.08,18.07 14.14,18.07C15.33,18.07 16.29,17.11 16.29,15.93C16.29,14.75 15.33,13.79 14.14,13.79C13.81,13.79 13.5,13.86 13.22,14L15.03,14.94M3,7.79C1.82,7.79 0.86,8.75 0.86,9.93C0.86,11.11 1.82,12.07 3,12.07C3.24,12.07 3.5,12.03 3.7,11.95L2.28,11.22C1.64,10.89 1.39,10.12 1.71,9.5C2.04,8.86 2.81,8.6 3.44,8.93L5.14,9.81C5.08,8.68 4.14,7.79 3,7.79M20.14,6.93C18.5,6.93 17.14,8.27 17.14,9.93A3,3 0 0,0 20.14,12.93A3,3 0 0,0 23.14,9.93A3,3 0 0,0 20.14,6.93Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_steam_white_wrapper.xml b/app/src/main/res/drawable/ic_steam_white_wrapper.xml
deleted file mode 100644
index d45dca29..00000000
--- a/app/src/main/res/drawable/ic_steam_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_steam_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_swap_horiz_white_wrapper.xml b/app/src/main/res/drawable/ic_swap_horiz_white_wrapper.xml
deleted file mode 100644
index d0c1a3e1..00000000
--- a/app/src/main/res/drawable/ic_swap_horiz_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/is_swap_horiz_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_weather_night_white.xml b/app/src/main/res/drawable/ic_weather_night_white.xml
deleted file mode 100644
index 7390f3be..00000000
--- a/app/src/main/res/drawable/ic_weather_night_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M17.75,4.09L15.22,6.03L16.13,9.09L13.5,7.28L10.87,9.09L11.78,6.03L9.25,4.09L12.44,4L13.5,1L14.56,4L17.75,4.09M21.25,11L19.61,12.25L20.2,14.23L18.5,13.06L16.8,14.23L17.39,12.25L15.75,11L17.81,10.95L18.5,9L19.19,10.95L21.25,11M18.97,15.95C19.8,15.87 20.69,17.05 20.16,17.8C19.84,18.25 19.5,18.67 19.08,19.07C15.17,23 8.84,23 4.94,19.07C1.03,15.17 1.03,8.83 4.94,4.93C5.34,4.53 5.76,4.17 6.21,3.85C6.96,3.32 8.14,4.21 8.06,5.04C7.79,7.9 8.75,10.87 10.95,13.06C13.14,15.26 16.1,16.22 18.97,15.95M17.33,17.97C14.5,17.81 11.7,16.64 9.53,14.5C7.36,12.31 6.2,9.5 6.04,6.68C3.23,9.82 3.34,14.64 6.35,17.66C9.37,20.67 14.19,20.78 17.33,17.97Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_weather_night_white_wrapper.xml b/app/src/main/res/drawable/ic_weather_night_white_wrapper.xml
deleted file mode 100644
index 9599f209..00000000
--- a/app/src/main/res/drawable/ic_weather_night_white_wrapper.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_weather_night_white"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/is_swap_horiz_white.xml b/app/src/main/res/drawable/is_swap_horiz_white.xml
deleted file mode 100644
index dc51b2ad..00000000
--- a/app/src/main/res/drawable/is_swap_horiz_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#fff"
-        android:pathData="M21,9L17,5V8H10V10H17V13M7,11L3,15L7,19V16H14V14H7V11Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land-v21/fragment_converter.xml b/app/src/main/res/layout-land-v21/fragment_converter.xml
index eb011cf7..172197e0 100644
--- a/app/src/main/res/layout-land-v21/fragment_converter.xml
+++ b/app/src/main/res/layout-land-v21/fragment_converter.xml
@@ -91,9 +91,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="8dp"
                     android:layout_marginRight="8dp"
-                    android:drawableLeft="@drawable/ic_money_white_wrapper"
+                    android:drawableLeft="@drawable/ic_attach_money_white_24dp"
                     android:drawablePadding="4dp"
-                    android:drawableStart="@drawable/ic_money_white_wrapper"
+                    android:drawableStart="@drawable/ic_attach_money_white_24dp"
                     android:inputType="number"
                     android:lines="1"
                     android:scrollHorizontally="true"/>
diff --git a/app/src/main/res/layout-land/fragment_converter.xml b/app/src/main/res/layout-land/fragment_converter.xml
index bd431449..1adfebac 100644
--- a/app/src/main/res/layout-land/fragment_converter.xml
+++ b/app/src/main/res/layout-land/fragment_converter.xml
@@ -91,9 +91,9 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="8dp"
                     android:layout_marginRight="8dp"
-                    android:drawableLeft="@drawable/ic_money_white_wrapper"
+                    android:drawableLeft="@drawable/ic_attach_money_white_24dp"
                     android:drawablePadding="4dp"
-                    android:drawableStart="@drawable/ic_money_white_wrapper"
+                    android:drawableStart="@drawable/ic_attach_money_white_24dp"
                     android:inputType="number"
                     android:lines="1"
                     android:scrollHorizontally="true"/>
diff --git a/app/src/main/res/layout-large-land-v21/fragment_converter.xml b/app/src/main/res/layout-large-land-v21/fragment_converter.xml
index 343b18f1..4eeb9d30 100644
--- a/app/src/main/res/layout-large-land-v21/fragment_converter.xml
+++ b/app/src/main/res/layout-large-land-v21/fragment_converter.xml
@@ -81,7 +81,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"
                 android:drawablePadding="4dp"
-                android:drawableStart="@drawable/ic_money_white_wrapper"
+                android:drawableStart="@drawable/ic_attach_money_white_24dp"
                 android:inputType="number"
                 android:lines="1"
                 android:scrollHorizontally="true"/>
diff --git a/app/src/main/res/layout-large-land/fragment_converter.xml b/app/src/main/res/layout-large-land/fragment_converter.xml
index 9be53f40..38637ce5 100644
--- a/app/src/main/res/layout-large-land/fragment_converter.xml
+++ b/app/src/main/res/layout-large-land/fragment_converter.xml
@@ -83,9 +83,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"
-                android:drawableLeft="@drawable/ic_money_white_wrapper"
+                android:drawableLeft="@drawable/ic_attach_money_white_24dp"
                 android:drawablePadding="4dp"
-                android:drawableStart="@drawable/ic_money_white_wrapper"
+                android:drawableStart="@drawable/ic_attach_money_white_24dp"
                 android:inputType="number"
                 android:lines="1"
                 android:scrollHorizontally="true"/>
diff --git a/app/src/main/res/layout-large-v21/fragment_converter.xml b/app/src/main/res/layout-large-v21/fragment_converter.xml
index 48c71d96..88876987 100644
--- a/app/src/main/res/layout-large-v21/fragment_converter.xml
+++ b/app/src/main/res/layout-large-v21/fragment_converter.xml
@@ -93,7 +93,7 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
                     android:drawablePadding="4dp"
-                    android:drawableStart="@drawable/ic_money_white_wrapper"
+                    android:drawableStart="@drawable/ic_attach_money_white_24dp"
                     android:inputType="number"
                     android:lines="1"
                     android:scrollHorizontally="true"/>
diff --git a/app/src/main/res/layout-large/fragment_converter.xml b/app/src/main/res/layout-large/fragment_converter.xml
index 116c877c..180f2768 100644
--- a/app/src/main/res/layout-large/fragment_converter.xml
+++ b/app/src/main/res/layout-large/fragment_converter.xml
@@ -95,9 +95,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
-                    android:drawableLeft="@drawable/ic_money_white_wrapper"
+                    android:drawableLeft="@drawable/ic_attach_money_white_24dp"
                     android:drawablePadding="4dp"
-                    android:drawableStart="@drawable/ic_money_white_wrapper"
+                    android:drawableStart="@drawable/ic_attach_money_white_24dp"
                     android:inputType="number"
                     android:lines="1"
                     android:scrollHorizontally="true"/>
diff --git a/app/src/main/res/layout-v21/content_user_backpack.xml b/app/src/main/res/layout-v21/content_user_backpack.xml
index b5ff3d17..54e75e3b 100644
--- a/app/src/main/res/layout-v21/content_user_backpack.xml
+++ b/app/src/main/res/layout-v21/content_user_backpack.xml
@@ -29,7 +29,7 @@
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:padding="16dp"
             android:tint="@color/accent"
-            app:srcCompat="@drawable/ic_arrow_forward"
+            android:src="@drawable/ic_arrow_forward_white_24dp"
             tools:ignore="MissingPrefix"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout-v21/fragment_converter.xml b/app/src/main/res/layout-v21/fragment_converter.xml
index 80bad77e..62753539 100644
--- a/app/src/main/res/layout-v21/fragment_converter.xml
+++ b/app/src/main/res/layout-v21/fragment_converter.xml
@@ -92,7 +92,7 @@
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
                     android:drawablePadding="4dp"
-                    android:drawableStart="@drawable/ic_money_white_wrapper"
+                    android:drawableStart="@drawable/ic_attach_money_white_24dp"
                     android:inputType="number"
                     android:lines="1"
                     android:scrollHorizontally="true"/>
diff --git a/app/src/main/res/layout/activity_item_chooser.xml b/app/src/main/res/layout/activity_item_chooser.xml
index 288e5c87..160fbc2e 100644
--- a/app/src/main/res/layout/activity_item_chooser.xml
+++ b/app/src/main/res/layout/activity_item_chooser.xml
@@ -186,6 +186,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:layout_margin="16dp"
-        app:srcCompat="@drawable/ic_done_white"/>
+        android:src="@drawable/ic_done_white_48dp"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index f8ea711b..2ff7724a 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -49,7 +49,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
-            app:srcCompat="@drawable/ic_filter_white"/>
+            android:src="@drawable/ic_filter_list_white_24dp"/>
 
     </android.support.design.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/activity_unusual.xml b/app/src/main/res/layout/activity_unusual.xml
index 9592bad8..02f4d77f 100644
--- a/app/src/main/res/layout/activity_unusual.xml
+++ b/app/src/main/res/layout/activity_unusual.xml
@@ -41,9 +41,9 @@
                 android:layout_marginRight="16dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="8dp"
-                android:drawableLeft="@drawable/ic_search_white_wrapper"
+                android:drawableLeft="@drawable/ic_search_white_24dp"
                 android:drawablePadding="4dp"
-                android:drawableStart="@drawable/ic_search_white_wrapper"
+                android:drawableStart="@drawable/ic_search_white_24dp"
                 android:hint="Name"
                 android:lines="1"/>
 
diff --git a/app/src/main/res/layout/content_user_backpack.xml b/app/src/main/res/layout/content_user_backpack.xml
index e7fb50a9..e000ac04 100644
--- a/app/src/main/res/layout/content_user_backpack.xml
+++ b/app/src/main/res/layout/content_user_backpack.xml
@@ -29,7 +29,7 @@
             android:background="?android:attr/selectableItemBackground"
             android:padding="16dp"
             android:tint="@color/accent"
-            app:srcCompat="@drawable/ic_arrow_forward"
+            android:src="@drawable/ic_arrow_forward_white_24dp"
             tools:ignore="MissingPrefix"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_calculator.xml b/app/src/main/res/layout/fragment_calculator.xml
index 61495084..8c613dc4 100644
--- a/app/src/main/res/layout/fragment_calculator.xml
+++ b/app/src/main/res/layout/fragment_calculator.xml
@@ -125,7 +125,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
-            app:srcCompat="@drawable/ic_add_white"/>
+            android:src="@drawable/ic_add_white_24dp"/>
 
     </android.support.design.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/fragment_converter.xml b/app/src/main/res/layout/fragment_converter.xml
index 2fbabb3a..fe5b6371 100644
--- a/app/src/main/res/layout/fragment_converter.xml
+++ b/app/src/main/res/layout/fragment_converter.xml
@@ -94,9 +94,9 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_margin="8dp"
-                    android:drawableLeft="@drawable/ic_money_white_wrapper"
+                    android:drawableLeft="@drawable/ic_attach_money_white_24dp"
                     android:drawablePadding="4dp"
-                    android:drawableStart="@drawable/ic_money_white_wrapper"
+                    android:drawableStart="@drawable/ic_attach_money_white_24dp"
                     android:inputType="number"
                     android:lines="1"
                     android:scrollHorizontally="true"/>
diff --git a/app/src/main/res/layout/fragment_favorites.xml b/app/src/main/res/layout/fragment_favorites.xml
index ea1a21a9..752329fc 100644
--- a/app/src/main/res/layout/fragment_favorites.xml
+++ b/app/src/main/res/layout/fragment_favorites.xml
@@ -50,7 +50,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
-            app:srcCompat="@drawable/ic_add_white"/>
+            android:src="@drawable/ic_add_white_24dp"/>
 
     </android.support.design.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/fragment_unusual.xml b/app/src/main/res/layout/fragment_unusual.xml
index 1125c07d..d8040de3 100644
--- a/app/src/main/res/layout/fragment_unusual.xml
+++ b/app/src/main/res/layout/fragment_unusual.xml
@@ -42,9 +42,9 @@
                 android:layout_marginRight="16dp"
                 android:layout_marginStart="16dp"
                 android:layout_marginTop="8dp"
-                android:drawableLeft="@drawable/ic_search_white_wrapper"
+                android:drawableLeft="@drawable/ic_search_white_24dp"
                 android:drawablePadding="4dp"
-                android:drawableStart="@drawable/ic_search_white_wrapper"
+                android:drawableStart="@drawable/ic_search_white_24dp"
                 android:hint="Name"
                 android:lines="1"/>
 
diff --git a/app/src/main/res/layout/grid_unusual.xml b/app/src/main/res/layout/grid_unusual.xml
index cf82d743..5033ec6d 100644
--- a/app/src/main/res/layout/grid_unusual.xml
+++ b/app/src/main/res/layout/grid_unusual.xml
@@ -47,7 +47,7 @@
                 android:paddingRight="4dp"
                 android:paddingStart="8dp"
                 android:paddingTop="8dp"
-                app:srcCompat="@drawable/ic_more_vert_white"
+                android:src="@drawable/ic_more_vert_white_18dp"
                 tools:ignore="MissingPrefix"/>
 
         </android.support.percent.PercentFrameLayout>
diff --git a/app/src/main/res/layout/list_calculator.xml b/app/src/main/res/layout/list_calculator.xml
index dcc8eb53..aebe3b8d 100644
--- a/app/src/main/res/layout/list_calculator.xml
+++ b/app/src/main/res/layout/list_calculator.xml
@@ -115,7 +115,7 @@
             android:contentDescription="@string/description_delete"
             android:foreground="?attr/selectableItemBackgroundBorderless"
             android:padding="8dp"
-            app:srcCompat="@drawable/ic_close_white"
+            android:src="@drawable/ic_close_white_48dp"
             tools:ignore="MissingPrefix"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/list_favorites.xml b/app/src/main/res/layout/list_favorites.xml
index 16eb9ca1..1833129b 100644
--- a/app/src/main/res/layout/list_favorites.xml
+++ b/app/src/main/res/layout/list_favorites.xml
@@ -114,7 +114,7 @@
                 android:paddingRight="4dp"
                 android:paddingStart="8dp"
                 android:paddingTop="8dp"
-                app:srcCompat="@drawable/ic_more_vert_white"
+                android:src="@drawable/ic_more_vert_white_18dp"
                 tools:ignore="MissingPrefix"/>
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/list_recents.xml b/app/src/main/res/layout/list_recents.xml
index 16eb9ca1..1833129b 100644
--- a/app/src/main/res/layout/list_recents.xml
+++ b/app/src/main/res/layout/list_recents.xml
@@ -114,7 +114,7 @@
                 android:paddingRight="4dp"
                 android:paddingStart="8dp"
                 android:paddingTop="8dp"
-                app:srcCompat="@drawable/ic_more_vert_white"
+                android:src="@drawable/ic_more_vert_white_18dp"
                 tools:ignore="MissingPrefix"/>
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/list_search.xml b/app/src/main/res/layout/list_search.xml
index 1d06d117..8380d2f4 100644
--- a/app/src/main/res/layout/list_search.xml
+++ b/app/src/main/res/layout/list_search.xml
@@ -126,7 +126,7 @@
                 android:paddingRight="4dp"
                 android:paddingStart="8dp"
                 android:paddingTop="8dp"
-                app:srcCompat="@drawable/ic_more_vert_white"
+                android:src="@drawable/ic_more_vert_white_18dp"
                 tools:ignore="MissingPrefix"/>
 
         </RelativeLayout>
diff --git a/app/src/main/res/menu/menu_calculator.xml b/app/src/main/res/menu/menu_calculator.xml
index 194994a3..92474f37 100644
--- a/app/src/main/res/menu/menu_calculator.xml
+++ b/app/src/main/res/menu/menu_calculator.xml
@@ -7,7 +7,7 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="@drawable/ic_search_white_wrapper"
+        android:icon="@drawable/ic_search_white_24dp"
         android:orderInCategory="100"
         android:title="@string/search_title"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/menu_converter.xml b/app/src/main/res/menu/menu_converter.xml
index d2ca0e2c..4979f7ae 100644
--- a/app/src/main/res/menu/menu_converter.xml
+++ b/app/src/main/res/menu/menu_converter.xml
@@ -7,7 +7,7 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="@drawable/ic_search_white_wrapper"
+        android:icon="@drawable/ic_search_white_24dp"
         android:orderInCategory="100"
         android:title="@string/search_title"
         app:showAsAction="always" />
diff --git a/app/src/main/res/menu/menu_favorites.xml b/app/src/main/res/menu/menu_favorites.xml
index 55f3f9e2..2ee14479 100644
--- a/app/src/main/res/menu/menu_favorites.xml
+++ b/app/src/main/res/menu/menu_favorites.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="@drawable/ic_search_white_wrapper"
+        android:icon="@drawable/ic_search_white_24dp"
         android:orderInCategory="100"
         android:title="@string/search_title"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/menu_recents.xml b/app/src/main/res/menu/menu_recents.xml
index 16c93395..820ab0ba 100644
--- a/app/src/main/res/menu/menu_recents.xml
+++ b/app/src/main/res/menu/menu_recents.xml
@@ -4,7 +4,7 @@
     <!--Button used for switching between hat and effect view.-->
     <item
         android:id="@+id/action_search"
-        android:icon="@drawable/ic_search_white_wrapper"
+        android:icon="@drawable/ic_search_white_24dp"
         android:orderInCategory="100"
         android:title="@string/search_title"
         app:showAsAction="always" />
diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml
index 6bbdd0a8..eb771bf8 100644
--- a/app/src/main/res/menu/menu_search.xml
+++ b/app/src/main/res/menu/menu_search.xml
@@ -5,7 +5,7 @@
     <!--Button for switching to the search fragment.-->
     <item
         android:id="@+id/action_search"
-        android:icon="@drawable/ic_search_white_wrapper"
+        android:icon="@drawable/ic_search_white_24dp"
         android:orderInCategory="100"
         android:title="@string/search_title"
         app:actionViewClass="android.support.v7.widget.SearchView"
diff --git a/app/src/main/res/menu/menu_unusual.xml b/app/src/main/res/menu/menu_unusual.xml
index 48644bfd..dd24240f 100644
--- a/app/src/main/res/menu/menu_unusual.xml
+++ b/app/src/main/res/menu/menu_unusual.xml
@@ -7,7 +7,7 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="@drawable/ic_search_white_wrapper"
+        android:icon="@drawable/ic_search_white_24dp"
         android:orderInCategory="100"
         android:title="@string/search_title"
         app:showAsAction="always" />
@@ -15,7 +15,7 @@
     <!--Spinner used for sorting the items.-->
     <item
         android:id="@+id/action_sort"
-        android:icon="@drawable/ic_sort_white_wrapper"
+        android:icon="@drawable/ic_sort_white_24dp"
         android:orderInCategory="90"
         android:title="@string/action_sort"
         app:showAsAction="ifRoom|collapseActionView">
@@ -32,7 +32,7 @@
     <!--Button used for switching between hat and effect view.-->
     <item
         android:id="@+id/action_effect"
-        android:icon="@drawable/ic_star_outline_white_wrapper"
+        android:icon="@drawable/ic_star_outline_white_24dp"
         android:orderInCategory="80"
         android:title="@string/action_browse_effect"
         app:showAsAction="ifRoom|collapseActionView" />
diff --git a/app/src/main/res/menu/menu_user.xml b/app/src/main/res/menu/menu_user.xml
index 3b9e6699..a9382703 100644
--- a/app/src/main/res/menu/menu_user.xml
+++ b/app/src/main/res/menu/menu_user.xml
@@ -6,7 +6,7 @@
 
     <item
         android:id="@+id/action_search"
-        android:icon="@drawable/ic_search_white_wrapper"
+        android:icon="@drawable/ic_search_white_24dp"
         android:orderInCategory="100"
         android:title="@string/search_title"
         app:showAsAction="always" />
diff --git a/app/src/main/res/menu/navigation_items.xml b/app/src/main/res/menu/navigation_items.xml
index 23584099..2c202aeb 100644
--- a/app/src/main/res/menu/navigation_items.xml
+++ b/app/src/main/res/menu/navigation_items.xml
@@ -5,27 +5,27 @@
         android:checkableBehavior="single">
         <item
             android:id="@+id/nav_recents"
-            android:icon="@drawable/ic_new_releases_white_wrapper"
+            android:icon="@drawable/ic_new_releases_white_24dp"
             android:title="@string/title_home" />
         <item
             android:id="@+id/nav_unusuals"
-            android:icon="@drawable/ic_weather_night_white_wrapper"
+            android:icon="@drawable/ic_weather_night_white_24dp"
             android:title="@string/title_prices" />
         <item
             android:id="@+id/nav_user"
-            android:icon="@drawable/ic_account_white_wrapper"
+            android:icon="@drawable/ic_account_white_24dp"
             android:title="@string/title_user" />
         <item
             android:id="@+id/nav_favorites"
-            android:icon="@drawable/ic_favorite_white_wrapper"
+            android:icon="@drawable/ic_favorite_white_24dp"
             android:title="@string/title_favorites" />
         <item
             android:id="@+id/nav_converter"
-            android:icon="@drawable/ic_swap_horiz_white_wrapper"
+            android:icon="@drawable/ic_swap_horiz_white_24dp"
             android:title="@string/title_converter" />
         <item
             android:id="@+id/nav_calculator"
-            android:icon="@drawable/ic_calculator_white_wrapper"
+            android:icon="@drawable/ic_calculator_white_24dp"
             android:title="@string/title_calculator" />
     </group>
     <group
@@ -33,11 +33,11 @@
         android:checkableBehavior="none">
         <item
             android:id="@+id/nav_settings"
-            android:icon="@drawable/ic_settings_white_wrapper"
+            android:icon="@drawable/ic_settings_white_24dp"
             android:title="@string/title_activity_settings" />
         <item
             android:id="@+id/nav_about"
-            android:icon="@drawable/ic_info_white_wrapper"
+            android:icon="@drawable/ic_info_outline_white_24dp"
             android:title="@string/title_activity_about" />
     </group>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_about.xml b/app/src/main/res/xml/pref_about.xml
index f14a17be..a8268f5d 100644
--- a/app/src/main/res/xml/pref_about.xml
+++ b/app/src/main/res/xml/pref_about.xml
@@ -11,7 +11,7 @@
         android:title="@string/pref_title_version"/>
 
     <PreferenceScreen
-        android:icon="@drawable/ic_steam_white_wrapper"
+        android:icon="@drawable/ic_steam_white_24dp"
         android:title="@string/pref_title_steam">
 
         <intent
@@ -22,7 +22,7 @@
 
     <PreferenceScreen
         android:title="@string/pref_title_github_repo"
-        android:icon="@drawable/ic_github_white_wrapper">
+        android:icon="@drawable/ic_github_circle_white_24dp">
 
         <intent
             android:action="android.intent.action.VIEW"
@@ -32,7 +32,7 @@
 
     <PreferenceScreen
         android:title="@string/pref_title_licenses"
-        android:icon="@drawable/ic_info_white_wrapper">
+        android:icon="@drawable/ic_info_outline_white_24dp">
 
         <intent
             android:action="android.intent.action.VIEW"
@@ -43,7 +43,7 @@
 
     <PreferenceScreen
         android:title="@string/pref_title_changelog"
-        android:icon="@drawable/ic_history_white_wrapper">
+        android:icon="@drawable/ic_history_white_24dp">
 
         <intent
             android:action="android.intent.action.VIEW"
@@ -54,11 +54,11 @@
     <Preference
         android:key="@string/pref_title_feedback"
         android:title="@string/pref_title_feedback"
-        android:icon="@drawable/ic_feedback_white_wrapper"/>
+        android:icon="@drawable/ic_feedback_white_24dp"/>
 
     <Preference
         android:key="@string/pref_title_rate"
         android:title="@string/pref_title_rate"
-        android:icon="@drawable/ic_star_white_wrapper"/>
+        android:icon="@drawable/ic_star_white_24dp"/>
 
 </PreferenceScreen>
\ No newline at end of file