diff --git a/app/build.gradle b/app/build.gradle
index ff3f662..56c449f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,11 +10,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 23
         versionName "4.3.3"
-        generatedDensities = []
-    }
-
-    aaptOptions {
-        additionalParameters "--no-version-vectors"
+        vectorDrawables.useSupportLibrary = true
     }
 
     sourceSets {
diff --git a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
index 39e409b..69eb221 100644
--- a/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
+++ b/app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
@@ -353,12 +353,13 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
         mRefreshIcon = ThemeUtils.getThemedDrawable(this, R.drawable.ic_action_refresh, mDarkTheme);
         mClearIcon = ThemeUtils.getThemedDrawable(this, R.drawable.ic_action_delete, mDarkTheme);
 
-        int iconBounds = Utils.dpToPx(30);
+        int iconBounds = Utils.dpToPx(24);
         mDeleteIcon.setBounds(0, 0, iconBounds, iconBounds);
         mRefreshIcon.setBounds(0, 0, iconBounds, iconBounds);
         mClearIcon.setBounds(0, 0, iconBounds, iconBounds);
         mIcon = mRefreshIcon;
         SearchListenerClass search = new SearchListenerClass();
+        mSearch.setCompoundDrawablePadding(Utils.dpToPx(3));
         mSearch.setCompoundDrawables(null, null, mRefreshIcon, null);
         mSearch.setOnKeyListener(search);
         mSearch.setOnFocusChangeListener(search);
@@ -2163,10 +2164,12 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
                 return;
             }
 
-            if (!mBookmarkManager.isBookmark(url)) {
-                addBookmark(title, url);
-            } else {
-                deleteBookmark(title, url);
+            if (!UrlUtils.isSpecialUrl(url)) {
+                if (!mBookmarkManager.isBookmark(url)) {
+                    addBookmark(title, url);
+                } else {
+                    deleteBookmark(title, url);
+                }
             }
         }
 
diff --git a/app/src/main/java/acr/browser/lightning/async/ImageDownloadTask.java b/app/src/main/java/acr/browser/lightning/async/ImageDownloadTask.java
index e229e8f..1b5378a 100644
--- a/app/src/main/java/acr/browser/lightning/async/ImageDownloadTask.java
+++ b/app/src/main/java/acr/browser/lightning/async/ImageDownloadTask.java
@@ -45,7 +45,7 @@ public class ImageDownloadTask extends AsyncTask<Void, Void, Bitmap> {
         this.mContextReference = new WeakReference<>(context.getApplicationContext());
     }
 
-    @Nullable
+    @NonNull
     @Override
     protected Bitmap doInBackground(Void... params) {
         Bitmap mIcon = null;
@@ -65,6 +65,9 @@ public class ImageDownloadTask extends AsyncTask<Void, Void, Bitmap> {
         final String hash = String.valueOf(uri.getHost().hashCode());
         final File image = new File(cache, hash + ".png");
         final String urlDisplay = uri.getScheme() + "://" + uri.getHost() + "/favicon.ico";
+        if (Constants.FILE.startsWith(uri.getScheme())) {
+            return mDefaultBitmap;
+        }
         // checks to see if the image exists
         if (!image.exists()) {
             FileOutputStream fos = null;
diff --git a/app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java b/app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java
index 6e4a02a..7016483 100644
--- a/app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java
+++ b/app/src/main/java/acr/browser/lightning/constant/BookmarkPage.java
@@ -42,7 +42,7 @@ public final class BookmarkPage extends AsyncTask<Void, Void, Void> {
 
     private static final String HEADING_2 = "</title>\n" +
             "</head>\n" +
-            "<style>body{background:#e1e1e1;max-width:100%;min-height:100%}#content{width:100%;max-width:800px;margin:0 auto;text-align:center}.box{vertical-align:middle;text-align:center;position:relative;display:inline-block;height:45px;width:150px;margin:10px;background-color:#fff;box-shadow:0 3px 6px rgba(0,0,0,0.25);font-family:Arial;color:#444;font-size:12px;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px}.box-content{height:25px;width:100%;vertical-align:middle;text-align:center;display:table-cell}p.ellipses{" +
+            "<style>body{background:#f5f5f5;max-width:100%;min-height:100%}#content{width:100%;max-width:800px;margin:0 auto;text-align:center}.box{vertical-align:middle;text-align:center;position:relative;display:inline-block;height:45px;width:150px;margin:10px;background-color:#fff;box-shadow:0 3px 6px rgba(0,0,0,0.25);font-family:Arial;color:#444;font-size:12px;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px}.box-content{height:25px;width:100%;vertical-align:middle;text-align:center;display:table-cell}p.ellipses{" +
             "width:130px;font-size: small;font-family: Arial, Helvetica, 'sans-serif';white-space:nowrap;overflow:hidden;text-align:left;vertical-align:middle;margin:auto;text-overflow:ellipsis;-o-text-overflow:ellipsis;-ms-text-overflow:ellipsis}.box a{width:100%;height:100%;position:absolute;left:0;top:0}img{vertical-align:middle;margin-right:10px;width:20px;height:20px;}.margin{margin:10px}</style>\n" +
             "<body><div id=content>";
 
diff --git a/app/src/main/java/acr/browser/lightning/constant/HistoryPage.java b/app/src/main/java/acr/browser/lightning/constant/HistoryPage.java
index e628e8a..c1a581f 100644
--- a/app/src/main/java/acr/browser/lightning/constant/HistoryPage.java
+++ b/app/src/main/java/acr/browser/lightning/constant/HistoryPage.java
@@ -28,7 +28,7 @@ public class HistoryPage extends AsyncTask<Void, Void, Void> {
 
     private static final String HEADING_1 = "<!DOCTYPE html><html xmlns=\"http://www.w3.org/1999/xhtml\"><head><meta content=\"en-us\" http-equiv=\"Content-Language\" /><meta content=\"text/html; charset=utf-8\" http-equiv=\"Content-Type\" /><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no\"><title>";
 
-    private static final String HEADING_2 = "</title></head><style>body { background: #e1e1e1;}.box { vertical-align:middle;position:relative; display: block; margin: 10px;padding-left:10px;padding-right:10px;padding-top:5px;padding-bottom:5px; background-color:#fff;box-shadow: 0px 2px 3px rgba( 0, 0, 0, 0.25 );font-family: Arial;color: #444;font-size: 12px;-moz-border-radius: 2px;-webkit-border-radius: 2px;border-radius: 2px;}.box a { width: 100%; height: 100%; position: absolute; left: 0; top: 0;}.black {color: black;font-size: 15px;font-family: Arial; white-space: nowrap; overflow: hidden;margin:auto; text-overflow: ellipsis; -o-text-overflow: ellipsis; -ms-text-overflow: ellipsis;}.font {color: gray;font-size: 10px;font-family: Arial; white-space: nowrap; overflow: hidden;margin:auto; text-overflow: ellipsis; -o-text-overflow: ellipsis; -ms-text-overflow: ellipsis;}</style><body><div id=\"content\">";
+    private static final String HEADING_2 = "</title></head><style>body { background: #f5f5f5;}.box { vertical-align:middle;position:relative; display: block; margin: 10px;padding-left:10px;padding-right:10px;padding-top:5px;padding-bottom:5px; background-color:#fff;box-shadow: 0px 2px 3px rgba( 0, 0, 0, 0.25 );font-family: Arial;color: #444;font-size: 12px;-moz-border-radius: 2px;-webkit-border-radius: 2px;border-radius: 2px;}.box a { width: 100%; height: 100%; position: absolute; left: 0; top: 0;}.black {color: black;font-size: 15px;font-family: Arial; white-space: nowrap; overflow: hidden;margin:auto; text-overflow: ellipsis; -o-text-overflow: ellipsis; -ms-text-overflow: ellipsis;}.font {color: gray;font-size: 10px;font-family: Arial; white-space: nowrap; overflow: hidden;margin:auto; text-overflow: ellipsis; -o-text-overflow: ellipsis; -ms-text-overflow: ellipsis;}</style><body><div id=\"content\">";
 
     private static final String PART1 = "<div class=\"box\"><a href=\"";
 
diff --git a/app/src/main/java/acr/browser/lightning/constant/StartPage.java b/app/src/main/java/acr/browser/lightning/constant/StartPage.java
index 15de365..abccc83 100644
--- a/app/src/main/java/acr/browser/lightning/constant/StartPage.java
+++ b/app/src/main/java/acr/browser/lightning/constant/StartPage.java
@@ -34,7 +34,7 @@ public class StartPage extends AsyncTask<Void, Void, Void> {
 
     private static final String HEAD_2 = "</title>"
             + "</head>"
-            + "<style>body{background:#f2f2f2;text-align:center;margin:0px;}#search_input{height:35px; "
+            + "<style>body{background:#f5f5f5;text-align:center;margin:0px;}#search_input{height:35px; "
             + "width:100%;outline:none;border:none;font-size: 16px;background-color:transparent;}"
             + "span { display: block; overflow: hidden; padding-left:5px;vertical-align:middle;}"
             + ".search_bar{display:table;vertical-align:middle;width:90%;height:35px;max-width:500px;margin:0 auto;background-color:#fff;box-shadow: 0px 2px 3px rgba( 0, 0, 0, 0.25 );"
diff --git a/app/src/main/java/acr/browser/lightning/utils/ThemeUtils.java b/app/src/main/java/acr/browser/lightning/utils/ThemeUtils.java
index a8c42ac..52379b5 100644
--- a/app/src/main/java/acr/browser/lightning/utils/ThemeUtils.java
+++ b/app/src/main/java/acr/browser/lightning/utils/ThemeUtils.java
@@ -12,11 +12,15 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.VectorDrawable;
+import android.os.Build;
 import android.support.annotation.AttrRes;
 import android.support.annotation.ColorInt;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.graphics.drawable.DrawableCompat;
+import android.support.v7.widget.AppCompatDrawableManager;
 import android.util.TypedValue;
 import android.widget.ImageView;
 
@@ -65,10 +69,33 @@ public class ThemeUtils {
         icon.setColorFilter(color, PorterDuff.Mode.SRC_IN);
     }
 
+    @NonNull
+    private static Drawable getVectorDrawable(@NonNull Context context, int drawableId) {
+        Drawable drawable = AppCompatDrawableManager.get().getDrawable(context, drawableId);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            drawable = (DrawableCompat.wrap(drawable)).mutate();
+        }
+        return drawable;
+    }
+
+    // http://stackoverflow.com/a/38244327/1499541
+    @NonNull
+    public static Bitmap getBitmapFromVectorDrawable(@NonNull Context context, int drawableId) {
+        Drawable drawable = getVectorDrawable(context, drawableId);
+
+        Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
+            drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        drawable.draw(canvas);
+
+        return bitmap;
+    }
+
     @NonNull
     public static Bitmap getThemedBitmap(@NonNull Context context, @DrawableRes int res, boolean dark) {
         int color = dark ? getIconDarkThemeColor(context) : getIconLightThemeColor(context);
-        Bitmap sourceBitmap = BitmapFactory.decodeResource(context.getResources(), res);
+        Bitmap sourceBitmap = getBitmapFromVectorDrawable(context, res);
         Bitmap resultBitmap = Bitmap.createBitmap(sourceBitmap.getWidth(), sourceBitmap.getHeight(), Bitmap.Config.ARGB_8888);
         Paint p = new Paint();
         ColorFilter filter = new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN);
@@ -82,7 +109,7 @@ public class ThemeUtils {
     @NonNull
     public static Drawable getThemedDrawable(@NonNull Context context, @DrawableRes int res, boolean dark) {
         int color = dark ? getIconDarkThemeColor(context) : getIconLightThemeColor(context);
-        final Drawable drawable = ContextCompat.getDrawable(context, res);
+        final Drawable drawable = getVectorDrawable(context, res);
         drawable.mutate();
         drawable.setColorFilter(color, PorterDuff.Mode.SRC_IN);
         return drawable;
@@ -91,11 +118,11 @@ public class ThemeUtils {
     @NonNull
     public static ColorDrawable getSelectedBackground(@NonNull Context context, boolean dark) {
         @ColorInt final int color = (dark) ? ContextCompat.getColor(context, R.color.selected_dark) :
-                ContextCompat.getColor(context, R.color.selected_light);
+            ContextCompat.getColor(context, R.color.selected_light);
         return new ColorDrawable(color);
     }
 
-    public static int getThemedTextHintColor(boolean dark){
+    public static int getThemedTextHintColor(boolean dark) {
         return 0x80ffffff & (dark ? Color.WHITE : Color.BLACK);
     }
 
diff --git a/app/src/main/res/drawable-hdpi/ic_action_back.png b/app/src/main/res/drawable-hdpi/ic_action_back.png
deleted file mode 100644
index 11b4ddf..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_back.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_collapse.png b/app/src/main/res/drawable-hdpi/ic_action_collapse.png
deleted file mode 100644
index e99b979..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_collapse.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_delete.png b/app/src/main/res/drawable-hdpi/ic_action_delete.png
deleted file mode 100644
index 206c53d..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_desktop.png b/app/src/main/res/drawable-hdpi/ic_action_desktop.png
deleted file mode 100644
index 5236883..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_desktop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_expand.png b/app/src/main/res/drawable-hdpi/ic_action_expand.png
deleted file mode 100644
index 82e354d..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_expand.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_forward.png b/app/src/main/res/drawable-hdpi/ic_action_forward.png
deleted file mode 100644
index f8dc437..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_forward.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_home.png b/app/src/main/res/drawable-hdpi/ic_action_home.png
deleted file mode 100644
index bc9bfef..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_home.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_invert.png b/app/src/main/res/drawable-hdpi/ic_action_invert.png
deleted file mode 100644
index 67db815..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_invert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_plus.png b/app/src/main/res/drawable-hdpi/ic_action_plus.png
deleted file mode 100644
index de178fa..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_plus.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_reading.png b/app/src/main/res/drawable-hdpi/ic_action_reading.png
deleted file mode 100644
index 9db0d62..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_reading.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_refresh.png b/app/src/main/res/drawable-hdpi/ic_action_refresh.png
deleted file mode 100644
index 34507ff..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_star.png b/app/src/main/res/drawable-hdpi/ic_action_star.png
deleted file mode 100644
index 63d0562..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_star.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_tabs.png b/app/src/main/res/drawable-hdpi/ic_action_tabs.png
deleted file mode 100644
index 292389c..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_tabs.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_text_size.png b/app/src/main/res/drawable-hdpi/ic_action_text_size.png
deleted file mode 100644
index d402918..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_text_size.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_bookmark.png b/app/src/main/res/drawable-hdpi/ic_bookmark.png
deleted file mode 100644
index 00fdd74..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_bookmark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_folder.png b/app/src/main/res/drawable-hdpi/ic_folder.png
deleted file mode 100644
index 20fe938..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_folder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_history.png b/app/src/main/res/drawable-hdpi/ic_history.png
deleted file mode 100644
index 0d51442..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_history.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_search.png b/app/src/main/res/drawable-hdpi/ic_search.png
deleted file mode 100644
index 3b014b9..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_webpage.png b/app/src/main/res/drawable-hdpi/ic_webpage.png
deleted file mode 100644
index 323db6a..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_webpage.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_home.png b/app/src/main/res/drawable-mdpi/ic_action_home.png
deleted file mode 100644
index 0be5ec4..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_action_home.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_webpage.png b/app/src/main/res/drawable-mdpi/ic_webpage.png
deleted file mode 100644
index 57cd548..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_webpage.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_back.png b/app/src/main/res/drawable-xhdpi/ic_action_back.png
deleted file mode 100644
index e44a4fc..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_back.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_collapse.png b/app/src/main/res/drawable-xhdpi/ic_action_collapse.png
deleted file mode 100644
index 1c74a32..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_collapse.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_delete.png b/app/src/main/res/drawable-xhdpi/ic_action_delete.png
deleted file mode 100644
index 3320822..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_desktop.png b/app/src/main/res/drawable-xhdpi/ic_action_desktop.png
deleted file mode 100644
index 8780b1c..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_desktop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_expand.png b/app/src/main/res/drawable-xhdpi/ic_action_expand.png
deleted file mode 100644
index 595d639..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_expand.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_forward.png b/app/src/main/res/drawable-xhdpi/ic_action_forward.png
deleted file mode 100644
index 3bf25d5..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_forward.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_home.png b/app/src/main/res/drawable-xhdpi/ic_action_home.png
deleted file mode 100644
index b9732a4..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_home.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_invert.png b/app/src/main/res/drawable-xhdpi/ic_action_invert.png
deleted file mode 100644
index 0ec4c37..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_invert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_plus.png b/app/src/main/res/drawable-xhdpi/ic_action_plus.png
deleted file mode 100644
index 0723c99..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_plus.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_reading.png b/app/src/main/res/drawable-xhdpi/ic_action_reading.png
deleted file mode 100644
index 8a8ec6c..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_reading.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xhdpi/ic_action_refresh.png
deleted file mode 100644
index 740eaed..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_star.png b/app/src/main/res/drawable-xhdpi/ic_action_star.png
deleted file mode 100644
index 06c202f..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_star.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_tabs.png b/app/src/main/res/drawable-xhdpi/ic_action_tabs.png
deleted file mode 100644
index 0b6881a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_tabs.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_text_size.png b/app/src/main/res/drawable-xhdpi/ic_action_text_size.png
deleted file mode 100644
index ae530e3..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_text_size.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_bookmark.png b/app/src/main/res/drawable-xhdpi/ic_bookmark.png
deleted file mode 100644
index ca87cdf..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_bookmark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_folder.png b/app/src/main/res/drawable-xhdpi/ic_folder.png
deleted file mode 100644
index 829c181..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_folder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_history.png b/app/src/main/res/drawable-xhdpi/ic_history.png
deleted file mode 100644
index 2a7b044..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_history.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_search.png b/app/src/main/res/drawable-xhdpi/ic_search.png
deleted file mode 100644
index 82553c6..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_webpage.png b/app/src/main/res/drawable-xhdpi/ic_webpage.png
deleted file mode 100644
index a634736..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_webpage.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_back.png b/app/src/main/res/drawable-xxhdpi/ic_action_back.png
deleted file mode 100644
index ae8a0a6..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_back.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_collapse.png b/app/src/main/res/drawable-xxhdpi/ic_action_collapse.png
deleted file mode 100644
index c12d0de..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_collapse.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_delete.png b/app/src/main/res/drawable-xxhdpi/ic_action_delete.png
deleted file mode 100644
index fac932f..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_delete.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_desktop.png b/app/src/main/res/drawable-xxhdpi/ic_action_desktop.png
deleted file mode 100644
index 6777c07..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_desktop.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_expand.png b/app/src/main/res/drawable-xxhdpi/ic_action_expand.png
deleted file mode 100644
index f4d927f..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_expand.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_forward.png b/app/src/main/res/drawable-xxhdpi/ic_action_forward.png
deleted file mode 100644
index 4ffb590..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_forward.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_home.png b/app/src/main/res/drawable-xxhdpi/ic_action_home.png
deleted file mode 100644
index 70f0d66..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_home.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_invert.png b/app/src/main/res/drawable-xxhdpi/ic_action_invert.png
deleted file mode 100644
index f35f65d..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_invert.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_plus.png b/app/src/main/res/drawable-xxhdpi/ic_action_plus.png
deleted file mode 100644
index 6fdc549..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_plus.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_reading.png b/app/src/main/res/drawable-xxhdpi/ic_action_reading.png
deleted file mode 100644
index cf9c7c0..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_reading.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png
deleted file mode 100644
index 7772050..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_refresh.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_star.png b/app/src/main/res/drawable-xxhdpi/ic_action_star.png
deleted file mode 100644
index 1287ac8..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_star.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_tabs.png b/app/src/main/res/drawable-xxhdpi/ic_action_tabs.png
deleted file mode 100644
index 0869e32..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_tabs.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_text_size.png b/app/src/main/res/drawable-xxhdpi/ic_action_text_size.png
deleted file mode 100644
index b9279b8..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_text_size.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bookmark.png b/app/src/main/res/drawable-xxhdpi/ic_bookmark.png
deleted file mode 100644
index 79a95b3..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_bookmark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder.png b/app/src/main/res/drawable-xxhdpi/ic_folder.png
deleted file mode 100644
index eba682d..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_folder.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_history.png b/app/src/main/res/drawable-xxhdpi/ic_history.png
deleted file mode 100644
index 7ae7af1..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_history.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_search.png b/app/src/main/res/drawable-xxhdpi/ic_search.png
deleted file mode 100644
index 4098a73..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_search.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_webpage.png b/app/src/main/res/drawable-xxhdpi/ic_webpage.png
deleted file mode 100644
index 9259fe4..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_webpage.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_action_back.xml b/app/src/main/res/drawable/ic_action_back.xml
new file mode 100644
index 0000000..53d2c5a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_back.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_collapse.xml b/app/src/main/res/drawable/ic_action_collapse.xml
new file mode 100644
index 0000000..8c66538
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_collapse.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_delete.xml b/app/src/main/res/drawable/ic_action_delete.xml
new file mode 100644
index 0000000..531c502
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_delete.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_desktop.xml b/app/src/main/res/drawable/ic_action_desktop.xml
new file mode 100644
index 0000000..864c3bf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_desktop.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M21,2L3,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h7l-2,3v1h8v-1l-2,-3h7c1.1,0 2,-0.9 2,-2L23,4c0,-1.1 -0.9,-2 -2,-2zM21,14L3,14L3,4h18v10z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_expand.xml b/app/src/main/res/drawable/ic_action_expand.xml
new file mode 100644
index 0000000..52c2d61
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_expand.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_forward.xml b/app/src/main/res/drawable/ic_action_forward.xml
new file mode 100644
index 0000000..56b99c4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_forward.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_home.xml b/app/src/main/res/drawable/ic_action_home.xml
new file mode 100644
index 0000000..b234e34
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_home.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_invert.xml b/app/src/main/res/drawable/ic_action_invert.xml
new file mode 100644
index 0000000..5b45142
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_invert.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M20,15.31L23.31,12 20,8.69V4h-4.69L12,0.69 8.69,4H4v4.69L0.69,12 4,15.31V20h4.69L12,23.31 15.31,20H20v-4.69zM12,18V6c3.31,0 6,2.69 6,6s-2.69,6 -6,6z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_plus.xml b/app/src/main/res/drawable/ic_action_plus.xml
new file mode 100644
index 0000000..1f463d3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_plus.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_reading.xml b/app/src/main/res/drawable/ic_action_reading.xml
new file mode 100644
index 0000000..bd20794
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_reading.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M14,17L4,17v2h10v-2zM20,9L4,9v2h16L20,9zM4,15h16v-2L4,13v2zM4,5v2h16L20,5L4,5z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_refresh.xml b/app/src/main/res/drawable/ic_action_refresh.xml
new file mode 100644
index 0000000..780062d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_refresh.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_star.xml b/app/src/main/res/drawable/ic_action_star.xml
new file mode 100644
index 0000000..44778c9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_star.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_tabs.xml b/app/src/main/res/drawable/ic_action_tabs.xml
new file mode 100644
index 0000000..f5fef0b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_tabs.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_text_size.xml b/app/src/main/res/drawable/ic_action_text_size.xml
new file mode 100644
index 0000000..ea983e6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_text_size.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M2.5,4v3h5v12h3L10.5,7h5L15.5,4h-13zM21.5,9h-9v3h3v7h3v-7h3L21.5,9z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_bookmark.xml b/app/src/main/res/drawable/ic_bookmark.xml
new file mode 100644
index 0000000..2b8138c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bookmark.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_folder.xml b/app/src/main/res/drawable/ic_folder.xml
new file mode 100644
index 0000000..b024e88
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
new file mode 100644
index 0000000..1ac9c48
--- /dev/null
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
new file mode 100644
index 0000000..522a9c1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_webpage.xml b/app/src/main/res/drawable/ic_webpage.xml
new file mode 100644
index 0000000..b91b2a5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_webpage.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/layout/bookmark_drawer.xml b/app/src/main/res/layout/bookmark_drawer.xml
index a16fe30..2345bcd 100644
--- a/app/src/main/res/layout/bookmark_drawer.xml
+++ b/app/src/main/res/layout/bookmark_drawer.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clickable="true"
@@ -27,14 +28,14 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:contentDescription="Favicon"
-                android:src="@drawable/ic_action_star"/>
+                app:srcCompat="@drawable/ic_action_star"/>
         </FrameLayout>
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
-            android:fontFamily="sans-serif-light"
+            android:fontFamily="sans-serif"
             android:gravity="center_vertical"
             android:maxLines="1"
             android:minHeight="?android:attr/listPreferredItemHeight"
@@ -77,7 +78,7 @@
                 android:paddingLeft="4dp"
                 android:paddingRight="4dp"
                 android:paddingTop="4dp"
-                android:src="@drawable/ic_action_desktop"/>
+                app:srcCompat="@drawable/ic_action_desktop"/>
         </FrameLayout>
 
         <FrameLayout
@@ -98,7 +99,7 @@
                 android:paddingLeft="4dp"
                 android:paddingRight="4dp"
                 android:paddingTop="4dp"
-                android:src="@drawable/ic_action_star"/>
+                app:srcCompat="@drawable/ic_action_star"/>
         </FrameLayout>
 
         <FrameLayout
@@ -119,7 +120,7 @@
                 android:paddingLeft="4dp"
                 android:paddingRight="4dp"
                 android:paddingTop="4dp"
-                android:src="@drawable/ic_action_reading"/>
+                app:srcCompat="@drawable/ic_action_reading"/>
         </FrameLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_interface.xml b/app/src/main/res/layout/search_interface.xml
index 0baba29..db26d01 100644
--- a/app/src/main/res/layout/search_interface.xml
+++ b/app/src/main/res/layout/search_interface.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/search_bar"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/search_bar_height"
-    android:background="@color/white"
-    android:visibility="gone">
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/search_bar"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/search_bar_height"
+                android:background="@color/white"
+                android:visibility="gone">
 
     <View
         android:layout_width="match_parent"
@@ -34,7 +35,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:contentDescription="@null"
-            android:src="@drawable/ic_action_collapse"
+            app:srcCompat="@drawable/ic_action_collapse"
             style="?android:attr/buttonBarButtonStyle" />
 
         <View
@@ -48,7 +49,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:contentDescription="@null"
-            android:src="@drawable/ic_action_expand"
+            app:srcCompat="@drawable/ic_action_expand"
             style="?android:attr/buttonBarButtonStyle" />
 
         <View
@@ -62,7 +63,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:contentDescription="@null"
-            android:src="@drawable/ic_action_delete"
+            app:srcCompat="@drawable/ic_action_delete"
             style="?android:attr/buttonBarButtonStyle" />
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tab_drawer.xml b/app/src/main/res/layout/tab_drawer.xml
index b8e8911..2a96d95 100644
--- a/app/src/main/res/layout/tab_drawer.xml
+++ b/app/src/main/res/layout/tab_drawer.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:clickable="true"
     android:orientation="vertical">
 
@@ -26,14 +27,14 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:contentDescription="@string/action_new_tab"
-                android:src="@drawable/ic_action_tabs"/>
+                app:srcCompat="@drawable/ic_action_tabs"/>
         </FrameLayout>
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
-            android:fontFamily="sans-serif-light"
+            android:fontFamily="sans-serif"
             android:gravity="center_vertical"
             android:maxLines="1"
             android:minHeight="?android:attr/listPreferredItemHeight"
@@ -72,7 +73,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:contentDescription="@string/action_back"
-                android:src="@drawable/ic_action_back"/>
+                app:srcCompat="@drawable/ic_action_back"/>
         </FrameLayout>
 
         <FrameLayout
@@ -89,7 +90,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:contentDescription="@string/action_homepage"
-                android:src="@drawable/ic_action_home"/>
+                app:srcCompat="@drawable/ic_action_home"/>
         </FrameLayout>
 
         <FrameLayout
@@ -106,7 +107,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:contentDescription="@string/action_forward"
-                android:src="@drawable/ic_action_forward"/>
+                app:srcCompat="@drawable/ic_action_forward"/>
         </FrameLayout>
 
         <FrameLayout
@@ -123,7 +124,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:contentDescription="@string/action_new_tab"
-                android:src="@drawable/ic_action_plus"/>
+                app:srcCompat="@drawable/ic_action_plus"/>
         </FrameLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/tab_list_item.xml b/app/src/main/res/layout/tab_list_item.xml
index fa1cf46..12081f8 100644
--- a/app/src/main/res/layout/tab_list_item.xml
+++ b/app/src/main/res/layout/tab_list_item.xml
@@ -7,7 +7,8 @@
               android:clickable="true"
               android:gravity="center_vertical"
               android:orientation="horizontal"
-              android:weightSum="1">
+              android:weightSum="1"
+              xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <ImageView
         android:id="@+id/faviconTab"
@@ -48,6 +49,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:contentDescription="Delete Tab"
-            android:src="@drawable/ic_action_delete"/>
+            app:srcCompat="@drawable/ic_action_delete"/>
     </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tab_list_item_horizontal.xml b/app/src/main/res/layout/tab_list_item_horizontal.xml
index 5534d8f..48ebb8e 100644
--- a/app/src/main/res/layout/tab_list_item_horizontal.xml
+++ b/app/src/main/res/layout/tab_list_item_horizontal.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tab_item_background"
-    android:layout_width="175dp"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:clickable="false"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp"
-    android:weightSum="1">
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:id="@+id/tab_item_background"
+              android:layout_width="175dp"
+              android:layout_height="match_parent"
+              android:gravity="center_vertical"
+              android:orientation="horizontal"
+              android:clickable="false"
+              android:paddingLeft="10dp"
+              android:paddingRight="10dp"
+              android:weightSum="1">
 
     <ImageView
         android:id="@+id/faviconTab"
@@ -46,7 +47,7 @@
             android:layout_height="24dp"
             android:layout_gravity="center"
             android:contentDescription="Delete Tab"
-            android:src="@drawable/ic_action_delete" />
+            app:srcCompat="@drawable/ic_action_delete" />
     </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tab_strip.xml b/app/src/main/res/layout/tab_strip.xml
index 973dc46..8816d7c 100644
--- a/app/src/main/res/layout/tab_strip.xml
+++ b/app/src/main/res/layout/tab_strip.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="30dp"
     android:background="@color/black"
@@ -21,6 +22,6 @@
         android:layout_width="30dp"
         android:layout_height="match_parent"
         android:background="?actionBarItemBackground"
-        android:src="@drawable/ic_action_plus"/>
+        app:srcCompat="@drawable/ic_action_plus"/>
 </LinearLayout>