diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 96539936c..b20aab7b0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.danoeh.antennapod"
-    android:versionCode="1050104"
-    android:versionName="1.5.1.4">
+    android:versionCode="1050200"
+    android:versionName="1.5.2.0">
     <!--
       Version code schema:
       "1.2.3-SNAPSHOT" -> 1020300
@@ -179,7 +179,7 @@
         <activity
             android:name=".activity.VideoplayerActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="landscape">
+            android:screenOrientation="sensorLandscape">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="de.danoeh.antennapod.activity.MainActivity"/>
diff --git a/app/src/main/assets/Roboto.ttf b/app/src/main/assets/Roboto.ttf
deleted file mode 100644
index 0ba95c98c..000000000
Binary files a/app/src/main/assets/Roboto.ttf and /dev/null differ
diff --git a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
index 829a49a15..f6a8db5fb 100644
--- a/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
+++ b/app/src/main/java/de/danoeh/antennapod/PodcastApp.java
@@ -8,11 +8,8 @@ import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.fonts.FontAwesomeModule;
 import com.joanzapata.iconify.fonts.MaterialModule;
 
+import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.feed.EventDistributor;
-import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
-import de.danoeh.antennapod.core.storage.PodDBAdapter;
-import de.danoeh.antennapod.core.util.NetworkUtils;
 import de.danoeh.antennapod.spa.SPAUtil;
 
 /** Main application class. */
@@ -56,11 +53,8 @@ public class PodcastApp extends Application {
 
 		singleton = this;
 
-		PodDBAdapter.init(this);
-		UserPreferences.init(this);
-		UpdateManager.init(this);
-		PlaybackPreferences.init(this);
-		NetworkUtils.init(this);
+		ClientConfig.initialize(this);
+
 		EventDistributor.getInstance();
 		Iconify.with(new FontAwesomeModule());
 		Iconify.with(new MaterialModule());
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
index b4e8d4d71..e90681931 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java
@@ -103,6 +103,7 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
     protected void onStop() {
         super.onStop();
         Log.d(TAG, "onStop()");
+        pagerAdapter.setController(null);
         if(subscription != null) {
             subscription.unsubscribe();
         }
@@ -112,9 +113,13 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
 
     @Override
     public void onDestroy() {
+        Log.d(TAG, "onDestroy()");
         super.onDestroy();
         // don't risk creating memory leaks
+        drawerLayout = null;
         navAdapter = null;
+        navList = null;
+        navDrawer = null;
         drawerToggle = null;
         pager = null;
         pagerAdapter = null;
@@ -171,6 +176,7 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
         if(pagerAdapter != null && controller != null && controller.getMedia() != media) {
             media = controller.getMedia();
             pagerAdapter.onMediaChanged(media);
+            pagerAdapter.setController(controller);
         }
 
         EventDistributor.getInstance().register(contentUpdate);
@@ -258,7 +264,8 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
         });
 
         pager = (ViewPager) findViewById(R.id.pager);
-        pagerAdapter = new AudioplayerPagerAdapter(getSupportFragmentManager());
+        pagerAdapter = new AudioplayerPagerAdapter(getSupportFragmentManager(), media);
+        pagerAdapter.setController(controller);
         pager.setAdapter(pagerAdapter);
         CirclePageIndicator pageIndicator = (CirclePageIndicator) findViewById(R.id.page_indicator);
         pageIndicator.setViewPager(pager);
@@ -537,10 +544,16 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
         void onMediaChanged(Playable media);
     }
 
-    private class AudioplayerPagerAdapter extends FragmentStatePagerAdapter {
+    private static class AudioplayerPagerAdapter extends FragmentStatePagerAdapter {
 
-        public AudioplayerPagerAdapter(FragmentManager fm) {
+        private static final String TAG = "AudioplayerPagerAdapter";
+        
+        private Playable media;
+        private PlaybackController controller;
+
+        public AudioplayerPagerAdapter(FragmentManager fm, Playable media) {
             super(fm);
+            this.media = media;
         }
 
         private CoverFragment coverFragment;
@@ -548,6 +561,7 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
         private ChaptersFragment chaptersFragment;
 
         public void onMediaChanged(Playable media) {
+            this.media = media;
             if(coverFragment != null) {
                 coverFragment.onMediaChanged(media);
             }
@@ -559,6 +573,13 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
             }
         }
 
+        public void setController(PlaybackController controller) {
+            this.controller = controller;
+            if(chaptersFragment != null) {
+                chaptersFragment.setController(controller);
+            }
+        }
+
         @Nullable
         public ChaptersFragment getChaptersFragment() {
             return chaptersFragment;
@@ -580,7 +601,8 @@ public class AudioplayerActivity extends MediaplayerActivity implements NavDrawe
                     return itemDescriptionFragment;
                 case POS_CHAPTERS:
                     if(chaptersFragment == null) {
-                        chaptersFragment = ChaptersFragment.newInstance(media, controller);
+                        chaptersFragment = ChaptersFragment.newInstance(media);
+                        chaptersFragment.setController(controller);
                     }
                     return chaptersFragment;
                 default:
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index bd7da7c03..3ab6a0ab8 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -86,6 +86,7 @@ public class MainActivity extends AppCompatActivity implements NavDrawerActivity
     public static final String EXTRA_NAV_INDEX = "nav_index";
     public static final String EXTRA_FRAGMENT_TAG = "fragment_tag";
     public static final String EXTRA_FRAGMENT_ARGS = "fragment_args";
+    public static final String EXTRA_FEED_ID = "fragment_feed_id";
 
     public static final String SAVE_BACKSTACK_COUNT = "backstackCount";
     public static final String SAVE_TITLE = "title";
@@ -184,7 +185,7 @@ public class MainActivity extends AppCompatActivity implements NavDrawerActivity
                 loadFragment(lastFragment, null);
             } else {
                 try {
-                    loadFeedFragmentById(Integer.valueOf(lastFragment), null);
+                    loadFeedFragmentById(Integer.parseInt(lastFragment), null);
                 } catch (NumberFormatException e) {
                     // it's not a number, this happens if we removed
                     // a label from the NAV_DRAWER_TAGS
@@ -464,8 +465,9 @@ public class MainActivity extends AppCompatActivity implements NavDrawerActivity
         StorageUtils.checkStorageAvailability(this);
 
         Intent intent = getIntent();
-        if (navDrawerData != null && intent.hasExtra(EXTRA_NAV_TYPE) &&
-                (intent.hasExtra(EXTRA_NAV_INDEX) || intent.hasExtra(EXTRA_FRAGMENT_TAG))) {
+        if (intent.hasExtra(EXTRA_FEED_ID) ||
+                (navDrawerData != null && intent.hasExtra(EXTRA_NAV_TYPE) &&
+                        (intent.hasExtra(EXTRA_NAV_INDEX) || intent.hasExtra(EXTRA_FRAGMENT_TAG)))) {
             handleNavIntent();
         }
         loadData();
@@ -709,15 +711,19 @@ public class MainActivity extends AppCompatActivity implements NavDrawerActivity
     private void handleNavIntent() {
         Log.d(TAG, "handleNavIntent()");
         Intent intent = getIntent();
-        if (intent.hasExtra(EXTRA_NAV_TYPE) &&
-                intent.hasExtra(EXTRA_NAV_INDEX) || intent.hasExtra(EXTRA_FRAGMENT_TAG)) {
+        if (intent.hasExtra(EXTRA_FEED_ID) ||
+                (intent.hasExtra(EXTRA_NAV_TYPE) &&
+                        (intent.hasExtra(EXTRA_NAV_INDEX) || intent.hasExtra(EXTRA_FRAGMENT_TAG)))) {
             int index = intent.getIntExtra(EXTRA_NAV_INDEX, -1);
             String tag = intent.getStringExtra(EXTRA_FRAGMENT_TAG);
             Bundle args = intent.getBundleExtra(EXTRA_FRAGMENT_ARGS);
+            long feedId = intent.getLongExtra(EXTRA_FEED_ID, 0);
             if (index >= 0) {
                 loadFragment(index, args);
             } else if (tag != null) {
                 loadFragment(tag, args);
+            } else if(feedId > 0) {
+                loadFeedFragmentById(feedId, args);
             }
         }
         setIntent(new Intent(MainActivity.this, MainActivity.class)); // to avoid handling the intent twice when the configuration changes
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 81ba8169f..f02f87d06 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -249,9 +249,6 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
             controller.release();
         }
         controller = newPlaybackController();
-        if(butPlay != null) {
-            butPlay.setOnClickListener(controller.newOnPlayButtonClickListener());
-        }
     }
 
     @Override
@@ -260,6 +257,7 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
         Log.d(TAG, "onStop()");
         if (controller != null) {
             controller.release();
+            controller = null; // prevent leak
         }
     }
 
@@ -486,9 +484,9 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
                         barPlaybackSpeed.setProgress((int) (20 * currentSpeed) - 10);
 
                         final SeekBar barLeftVolume = (SeekBar) dialog.findViewById(R.id.volume_left);
-                        barLeftVolume.setProgress(100);
+                        barLeftVolume.setProgress(UserPreferences.getLeftVolumePercentage());
                         final SeekBar barRightVolume = (SeekBar) dialog.findViewById(R.id.volume_right);
-                        barRightVolume.setProgress(100);
+                        barRightVolume.setProgress(UserPreferences.getRightVolumePercentage());
                         final CheckBox stereoToMono = (CheckBox) dialog.findViewById(R.id.stereo_to_mono);
                         stereoToMono.setChecked(UserPreferences.stereoToMono());
                         if (controller != null && !controller.canDownmix()) {
@@ -500,14 +498,9 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
                         barLeftVolume.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
                             @Override
                             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                                float leftVolume = 1.0f, rightVolume = 1.0f;
-                                if (progress < 100) {
-                                    leftVolume = progress / 100.0f;
-                                }
-                                if (barRightVolume.getProgress() < 100) {
-                                    rightVolume = barRightVolume.getProgress() / 100.0f;
-                                }
-                                controller.setVolume(leftVolume, rightVolume);
+                                controller.setVolume(
+                                        Converter.getVolumeFromPercentage(progress),
+                                        Converter.getVolumeFromPercentage(barRightVolume.getProgress()));
                             }
 
                             @Override
@@ -521,14 +514,9 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
                         barRightVolume.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
                             @Override
                             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                                float leftVolume = 1.0f, rightVolume = 1.0f;
-                                if (progress < 100) {
-                                    rightVolume = progress / 100.0f;
-                                }
-                                if (barLeftVolume.getProgress() < 100) {
-                                    leftVolume = barLeftVolume.getProgress() / 100.0f;
-                                }
-                                controller.setVolume(leftVolume, rightVolume);
+                                controller.setVolume(
+                                        Converter.getVolumeFromPercentage(barLeftVolume.getProgress()),
+                                        Converter.getVolumeFromPercentage(progress));
                             }
 
                             @Override
@@ -761,8 +749,7 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
 
         if (butRev != null) {
             butRev.setOnClickListener(v -> {
-                int curr = controller.getPosition();
-                controller.seekTo(curr - UserPreferences.getRewindSecs() * 1000);
+                onRewind();
             });
             butRev.setOnLongClickListener(new View.OnLongClickListener() {
 
@@ -800,12 +787,13 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
             });
         }
 
-        butPlay.setOnClickListener(controller.newOnPlayButtonClickListener());
+        butPlay.setOnClickListener(v -> {
+            onPlayPause();
+        });
 
         if (butFF != null) {
             butFF.setOnClickListener(v -> {
-                int curr = controller.getPosition();
-                controller.seekTo(curr + UserPreferences.getFastFowardSecs() * 1000);
+                onFastForward();
             });
             butFF.setOnLongClickListener(new View.OnLongClickListener() {
 
@@ -850,6 +838,29 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
         }
     }
 
+    protected void onRewind() {
+        if (controller == null) {
+            return;
+        }
+        int curr = controller.getPosition();
+        controller.seekTo(curr - UserPreferences.getRewindSecs() * 1000);
+    }
+
+    protected void onPlayPause() {
+        if(controller == null) {
+            return;
+        }
+        controller.playPause();
+    }
+
+    protected void onFastForward() {
+        if (controller == null) {
+            return;
+        }
+        int curr = controller.getPosition();
+        controller.seekTo(curr + UserPreferences.getFastFowardSecs() * 1000);
+    }
+
     protected abstract int getContentViewResourceId();
 
     void handleError(int errorCode) {
@@ -882,7 +893,13 @@ public abstract class MediaplayerActivity extends AppCompatActivity implements O
 
     private void updateButPlaybackSpeed() {
         if (controller != null && butPlaybackSpeed != null) {
-            float speed = Float.valueOf(UserPreferences.getPlaybackSpeed());
+            float speed = 1.0f;
+            try {
+                speed = Float.parseFloat(UserPreferences.getPlaybackSpeed());
+            } catch(NumberFormatException e) {
+                Log.e(TAG, Log.getStackTraceString(e));
+                UserPreferences.setPlaybackSpeed(String.valueOf(speed));
+            }
             String speedStr = String.format("%.2fx", speed);
             butPlaybackSpeed.setText(speedStr);
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
index c7426c006..9d8048acf 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OnlineFeedViewActivity.java
@@ -408,18 +408,25 @@ public class OnlineFeedViewActivity extends ActionBarActivity {
         description.setText(feed.getDescription());
 
         subscribeButton.setOnClickListener(v -> {
-            try {
+            if(feed != null && feedInFeedlist(feed)) {
+                Intent intent = new Intent(OnlineFeedViewActivity.this, MainActivity.class);
+                // feed.getId() is always 0, we have to retrieve the id from the feed list from
+                // the database
+                intent.putExtra(MainActivity.EXTRA_FEED_ID, getFeedId(feed));
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                startActivity(intent);
+            } else {
                 Feed f = new Feed(selectedDownloadUrl, null, feed.getTitle());
                 f.setPreferences(feed.getPreferences());
                 this.feed = f;
-
-                DownloadRequester.getInstance().downloadFeed(this, f);
-            } catch (DownloadRequestException e) {
-                e.printStackTrace();
-                DownloadRequestErrorDialogCreator.newRequestErrorDialog(OnlineFeedViewActivity.this,
-                        e.getMessage());
+                try {
+                    DownloadRequester.getInstance().downloadFeed(this, f);
+                } catch (DownloadRequestException e) {
+                    Log.e(TAG, Log.getStackTraceString(e));
+                    DownloadRequestErrorDialogCreator.newRequestErrorDialog(this, e.getMessage());
+                }
+                setSubscribeButtonState(feed);
             }
-            setSubscribeButtonState(feed);
         });
 
         if (alternateFeedUrls.isEmpty()) {
@@ -462,8 +469,8 @@ public class OnlineFeedViewActivity extends ActionBarActivity {
                 subscribeButton.setEnabled(false);
                 subscribeButton.setText(R.string.downloading_label);
             } else if (feedInFeedlist(feed)) {
-                subscribeButton.setEnabled(false);
-                subscribeButton.setText(R.string.subscribed_label);
+                subscribeButton.setEnabled(true);
+                subscribeButton.setText(R.string.open_podcast);
             } else {
                 subscribeButton.setEnabled(true);
                 subscribeButton.setText(R.string.subscribe_label);
@@ -483,6 +490,18 @@ public class OnlineFeedViewActivity extends ActionBarActivity {
         return false;
     }
 
+    private long getFeedId(Feed feed) {
+        if (feeds == null || feed == null) {
+            return 0;
+        }
+        for (Feed f : feeds) {
+            if (f.getIdentifyingValue().equals(feed.getIdentifyingValue())) {
+                return f.getId();
+            }
+        }
+        return 0;
+    }
+
     private void showErrorDialog(String errorMsg) {
         assert(Looper.myLooper() == Looper.getMainLooper()); // run on UI thread
         if (!isFinishing() && !isPaused) {
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
index 8a9ec58d3..bc3e686e5 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlFeedChooserActivity.java
@@ -2,23 +2,22 @@ package de.danoeh.antennapod.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBarActivity;
 import android.util.SparseBooleanArray;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ListView;
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.core.opml.OpmlElement;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.opml.OpmlElement;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+
 /**
  * Displays the feeds that the OPML-Importer has read and lets the user choose
  * which feeds he wants to import.
@@ -33,6 +32,9 @@ public class OpmlFeedChooserActivity extends ActionBarActivity {
     private ListView feedlist;
     private ArrayAdapter<String> listAdapter;
 
+    private MenuItem selectAll;
+    private MenuItem deselectAll;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         setTheme(UserPreferences.getTheme());
@@ -44,45 +46,54 @@ public class OpmlFeedChooserActivity extends ActionBarActivity {
         feedlist = (ListView) findViewById(R.id.feedlist);
 
         feedlist.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-        listAdapter = new ArrayAdapter<String>(this,
+        listAdapter = new ArrayAdapter<>(this,
                 android.R.layout.simple_list_item_multiple_choice,
                 getTitleList());
 
         feedlist.setAdapter(listAdapter);
-
-        butCancel.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                setResult(RESULT_CANCELED);
-                finish();
+        feedlist.setOnItemClickListener((parent, view, position, id) -> {
+            SparseBooleanArray checked = feedlist.getCheckedItemPositions();
+            int checkedCount = 0;
+            for (int i = 0; i < checked.size(); i++) {
+                if (checked.valueAt(i)) {
+                    checkedCount++;
+                }
+            }
+            if(checkedCount == listAdapter.getCount()) {
+                selectAll.setVisible(false);
+                deselectAll.setVisible(true);
+            } else {
+                deselectAll.setVisible(false);
+                selectAll.setVisible(true);
             }
         });
 
-        butConfirm.setOnClickListener(new OnClickListener() {
+        butCancel.setOnClickListener(v -> {
+            setResult(RESULT_CANCELED);
+            finish();
+        });
 
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent();
-                SparseBooleanArray checked = feedlist.getCheckedItemPositions();
+        butConfirm.setOnClickListener(v -> {
+            Intent intent = new Intent();
+            SparseBooleanArray checked = feedlist.getCheckedItemPositions();
 
-                int checkedCount = 0;
-                // Get number of checked items
-                for (int i = 0; i < checked.size(); i++) {
-                    if (checked.valueAt(i)) {
-                        checkedCount++;
-                    }
+            int checkedCount = 0;
+            // Get number of checked items
+            for (int i = 0; i < checked.size(); i++) {
+                if (checked.valueAt(i)) {
+                    checkedCount++;
                 }
-                int[] selection = new int[checkedCount];
-                for (int i = 0, collected = 0; collected < checkedCount; i++) {
-                    if (checked.valueAt(i)) {
-                        selection[collected] = checked.keyAt(i);
-                        collected++;
-                    }
-                }
-                intent.putExtra(EXTRA_SELECTED_ITEMS, selection);
-                setResult(RESULT_OK, intent);
-                finish();
             }
+            int[] selection = new int[checkedCount];
+            for (int i = 0, collected = 0; collected < checkedCount; i++) {
+                if (checked.valueAt(i)) {
+                    selection[collected] = checked.keyAt(i);
+                    collected++;
+                }
+            }
+            intent.putExtra(EXTRA_SELECTED_ITEMS, selection);
+            setResult(RESULT_OK, intent);
+            finish();
         });
 
     }
@@ -93,7 +104,6 @@ public class OpmlFeedChooserActivity extends ActionBarActivity {
             for (OpmlElement element : OpmlImportHolder.getReadElements()) {
                 result.add(element.getText());
             }
-
         }
         return result;
     }
@@ -101,13 +111,11 @@ public class OpmlFeedChooserActivity extends ActionBarActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.select_all_item, Menu.NONE,
-                R.string.select_all_label),
-                MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
-
-        MenuItemCompat.setShowAsAction(menu.add(Menu.NONE, R.id.deselect_all_item, Menu.NONE,
-                R.string.deselect_all_label),
-                MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.opml_selection_options, menu);
+        selectAll = menu.findItem(R.id.select_all_item);
+        deselectAll = menu.findItem(R.id.deselect_all_item);
+        deselectAll.setVisible(false);
         return true;
     }
 
@@ -115,10 +123,14 @@ public class OpmlFeedChooserActivity extends ActionBarActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.select_all_item:
+                selectAll.setVisible(false);
                 selectAllItems(true);
+                deselectAll.setVisible(true);
                 return true;
             case R.id.deselect_all_item:
+                deselectAll.setVisible(false);
                 selectAllItems(false);
+                selectAll.setVisible(true);
                 return true;
             default:
                 return false;
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
index 46dabec12..fb145db1f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportBaseActivity.java
@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Environment;
+import android.support.annotation.Nullable;
 import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
@@ -31,7 +32,7 @@ public class OpmlImportBaseActivity extends ActionBarActivity {
     private OpmlImportWorker importWorker;
 
 	private static final int PERMISSION_REQUEST_READ_EXTERNAL_STORAGE = 5;
-	private Uri uri;
+	@Nullable private Uri uri;
 
 	/**
 	 * Handles the choices made by the user in the OpmlFeedChooserActivity and
@@ -67,7 +68,14 @@ public class OpmlImportBaseActivity extends ActionBarActivity {
 		}
 	}
 
-	protected void importUri(Uri uri) {
+	protected void importUri(@Nullable Uri uri) {
+        if(uri == null) {
+            new MaterialDialog.Builder(this)
+                    .content(R.string.opml_import_error_no_file)
+                    .positiveText(android.R.string.ok)
+                    .show();
+            return;
+        }
 		this.uri = uri;
         if(uri.toString().contains(Environment.getExternalStorageDirectory().toString())) {
             int permission = ActivityCompat.checkSelfPermission(this, android.Manifest.permission.READ_EXTERNAL_STORAGE);
@@ -127,8 +135,9 @@ public class OpmlImportBaseActivity extends ActionBarActivity {
             importWorker.executeAsync();
         } catch (Exception e) {
             Log.d(TAG, Log.getStackTraceString(e));
+			String message = getString(R.string.opml_reader_error);
             new MaterialDialog.Builder(this)
-                    .content("Cannot open OPML file: " + e.getMessage())
+                    .content(message + " " + e.getMessage())
                     .positiveText(android.R.string.ok)
                     .show();
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index ee459dbc6..42c9edd99 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -202,6 +202,24 @@ public class VideoplayerActivity extends MediaplayerActivity {
         videoControlsShowing = !videoControlsShowing;
     }
 
+    @Override
+    protected void onRewind() {
+        super.onRewind();
+        setupVideoControlsToggler();
+    }
+
+    @Override
+    protected void onPlayPause() {
+        super.onPlayPause();
+        setupVideoControlsToggler();
+    }
+
+    @Override
+    protected void onFastForward() {
+        super.onFastForward();
+        setupVideoControlsToggler();
+    }
+
 
     private final SurfaceHolder.Callback surfaceHolderCallback = new SurfaceHolder.Callback() {
         @Override
@@ -312,7 +330,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     private static class VideoControlsHider extends Handler {
 
-        private static final int DELAY = 5000;
+        private static final int DELAY = 2500;
 
         private WeakReference<VideoplayerActivity> activity;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
index 9ff80424c..34999757f 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java
@@ -13,6 +13,7 @@ import android.widget.Toast;
 
 import com.joanzapata.iconify.Iconify;
 import com.joanzapata.iconify.widget.IconButton;
+import com.joanzapata.iconify.widget.IconTextView;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
@@ -48,7 +49,7 @@ public class DownloadLogAdapter extends BaseAdapter {
 			LayoutInflater inflater = (LayoutInflater) context
 					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 			convertView = inflater.inflate(R.layout.downloadlog_item, parent, false);
-			holder.icon = (TextView) convertView.findViewById(R.id.txtvIcon);
+			holder.icon = (IconTextView) convertView.findViewById(R.id.txtvIcon);
 			holder.retry = (IconButton) convertView.findViewById(R.id.btnRetry);
 			holder.date = (TextView) convertView.findViewById(R.id.txtvDate);
 			holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
@@ -78,14 +79,12 @@ public class DownloadLogAdapter extends BaseAdapter {
 			holder.icon.setTextColor(ContextCompat.getColor(convertView.getContext(),
 					R.color.download_success_green));
 			holder.icon.setText("{fa-check-circle}");
-			Iconify.addIcons(holder.icon);
 			holder.retry.setVisibility(View.GONE);
 			holder.reason.setVisibility(View.GONE);
 		} else {
 			holder.icon.setTextColor(ContextCompat.getColor(convertView.getContext(),
 					R.color.download_failed_red));
 			holder.icon.setText("{fa-times-circle}");
-			Iconify.addIcons(holder.icon);
 			String reasonText = status.getReason().getErrorString(context);
 			if (status.getReasonDetailed() != null) {
 				reasonText += ": " + status.getReasonDetailed();
@@ -160,7 +159,7 @@ public class DownloadLogAdapter extends BaseAdapter {
 	}
 
 	static class Holder {
-		TextView icon;
+		IconTextView icon;
 		IconButton retry;
 		TextView title;
 		TextView type;
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
index 47ac4c757..e9756b467 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/itunes/ItunesAdapter.java
@@ -167,7 +167,7 @@ public class ItunesAdapter extends ArrayAdapter<ItunesAdapter.Podcast> {
             for(int i=0; imageUrl == null && i < images.length(); i++) {
                 JSONObject image = images.getJSONObject(i);
                 String height = image.getJSONObject("attributes").getString("height");
-                if(Integer.valueOf(height) >= 100) {
+                if(Integer.parseInt(height) >= 100) {
                     imageUrl = image.getString("label");
                 }
             }
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
new file mode 100644
index 000000000..d745bb51c
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/ProxyDialog.java
@@ -0,0 +1,323 @@
+package de.danoeh.antennapod.dialog;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.support.v4.content.ContextCompat;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.Patterns;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.afollestad.materialdialogs.DialogAction;
+import com.afollestad.materialdialogs.MaterialDialog;
+import com.afollestad.materialdialogs.internal.MDButton;
+import com.squareup.okhttp.Credentials;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.Response;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.SocketAddress;
+import java.util.concurrent.TimeUnit;
+
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
+import de.danoeh.antennapod.core.service.download.ProxyConfig;
+import rx.Observable;
+import rx.Subscriber;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+public class ProxyDialog {
+
+    private static final String TAG = "ProxyDialog";
+
+    private Context context;
+
+    private MaterialDialog dialog;
+
+    private Spinner spType;
+    private EditText etHost;
+    private EditText etPort;
+    private EditText etUsername;
+    private EditText etPassword;
+
+    private boolean testSuccessful = false;
+    private TextView txtvMessage;
+    private Subscription subscription;
+
+    public ProxyDialog(Context context) {
+        this.context = context;
+    }
+
+    public Dialog createDialog() {
+        dialog = new MaterialDialog.Builder(context)
+                .title(R.string.pref_proxy_title)
+                .customView(R.layout.proxy_settings, true)
+                .positiveText(R.string.proxy_test_label)
+                .negativeText(R.string.cancel_label)
+                .onPositive((dialog1, which) -> {
+                    if(!testSuccessful) {
+                        dialog.getActionButton(DialogAction.POSITIVE).setEnabled(false);
+                        test();
+                        return;
+                    }
+                    String type = (String) ((Spinner) dialog1.findViewById(R.id.spType)).getSelectedItem();
+                    ProxyConfig proxy;
+                    if(Proxy.Type.valueOf(type) == Proxy.Type.DIRECT) {
+                        proxy = ProxyConfig.direct();
+                    } else {
+                        String host = etHost.getText().toString();
+                        String port = etPort.getText().toString();
+                        String username = etUsername.getText().toString();
+                        if(TextUtils.isEmpty(username)) {
+                            username = null;
+                        }
+                        String password = etPassword.getText().toString();
+                        if(TextUtils.isEmpty(password)) {
+                            password = null;
+                        }
+                        int portValue = 0;
+                        if(!TextUtils.isEmpty(port)) {
+                            portValue = Integer.valueOf(port);
+                        }
+                        proxy = ProxyConfig.http(host, portValue, username, password);
+                    }
+                    UserPreferences.setProxyConfig(proxy);
+                    AntennapodHttpClient.reinit();
+                    dialog.dismiss();
+                })
+                .onNegative((dialog1, which) -> {
+                    dialog1.dismiss();
+                })
+                .autoDismiss(false)
+                .build();
+        View view = dialog.getCustomView();
+        spType = (Spinner) view.findViewById(R.id.spType);
+        String[] types = { Proxy.Type.DIRECT.name(), Proxy.Type.HTTP.name() };
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(context,
+            android.R.layout.simple_spinner_item, types);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        spType.setAdapter(adapter);
+        ProxyConfig proxyConfig = UserPreferences.getProxyConfig();
+        spType.setSelection(adapter.getPosition(proxyConfig.type.name()));
+        etHost = (EditText) view.findViewById(R.id.etHost);
+        if(!TextUtils.isEmpty(proxyConfig.host)) {
+            etHost.setText(proxyConfig.host);
+        }
+        etHost.addTextChangedListener(requireTestOnChange);
+        etPort = (EditText) view.findViewById(R.id.etPort);
+        if(proxyConfig.port > 0) {
+            etPort.setText(String.valueOf(proxyConfig.port));
+        }
+        etPort.addTextChangedListener(requireTestOnChange);
+        etUsername = (EditText) view.findViewById(R.id.etUsername);
+        if(!TextUtils.isEmpty(proxyConfig.username)) {
+            etUsername.setText(proxyConfig.username);
+        }
+        etUsername.addTextChangedListener(requireTestOnChange);
+        etPassword = (EditText) view.findViewById(R.id.etPassword);
+        if(!TextUtils.isEmpty(proxyConfig.password)) {
+            etPassword.setText(proxyConfig.username);
+        }
+        etPassword.addTextChangedListener(requireTestOnChange);
+        if(proxyConfig.type == Proxy.Type.DIRECT) {
+            enableSettings(false);
+            setTestRequired(false);
+        }
+        spType.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                enableSettings(position > 0);
+                setTestRequired(position > 0);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                enableSettings(false);
+            }
+        });
+        txtvMessage = (TextView) view.findViewById(R.id.txtvMessage);
+        checkValidity();
+        return dialog;
+    }
+
+    private final TextWatcher requireTestOnChange = new TextWatcher() {
+        @Override
+        public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count) {}
+
+        @Override
+        public void afterTextChanged(Editable s) {
+            setTestRequired(true);
+        }
+    };
+
+    private void enableSettings(boolean enable) {
+        etHost.setEnabled(enable);
+        etPort.setEnabled(enable);
+        etUsername.setEnabled(enable);
+        etPassword.setEnabled(enable);
+    }
+
+    private boolean checkValidity() {
+        boolean valid = true;
+        if(spType.getSelectedItemPosition() > 0) {
+            valid &= checkHost();
+        }
+        valid &= checkPort();
+        return valid;
+    }
+
+    private boolean checkHost() {
+        String host = etHost.getText().toString();
+        if(host.length() == 0) {
+            etHost.setError(context.getString(R.string.proxy_host_empty_error));
+            return false;
+        }
+        if(!"localhost".equals(host) && !Patterns.DOMAIN_NAME.matcher(host).matches()) {
+            etHost.setError(context.getString(R.string.proxy_host_invalid_error));
+            return false;
+        }
+        return true;
+    }
+
+    private boolean checkPort() {
+        int port = getPort();
+        if(port < 0 && port > 65535) {
+            etPort.setError(context.getString(R.string.proxy_port_invalid_error));
+            return false;
+        }
+        return true;
+    }
+
+    private int getPort() {
+        String port = etPort.getText().toString();
+        if(port.length() > 0) {
+            try {
+                int portValue = Integer.parseInt(port);
+                return portValue;
+            } catch(NumberFormatException e) {
+                // ignore
+            }
+        }
+        return 0;
+    }
+
+    private void setTestRequired(boolean required) {
+        if(required) {
+            testSuccessful = false;
+            MDButton button = dialog.getActionButton(DialogAction.POSITIVE);
+            button.setText(context.getText(R.string.proxy_test_label));
+            button.setEnabled(true);
+        } else {
+            testSuccessful = true;
+            MDButton button = dialog.getActionButton(DialogAction.POSITIVE);
+            button.setText(context.getText(android.R.string.ok));
+            button.setEnabled(true);
+        }
+    }
+
+    private void test() {
+        if(subscription != null) {
+            subscription.unsubscribe();
+        }
+        if(!checkValidity()) {
+            setTestRequired(true);
+            return;
+        }
+        TypedArray res = context.getTheme().obtainStyledAttributes(new int[] { android.R.attr.textColorPrimary });
+        int textColorPrimary = res.getColor(0, 0);
+        res.recycle();
+        String checking = context.getString(R.string.proxy_checking);
+        txtvMessage.setTextColor(textColorPrimary);
+        txtvMessage.setText("{fa-circle-o-notch spin} " + checking);
+        txtvMessage.setVisibility(View.VISIBLE);
+        subscription = Observable.create(new Observable.OnSubscribe<Response>() {
+                    @Override
+                    public void call(Subscriber<? super Response> subscriber) {
+                        String type = (String) spType.getSelectedItem();
+                        String host = etHost.getText().toString();
+                        String port = etPort.getText().toString();
+                        String username = etUsername.getText().toString();
+                        String password = etPassword.getText().toString();
+                        int portValue = 8080;
+                        if(!TextUtils.isEmpty(port)) {
+                            portValue = Integer.valueOf(port);
+                        }
+                        SocketAddress address = InetSocketAddress.createUnresolved(host, portValue);
+                        Proxy.Type proxyType = Proxy.Type.valueOf(type.toUpperCase());
+                        Proxy proxy = new Proxy(proxyType, address);
+                        OkHttpClient client = AntennapodHttpClient.newHttpClient();
+                        client.setConnectTimeout(10, TimeUnit.SECONDS);
+                        client.setProxy(proxy);
+                        client.interceptors().clear();
+                        if(!TextUtils.isEmpty(username)) {
+                            String credentials = Credentials.basic(username, password);
+                            client.interceptors().add(chain -> {
+                                Request request = chain.request().newBuilder()
+                                        .header("Proxy-Authorization", credentials).build();
+                                return chain.proceed(request);
+                            });
+                        }
+                        Request request = new Request.Builder()
+                                .url("http://www.google.com")
+                                .head()
+                                .build();
+                        try {
+                            Response response = client.newCall(request).execute();
+                            subscriber.onNext(response);
+                        } catch(IOException e) {
+                            subscriber.onError(e);
+                        }
+                        subscriber.onCompleted();
+                    }
+                })
+                .subscribeOn(Schedulers.newThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                        response -> {
+                            int colorId;
+                            String icon;
+                            String result;
+                            if(response.isSuccessful()) {
+                                colorId = R.color.download_success_green;
+                                icon = "{fa-check}";
+                                result = context.getString(R.string.proxy_test_successful);
+                            } else {
+                                colorId = R.color.download_failed_red;
+                                icon = "{fa-close}";
+                                result = context.getString(R.string.proxy_test_failed);
+                            }
+                            int color = ContextCompat.getColor(context, colorId);
+                            txtvMessage.setTextColor(color);
+                            String message = String.format("%s %s: %s", icon, result, response.message());
+                            txtvMessage.setText(message);
+                            setTestRequired(!response.isSuccessful());
+                        },
+                        error -> {
+                            String icon = "{fa-close}";
+                            String result = context.getString(R.string.proxy_test_failed);
+                            int color = ContextCompat.getColor(context, R.color.download_failed_red);
+                            txtvMessage.setTextColor(color);
+                            String message = String.format("%s %s: %s", icon, result, error.getMessage());
+                            txtvMessage.setText(message);
+                            setTestRequired(true);
+                        }
+                );
+    }
+
+}
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
index 930079e40..89e24f882 100644
--- a/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/dialog/SleepTimerDialog.java
@@ -138,7 +138,7 @@ public abstract class SleepTimerDialog {
 
     private long readTimeMillis() {
         TimeUnit selectedUnit = units[spTimeUnit.getSelectedItemPosition()];
-        long value = Long.valueOf(etxtTime.getText().toString());
+        long value = Long.parseLong(etxtTime.getText().toString());
         return selectedUnit.toMillis(value);
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
index 96abdd835..aea911f79 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
@@ -2,6 +2,7 @@ package de.danoeh.antennapod.fragment;
 
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
+import android.util.Log;
 import android.view.View;
 import android.widget.ListView;
 
@@ -15,15 +16,16 @@ import de.danoeh.antennapod.core.util.playback.PlaybackController;
 
 public class ChaptersFragment extends ListFragment implements AudioplayerContentFragment {
 
+    private static final String TAG = "ChaptersFragment";
+
     private Playable media;
     private PlaybackController controller;
 
     private ChaptersListAdapter adapter;
 
-    public static ChaptersFragment newInstance(Playable media, PlaybackController controller) {
+    public static ChaptersFragment newInstance(Playable media) {
         ChaptersFragment f = new ChaptersFragment();
         f.media = media;
-        f.controller = controller;
         return f;
     }
 
@@ -37,6 +39,10 @@ public class ChaptersFragment extends ListFragment implements AudioplayerContent
         lv.setPadding(0, vertPadding, 0, vertPadding);
 
         adapter = new ChaptersListAdapter(getActivity(), 0, pos -> {
+            if(controller == null) {
+                Log.d(TAG, "controller is null");
+                return;
+            }
             Chapter chapter = (Chapter) getListAdapter().getItem(pos);
             controller.seekToChapter(chapter);
         });
@@ -58,6 +64,7 @@ public class ChaptersFragment extends ListFragment implements AudioplayerContent
     public void onDestroy() {
         super.onDestroy();
         adapter = null;
+        controller = null;
     }
 
     @Override
@@ -74,4 +81,9 @@ public class ChaptersFragment extends ListFragment implements AudioplayerContent
             setEmptyText(null);
         }
     }
+
+    public void setController(PlaybackController controller) {
+        this.controller = controller;
+    }
+
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 80a9bf0b3..3fd69214d 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -72,7 +72,11 @@ public class ExternalPlayerFragment extends Fragment {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         controller = setupPlaybackController();
-        butPlay.setOnClickListener(controller.newOnPlayButtonClickListener());
+        butPlay.setOnClickListener(v -> {
+            if(controller != null) {
+                controller.playPause();
+            }
+        });
     }
 
     private PlaybackController setupPlaybackController() {
@@ -88,7 +92,6 @@ public class ExternalPlayerFragment extends Fragment {
                 return butPlay;
             }
 
-
             @Override
             public boolean loadMediaInfo() {
                 ExternalPlayerFragment fragment = ExternalPlayerFragment.this;
@@ -145,8 +148,11 @@ public class ExternalPlayerFragment extends Fragment {
         }
         controller = setupPlaybackController();
         if (butPlay != null) {
-            butPlay.setOnClickListener(controller
-                    .newOnPlayButtonClickListener());
+            butPlay.setOnClickListener(v -> {
+                if(controller != null) {
+                    controller.playPause();
+                }
+            });
         }
         controller.init();
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index c1c1aab6c..4a93bac7e 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -111,7 +111,7 @@ public class ItemDescriptionFragment extends Fragment implements AudioplayerCont
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         Log.d(TAG, "Creating view");
-        webvDescription = new WebView(getActivity());
+        webvDescription = new WebView(getActivity().getApplicationContext());
         if (Build.VERSION.SDK_INT >= 11) {
             webvDescription.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index 1382929af..0f5aa06ca 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -102,6 +102,7 @@ public class ItemFragment extends Fragment {
 
     private ViewGroup root;
     private WebView webvDescription;
+    private TextView txtvPodcast;
     private TextView txtvTitle;
     private TextView txtvDuration;
     private TextView txtvPublished;
@@ -135,6 +136,7 @@ public class ItemFragment extends Fragment {
         View layout = inflater.inflate(R.layout.feeditem_fragment, container, false);
 
         root = (ViewGroup) layout.findViewById(R.id.content_root);
+        txtvPodcast = (TextView) layout.findViewById(R.id.txtvPodcast);
         txtvTitle = (TextView) layout.findViewById(R.id.txtvTitle);
         txtvDuration = (TextView) layout.findViewById(R.id.txtvDuration);
         txtvPublished = (TextView) layout.findViewById(R.id.txtvPublished);
@@ -219,6 +221,7 @@ public class ItemFragment extends Fragment {
         EventDistributor.getInstance().register(contentUpdate);
         EventBus.getDefault().registerSticky(this);
         if(itemsLoaded) {
+            progbarLoading.setVisibility(View.GONE);
             updateAppearance();
         }
     }
@@ -295,6 +298,7 @@ public class ItemFragment extends Fragment {
             return;
         }
         getActivity().supportInvalidateOptionsMenu();
+        txtvPodcast.setText(item.getFeed().getTitle());
         txtvTitle.setText(item.getTitle());
 
         if (item.getPubDate() != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index c563d278f..152412089 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -52,12 +52,14 @@ import de.danoeh.antennapod.activity.PreferenceActivityGingerbread;
 import de.danoeh.antennapod.asynctask.OpmlExportWorker;
 import de.danoeh.antennapod.core.preferences.GpodnetPreferences;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.service.GpodnetSyncService;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.StorageUtils;
 import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
 import de.danoeh.antennapod.dialog.AuthenticationDialog;
 import de.danoeh.antennapod.dialog.AutoFlattrPreferenceDialog;
 import de.danoeh.antennapod.dialog.GpodnetSetHostnameDialog;
+import de.danoeh.antennapod.dialog.ProxyDialog;
 import de.danoeh.antennapod.dialog.VariableSpeedDialog;
 
 /**
@@ -79,9 +81,11 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     public static final String PREF_PLAYBACK_SPEED_LAUNCHER = "prefPlaybackSpeedLauncher";
     public static final String PREF_GPODNET_LOGIN = "pref_gpodnet_authenticate";
     public static final String PREF_GPODNET_SETLOGIN_INFORMATION = "pref_gpodnet_setlogin_information";
+    public static final String PREF_GPODNET_SYNC = "pref_gpodnet_sync";
     public static final String PREF_GPODNET_LOGOUT = "pref_gpodnet_logout";
     public static final String PREF_GPODNET_HOSTNAME = "pref_gpodnet_hostname";
     public static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify";
+    public static final String PREF_PROXY = "prefProxy";
 
     private final PreferenceUI ui;
 
@@ -241,7 +245,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                         (preference, o) -> {
                             if (o instanceof String) {
                                 try {
-                                    int value = Integer.valueOf((String) o);
+                                    int value = Integer.parseInt((String) o);
                                     if (1 <= value && value <= 50) {
                                         setParallelDownloadsText(value);
                                         return true;
@@ -268,7 +272,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
             public void afterTextChanged(Editable s) {
                 if (s.length() > 0) {
                     try {
-                        int value = Integer.valueOf(s.toString());
+                        int value = Integer.parseInt(s.toString());
                         if (value <= 0) {
                             ev.setText("1");
                         } else if (value > 50) {
@@ -309,6 +313,14 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     dialog.show();
                     return true;
                 });
+        ui.findPreference(PreferenceController.PREF_GPODNET_SYNC).
+                setOnPreferenceClickListener(preference -> {
+                    GpodnetSyncService.sendSyncIntent(ui.getActivity().getApplicationContext());
+                    Toast toast = Toast.makeText(ui.getActivity(), R.string.pref_gpodnet_sync_started,
+                            Toast.LENGTH_SHORT);
+                    toast.show();
+                    return true;
+            });
         ui.findPreference(PreferenceController.PREF_GPODNET_LOGOUT).setOnPreferenceClickListener(
                 preference -> {
                     GpodnetPreferences.logout();
@@ -343,7 +355,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         ui.findPreference(UserPreferences.PREF_IMAGE_CACHE_SIZE).setOnPreferenceChangeListener(
                 (preference, o) -> {
                     if (o instanceof String) {
-                        int newValue = Integer.valueOf((String) o) * 1024 * 1024;
+                        int newValue = Integer.parseInt((String) o) * 1024 * 1024;
                         if (newValue != UserPreferences.getImageCacheSize()) {
                             AlertDialog.Builder dialog = new AlertDialog.Builder(ui.getActivity());
                             dialog.setTitle(android.R.string.dialog_alert_title);
@@ -356,6 +368,11 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                     return false;
                 }
         );
+        ui.findPreference(PREF_PROXY).setOnPreferenceClickListener(preference -> {
+            ProxyDialog dialog = new ProxyDialog(ui.getActivity());
+            dialog.createDialog().show();
+            return true;
+        });
         ui.findPreference("prefSendCrashReport").setOnPreferenceClickListener(preference -> {
             Intent emailIntent = new Intent(Intent.ACTION_SEND);
             emailIntent.setType("text/plain");
@@ -423,6 +440,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         final boolean loggedIn = GpodnetPreferences.loggedIn();
         ui.findPreference(PreferenceController.PREF_GPODNET_LOGIN).setEnabled(!loggedIn);
         ui.findPreference(PreferenceController.PREF_GPODNET_SETLOGIN_INFORMATION).setEnabled(loggedIn);
+        ui.findPreference(PreferenceController.PREF_GPODNET_SYNC).setEnabled(loggedIn);
         ui.findPreference(PreferenceController.PREF_GPODNET_LOGOUT).setEnabled(loggedIn);
         ui.findPreference(PreferenceController.PREF_GPODNET_HOSTNAME).setSummary(GpodnetPreferences.getHostname());
     }
@@ -781,7 +799,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 checkedItem = ArrayUtils.indexOf(values, currIntervalStr);
             }
             builder1.setSingleChoiceItems(entries, checkedItem, (dialog1, which1) -> {
-                int hours = Integer.valueOf(values[which1]);
+                int hours = Integer.parseInt(values[which1]);
                 UserPreferences.setUpdateInterval(hours);
                 dialog1.dismiss();
                 setUpdateIntervalText();
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java
index 665ddc3b5..1075117dd 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/ConnectivityActionReceiver.java
@@ -8,6 +8,7 @@ import android.net.NetworkInfo;
 import android.text.TextUtils;
 import android.util.Log;
 
+import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.NetworkUtils;
@@ -20,7 +21,8 @@ public class ConnectivityActionReceiver extends BroadcastReceiver {
 		if (TextUtils.equals(intent.getAction(), ConnectivityManager.CONNECTIVITY_ACTION)) {
 			Log.d(TAG, "Received intent");
 
-			if (NetworkUtils.autodownloadNetworkAvailable()) {
+            ClientConfig.initialize(context);
+            if (NetworkUtils.autodownloadNetworkAvailable()) {
 				Log.d(TAG, "auto-dl network available, starting auto-download");
 					DBTasks.autodownloadUndownloadedItems(context);
 			} else { // if new network is Wi-Fi, finish ongoing downloads,
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
index 46946ddeb..f0d4014ed 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
@@ -1,5 +1,7 @@
 package de.danoeh.antennapod.receiver;
 
+import java.util.Arrays;
+
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
 import android.content.Context;
@@ -44,7 +46,7 @@ public class PlayerWidget extends AppWidgetProvider {
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager,
                          int[] appWidgetIds) {
-        Log.d(TAG, "onUpdate() called with: " + "context = [" + context + "], appWidgetManager = [" + appWidgetManager + "], appWidgetIds = [" + appWidgetIds + "]");
+        Log.d(TAG, "onUpdate() called with: " + "context = [" + context + "], appWidgetManager = [" + appWidgetManager + "], appWidgetIds = [" + Arrays.toString(appWidgetIds) + "]");
         startUpdate(context);
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/PowerConnectionReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/PowerConnectionReceiver.java
index f050e031d..339a4f0f7 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/PowerConnectionReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/PowerConnectionReceiver.java
@@ -3,10 +3,9 @@ package de.danoeh.antennapod.receiver;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.os.BatteryManager;
 import android.util.Log;
 
-import de.danoeh.antennapod.core.BuildConfig;
+import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
@@ -25,6 +24,7 @@ public class PowerConnectionReceiver extends BroadcastReceiver {
 
         Log.d(TAG, "charging intent: " + action);
 
+        ClientConfig.initialize(context);
         if (Intent.ACTION_POWER_CONNECTED.equals(action)) {
             Log.d(TAG, "charging, starting auto-download");
             // we're plugged in, this is a great time to auto-download if everything else is
diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java b/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java
index 8201fe3e2..a373c5353 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/SPAReceiver.java
@@ -9,8 +9,8 @@ import android.widget.Toast;
 
 import java.util.Arrays;
 
-import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
@@ -27,29 +27,30 @@ public class SPAReceiver extends BroadcastReceiver{
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        if (TextUtils.equals(intent.getAction(), ACTION_SP_APPS_QUERY_FEEDS_REPSONSE)) {
-            if (BuildConfig.DEBUG) Log.d(TAG, "Received SP_APPS_QUERY_RESPONSE");
-            if (intent.hasExtra(ACTION_SP_APPS_QUERY_FEEDS_REPSONSE_FEEDS_EXTRA)) {
-                String[] feedUrls = intent.getStringArrayExtra(ACTION_SP_APPS_QUERY_FEEDS_REPSONSE_FEEDS_EXTRA);
-                if (feedUrls != null) {
-                    if (BuildConfig.DEBUG) Log.d(TAG, "Received feeds list: " + Arrays.toString(feedUrls));
-                    for (String url : feedUrls) {
-                        Feed f  = new Feed(url, null);
-                        try {
-                            DownloadRequester.getInstance().downloadFeed(context, f);
-                        } catch (DownloadRequestException e) {
-                            Log.e(TAG, "Error while trying to add feed " + url);
-                            e.printStackTrace();
-                        }
-                    }
-                    Toast.makeText(context, R.string.sp_apps_importing_feeds_msg, Toast.LENGTH_LONG).show();
-
-                } else {
-                    Log.e(TAG, "Received invalid SP_APPS_QUERY_REPSONSE: extra was null");
-                }
-            } else {
-                Log.e(TAG, "Received invalid SP_APPS_QUERY_RESPONSE: Contains no extra");
+        if (!TextUtils.equals(intent.getAction(), ACTION_SP_APPS_QUERY_FEEDS_REPSONSE)) {
+            return;
+        }
+        Log.d(TAG, "Received SP_APPS_QUERY_RESPONSE");
+        if (!intent.hasExtra(ACTION_SP_APPS_QUERY_FEEDS_REPSONSE_FEEDS_EXTRA)) {
+            Log.e(TAG, "Received invalid SP_APPS_QUERY_RESPONSE: Contains no extra");
+            return;
+        }
+        String[] feedUrls = intent.getStringArrayExtra(ACTION_SP_APPS_QUERY_FEEDS_REPSONSE_FEEDS_EXTRA);
+        if (feedUrls == null) {
+            Log.e(TAG, "Received invalid SP_APPS_QUERY_REPSONSE: extra was null");
+            return;
+        }
+        Log.d(TAG, "Received feeds list: " + Arrays.toString(feedUrls));
+        ClientConfig.initialize(context);
+        for (String url : feedUrls) {
+            Feed f = new Feed(url, null);
+            try {
+                DownloadRequester.getInstance().downloadFeed(context, f);
+            } catch (DownloadRequestException e) {
+                Log.e(TAG, "Error while trying to add feed " + url);
+                e.printStackTrace();
             }
         }
+        Toast.makeText(context, R.string.sp_apps_importing_feeds_msg, Toast.LENGTH_LONG).show();
     }
 }
diff --git a/app/src/main/res/layout/downloadlog_item.xml b/app/src/main/res/layout/downloadlog_item.xml
index 20d879933..7b4773bca 100644
--- a/app/src/main/res/layout/downloadlog_item.xml
+++ b/app/src/main/res/layout/downloadlog_item.xml
@@ -10,14 +10,13 @@
     android:paddingBottom="8dp"
     tools:background="@android:color/darker_gray">
 
-    <TextView
+    <com.joanzapata.iconify.widget.IconTextView
         android:id="@+id/txtvIcon"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
         android:textSize="48sp"
-        tools:text="[Icon]"
         android:gravity="center" />
 
     <com.joanzapata.iconify.widget.IconButton
diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml
index c18e5fd6c..a6ce221db 100644
--- a/app/src/main/res/layout/feeditem_fragment.xml
+++ b/app/src/main/res/layout/feeditem_fragment.xml
@@ -31,24 +31,34 @@
                 android:layout_alignParentStart="true"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginBottom="16dp"
                 android:contentDescription="@string/cover_label"
                 android:gravity="center_vertical"
                 tools:src="@drawable/ic_stat_antenna_default"
                 tools:background="@android:color/holo_green_dark" />
 
+            <TextView
+                android:id="@+id/txtvPodcast"
+                style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/imgvCover"
+                android:layout_toRightOf="@id/imgvCover"
+                tools:text="Podcast title"
+                tools:background="@android:color/holo_green_dark" />
+
             <TextView
                 android:id="@+id/txtvTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_alignTop="@id/imgvCover"
+                android:layout_below="@id/txtvPodcast"
                 android:layout_toRightOf="@id/imgvCover"
-                android:includeFontPadding="false"
                 android:textSize="16sp"
                 android:textColor="?android:attr/textColorPrimary"
                 android:ellipsize="end"
                 android:maxLines="5"
-                tools:text="Podcast title"
+                tools:text="Episode title"
                 tools:background="@android:color/holo_green_dark" />
 
             <TextView
@@ -58,7 +68,6 @@
                 android:layout_height="wrap_content"
                 android:layout_toRightOf="@id/imgvCover"
                 android:layout_below="@id/txtvTitle"
-                android:layout_marginLeft="16dp"
                 tools:text="00:42:23"
                 tools:background="@android:color/holo_green_dark"/>
 
@@ -70,7 +79,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_below="@id/txtvTitle"
                 android:layout_marginLeft="8dp"
-                tools:text="Jan\n23"
+                tools:text="Jan 23"
                 tools:background="@android:color/holo_green_dark" />
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/proxy_settings.xml b/app/src/main/res/layout/proxy_settings.xml
new file mode 100644
index 000000000..983325030
--- /dev/null
+++ b/app/src/main/res/layout/proxy_settings.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/txtvType"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/proxy_type_label"
+        android:textColor="?android:attr/textColorSecondary" />
+
+    <Spinner
+        android:id="@+id/spType"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/txtvHost"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/host_label"
+        android:textColor="?android:attr/textColorSecondary" />
+
+    <EditText
+        android:id="@+id/etHost"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:inputType="textUri"
+        android:hint="www.example.com" />
+
+    <TextView
+        android:id="@+id/txtvPort"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/port_label"
+        android:textColor="?android:attr/textColorSecondary" />
+
+    <EditText
+        android:id="@+id/etPort"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="8080"
+        android:inputType="number" />
+
+    <TextView
+        android:id="@+id/txtvUsername"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:singleLine="true"
+        android:text="@string/username_label"
+        android:textColor="?android:attr/textColorSecondary" />
+
+    <EditText
+        android:id="@+id/etUsername"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/optional_hint" />
+
+    <TextView
+        android:id="@+id/txtvPassword"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/password_label"
+        android:textColor="?android:attr/textColorSecondary" />
+
+    <EditText
+        android:id="@+id/etPassword"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/optional_hint"
+        android:inputType="textPassword" />
+
+    <com.joanzapata.iconify.widget.IconTextView
+        android:id="@+id/txtvMessage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:visibility="invisible"
+        android:gravity="center"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/menu/opml_selection_options.xml b/app/src/main/res/menu/opml_selection_options.xml
new file mode 100644
index 000000000..26d2a0519
--- /dev/null
+++ b/app/src/main/res/menu/opml_selection_options.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:custom="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@id/select_all_item"
+        android:icon="?attr/ic_check_box_outline"
+        android:title="@string/select_all_label"
+        custom:showAsAction="ifRoom">
+    </item>
+
+    <item
+        android:id="@id/deselect_all_item"
+        android:icon="?attr/ic_check_box"
+        android:title="@string/deselect_all_label"
+        custom:showAsAction="ifRoom">
+    </item>
+
+</menu>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 3ecd79b1e..e0671e67b 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -200,8 +200,11 @@
                 android:key="prefEnableAutoDownloadWifiFilter"
                 android:title="@string/pref_autodl_wifi_filter_title"
                 android:summary="@string/pref_autodl_wifi_filter_sum"/>
-
         </PreferenceScreen>
+        <Preference
+            android:key="prefProxy"
+            android:summary="@string/pref_proxy_sum"
+            android:title="@string/pref_proxy_title" />
 
     </PreferenceCategory>
 
@@ -239,6 +242,10 @@
                 android:key="pref_gpodnet_setlogin_information"
                 android:title="@string/pref_gpodnet_setlogin_information_title"
                 android:summary="@string/pref_gpodnet_setlogin_information_sum"/>
+            <Preference
+                android:key="pref_gpodnet_sync"
+                android:title="@string/pref_gpodnet_sync_title"
+                android:summary="@string/pref_gpodnet_sync_sum"/>
             <Preference
                 android:key="pref_gpodnet_logout"
                 android:title="@string/pref_gpodnet_logout_title"/>
diff --git a/build.gradle b/build.gradle
index bb67ec17e..2d42a5759 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,18 +41,20 @@ project.ext {
     minSdkVersion = 10
     targetSdkVersion = 23
 
-    supportVersion = "23.2.0"
+    supportVersion = "23.2.1"
     commonsioVersion = "2.4"
     commonslangVersion = "3.4"
     eventbusVersion = "2.4.0"
     flattr4jVersion = "2.12"
-    glideVersion = "3.6.1"
-    iconifyVersion = "2.1.1"
+    glideVersion = "3.7.0"
+    glideOkhttpIntegrationVersion = "1.4.0"
+    iconifyVersion = "2.2.1"
     jsoupVersion = "1.7.3"
     materialDialogsVersion = "0.8.5.6@aar"
-    okhttpVersion = "2.7.4"
+    okhttpVersion = "2.7.5"
     okioVersion = "1.6.0"
     recyclerviewFlexibledividerVersion = "1.2.6"
+    robotiumSoloVersion = "5.5.3"
     rxAndroidVersion = "1.1.0"
     rxJavaVersion = "1.1.0"
     rxJavaRulesVersion = "1.1.0.0"
diff --git a/circle.yml b/circle.yml
index e9fc82e7b..2f8f17e7a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,7 +9,7 @@ dependencies:
     - ~/.android
     - ~/android
   pre:
-    - echo y | android update sdk --no-ui --all --filter "tools,platform-tools,android-23"
+    - echo y | android update sdk --no-ui --all --filter "tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository,android-23"
     - echo y | android update sdk --no-ui --all --filter "build-tools-23.0.2"
   override:
     - echo override dependencies
diff --git a/core/build.gradle b/core/build.gradle
index 09d13a476..f79ea8fc8 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -45,10 +45,10 @@ dependencies {
         exclude group: "org.json", module: "json"
     }
     compile "commons-io:commons-io:$commonsioVersion"
-    compile "com.jayway.android.robotium:robotium-solo:5.5.3"
+    compile "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion"
     compile "org.jsoup:jsoup:$jsoupVersion"
     compile "com.github.bumptech.glide:glide:$glideVersion"
-    compile "com.github.bumptech.glide:okhttp-integration:1.3.1"
+    compile "com.github.bumptech.glide:okhttp-integration:$glideOkhttpIntegrationVersion"
     compile "com.squareup.okhttp:okhttp:$okhttpVersion"
     compile "com.squareup.okhttp:okhttp-urlconnection:$okhttpVersion"
     compile "com.squareup.okio:okio:$okioVersion"
diff --git a/core/src/main/java/de/danoeh/antennapod/core/ClientConfig.java b/core/src/main/java/de/danoeh/antennapod/core/ClientConfig.java
index 6619e706b..a96affb23 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/ClientConfig.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/ClientConfig.java
@@ -1,5 +1,12 @@
 package de.danoeh.antennapod.core;
 
+import android.content.Context;
+
+import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.storage.PodDBAdapter;
+import de.danoeh.antennapod.core.util.NetworkUtils;
+
 /**
  * Stores callbacks for core classes like Services, DB classes etc. and other configuration variables.
  * Apps using the core module of AntennaPod should register implementations of all interfaces here.
@@ -22,4 +29,19 @@ public class ClientConfig {
     public static FlattrCallbacks flattrCallbacks;
 
     public static DBTasksCallbacks dbTasksCallbacks;
+
+    private static boolean initialized = false;
+
+    public static synchronized void initialize(Context context) {
+        if(initialized) {
+            return;
+        }
+        PodDBAdapter.init(context);
+        UserPreferences.init(context);
+        UpdateManager.init(context);
+        PlaybackPreferences.init(context);
+        NetworkUtils.init(context);
+        initialized = true;
+    }
+
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/UpdateManager.java b/core/src/main/java/de/danoeh/antennapod/core/UpdateManager.java
similarity index 99%
rename from app/src/main/java/de/danoeh/antennapod/UpdateManager.java
rename to core/src/main/java/de/danoeh/antennapod/core/UpdateManager.java
index 0b3c43381..8362c4a4e 100644
--- a/app/src/main/java/de/danoeh/antennapod/UpdateManager.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/UpdateManager.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod;
+package de.danoeh.antennapod.core;
 
 
 import android.content.Context;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
index ac032fcc0..c0ec8d08a 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
@@ -17,6 +17,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import de.danoeh.antennapod.core.BuildConfig;
 import de.danoeh.antennapod.core.ClientConfig;
@@ -46,8 +47,8 @@ public class FlattrClickWorker extends AsyncTask<Void, Integer, FlattrClickWorke
 
     public static enum ExitCode {EXIT_NORMAL, NO_TOKEN, NO_NETWORK, NO_THINGS}
 
-    private volatile int countFailed = 0;
-    private volatile int countSuccess = 0;
+    private final AtomicInteger countFailed = new AtomicInteger();
+    private final AtomicInteger countSuccess = new AtomicInteger();
 
     private volatile FlattrThing extraFlattrThing;
 
@@ -114,12 +115,12 @@ public class FlattrClickWorker extends AsyncTask<Void, Integer, FlattrClickWorke
                 FlattrUtils.clickUrl(context, thing.getPaymentLink());
                 thing.getFlattrStatus().setFlattred();
                 publishProgress(R.string.flattr_click_success);
-                countSuccess++;
+                countSuccess.incrementAndGet();
 
             } catch (FlattrException e) {
                 e.printStackTrace();
-                countFailed++;
-                if (countFailed == 1) {
+                int failed = countFailed.incrementAndGet();
+                if (failed == 1) {
                     exception = e;
                 }
             }
@@ -148,7 +149,7 @@ public class FlattrClickWorker extends AsyncTask<Void, Integer, FlattrClickWorke
         super.onPostExecute(exitCode);
         switch (exitCode) {
             case EXIT_NORMAL:
-                if (countFailed > 0) {
+                if (countFailed.get() > 0) {
                     postFlattrFailedNotification();
                 }
                 break;
@@ -190,7 +191,8 @@ public class FlattrClickWorker extends AsyncTask<Void, Integer, FlattrClickWorke
     }
 
     private void postFlattrFailedNotification() {
-        if (countFailed == 0) {
+        int failed = countFailed.get();
+        if (failed == 0) {
             return;
         }
 
@@ -198,15 +200,15 @@ public class FlattrClickWorker extends AsyncTask<Void, Integer, FlattrClickWorke
         String title;
         String subtext;
 
-        if (countFailed == 1) {
+        if (failed == 1) {
             title = context.getString(R.string.flattrd_failed_label);
             String exceptionMsg = (exception.getMessage() != null) ? exception.getMessage() : "";
             subtext = context.getString(R.string.flattr_click_failure, extraFlattrThing.getTitle())
                     + "\n" + exceptionMsg;
         } else {
             title = context.getString(R.string.flattrd_label);
-            subtext = context.getString(R.string.flattr_click_success_count, countSuccess) + "\n"
-                    + context.getString(R.string.flattr_click_failure_count, countFailed);
+            subtext = context.getString(R.string.flattr_click_success_count, countSuccess.get()) + "\n"
+                    + context.getString(R.string.flattr_click_failure_count, failed);
         }
 
         Notification notification = new NotificationCompat.Builder(context)
diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java
index 2d174a6bc..01c888d6b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java
@@ -63,10 +63,10 @@ public class GpodnetEpisodeAction {
             Action action = Action.valueOf(fields[3]);
             GpodnetEpisodeAction result = new Builder(podcast, episode, action)
                     .deviceId(deviceId)
-                    .timestamp(new Date(Long.valueOf(fields[4])))
-                    .started(Integer.valueOf(fields[5]))
-                    .position(Integer.valueOf(fields[6]))
-                    .total(Integer.valueOf(fields[7]))
+                    .timestamp(new Date(Long.parseLong(fields[4])))
+                    .started(Integer.parseInt(fields[5]))
+                    .position(Integer.parseInt(fields[6]))
+                    .total(Integer.parseInt(fields[7]))
                     .build();
             return result;
         } catch(IllegalArgumentException e) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index 6c0aff15e..f9613cc3d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -17,6 +17,7 @@ import org.json.JSONException;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.Proxy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -25,10 +26,12 @@ import java.util.concurrent.TimeUnit;
 
 import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.receiver.FeedUpdateReceiver;
+import de.danoeh.antennapod.core.service.download.ProxyConfig;
 import de.danoeh.antennapod.core.storage.APCleanupAlgorithm;
 import de.danoeh.antennapod.core.storage.APNullCleanupAlgorithm;
 import de.danoeh.antennapod.core.storage.APQueueCleanupAlgorithm;
 import de.danoeh.antennapod.core.storage.EpisodeCleanupAlgorithm;
+import de.danoeh.antennapod.core.util.Converter;
 
 /**
  * Provides access to preferences set by the user in the settings screen. A
@@ -78,6 +81,11 @@ public class UserPreferences {
     public static final String PREF_ENABLE_AUTODL_ON_BATTERY = "prefEnableAutoDownloadOnBattery";
     public static final String PREF_ENABLE_AUTODL_WIFI_FILTER = "prefEnableAutoDownloadWifiFilter";
     public static final String PREF_AUTODL_SELECTED_NETWORKS = "prefAutodownloadSelectedNetworks";
+    public static final String PREF_PROXY_TYPE = "prefProxyType";
+    public static final String PREF_PROXY_HOST = "prefProxyHost";
+    public static final String PREF_PROXY_PORT = "prefProxyPort";
+    public static final String PREF_PROXY_USER = "prefProxyUser";
+    public static final String PREF_PROXY_PASSWORD = "prefProxyPassword";
 
     // Services
     public static final String PREF_AUTO_FLATTR = "pref_auto_flattr";
@@ -158,12 +166,12 @@ public class UserPreferences {
 
     public static int getFeedOrder() {
         String value = prefs.getString(PREF_DRAWER_FEED_ORDER, "0");
-        return Integer.valueOf(value);
+        return Integer.parseInt(value);
     }
 
     public static int getFeedCounterSetting() {
         String value = prefs.getString(PREF_DRAWER_FEED_COUNTER, "0");
-        return Integer.valueOf(value);
+        return Integer.parseInt(value);
     }
 
     /**
@@ -243,7 +251,7 @@ public class UserPreferences {
     }
 
     public static int getSmartMarkAsPlayedSecs() {
-        return Integer.valueOf(prefs.getString(PREF_SMART_MARK_AS_PLAYED_SECS, "30"));
+        return Integer.parseInt(prefs.getString(PREF_SMART_MARK_AS_PLAYED_SECS, "30"));
     }
 
     public static boolean isAutoFlattr() {
@@ -260,20 +268,20 @@ public class UserPreferences {
 
     public static float getLeftVolume() {
         int volume = prefs.getInt(PREF_LEFT_VOLUME, 100);
-        if(volume == 100) {
-            return 1.0f;
-        } else {
-            return (float) (1 - (Math.log(100 - volume) / Math.log(100)));
-        }
+        return Converter.getVolumeFromPercentage(volume);
     }
 
     public static float getRightVolume() {
         int volume = prefs.getInt(PREF_RIGHT_VOLUME, 100);
-        if(volume == 100) {
-            return 1.0f;
-        } else {
-            return (float) (1 - (Math.log(100 - volume) / Math.log(100)));
-        }
+        return Converter.getVolumeFromPercentage(volume);
+    }
+
+    public static int getLeftVolumePercentage() {
+        return prefs.getInt(PREF_LEFT_VOLUME, 100);
+    }
+
+    public static int getRightVolumePercentage() {
+        return prefs.getInt(PREF_RIGHT_VOLUME, 100);
     }
 
     public static boolean shouldPauseForFocusLoss() {
@@ -295,8 +303,8 @@ public class UserPreferences {
         String datetime = prefs.getString(PREF_UPDATE_INTERVAL, "");
         if(datetime.length() >= 3 && datetime.contains(":")) {
             String[] parts = datetime.split(":");
-            int hourOfDay = Integer.valueOf(parts[0]);
-            int minute = Integer.valueOf(parts[1]);
+            int hourOfDay = Integer.parseInt(parts[0]);
+            int minute = Integer.parseInt(parts[1]);
             return new int[] { hourOfDay, minute };
         } else {
             return new int[0];
@@ -308,7 +316,7 @@ public class UserPreferences {
     }
 
     public static int getParallelDownloads() {
-        return Integer.valueOf(prefs.getString(PREF_PARALLEL_DOWNLOADS, "4"));
+        return Integer.parseInt(prefs.getString(PREF_PARALLEL_DOWNLOADS, "4"));
     }
 
     public static int getEpisodeCacheSizeUnlimited() {
@@ -338,12 +346,12 @@ public class UserPreferences {
 
     public static int getImageCacheSize() {
         String cacheSizeString = prefs.getString(PREF_IMAGE_CACHE_SIZE, IMAGE_CACHE_DEFAULT_VALUE);
-        int cacheSizeInt = Integer.valueOf(cacheSizeString);
+        int cacheSizeInt = Integer.parseInt(cacheSizeString);
         // if the cache size is too small the user won't get any images at all
         // that's bad, force it back to the default.
         if (cacheSizeInt < IMAGE_CACHE_SIZE_MINIMUM) {
             prefs.edit().putString(PREF_IMAGE_CACHE_SIZE, IMAGE_CACHE_DEFAULT_VALUE).apply();
-            cacheSizeInt = Integer.valueOf(IMAGE_CACHE_DEFAULT_VALUE);
+            cacheSizeInt = Integer.parseInt(IMAGE_CACHE_DEFAULT_VALUE);
         }
         int cacheSizeMB = cacheSizeInt * 1024 * 1024;
         return cacheSizeMB;
@@ -371,6 +379,42 @@ public class UserPreferences {
         return TextUtils.split(selectedNetWorks, ",");
     }
 
+    public static void setProxyConfig(ProxyConfig config) {
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putString(PREF_PROXY_TYPE, config.type.name());
+        if(TextUtils.isEmpty(config.host)) {
+            editor.remove(PREF_PROXY_HOST);
+        } else {
+            editor.putString(PREF_PROXY_HOST, config.host);
+        }
+        if(config.port <= 0 || config.port > 65535) {
+            editor.remove(PREF_PROXY_PORT);
+        } else {
+            editor.putInt(PREF_PROXY_PORT, config.port);
+        }
+        if(TextUtils.isEmpty(config.username)) {
+            editor.remove(PREF_PROXY_USER);
+        } else {
+            editor.putString(PREF_PROXY_USER, config.username);
+        }
+        if(TextUtils.isEmpty(config.password)) {
+            editor.remove(PREF_PROXY_PASSWORD);
+        } else {
+            editor.putString(PREF_PROXY_PASSWORD, config.password);
+        }
+        editor.apply();
+    }
+
+    public static ProxyConfig getProxyConfig() {
+        Proxy.Type type = Proxy.Type.valueOf(prefs.getString(PREF_PROXY_TYPE, Proxy.Type.DIRECT.name()));
+        String host = prefs.getString(PREF_PROXY_HOST, null);
+        int port = prefs.getInt(PREF_PROXY_PORT, 0);
+        String username = prefs.getString(PREF_PROXY_USER, null);
+        String password = prefs.getString(PREF_PROXY_PASSWORD, null);
+        ProxyConfig config = new ProxyConfig(type, host, port, username, password);
+        return config;
+    }
+
     public static boolean shouldResumeAfterCall() {
         return prefs.getBoolean(PREF_RESUME_AFTER_CALL, true);
     }
@@ -494,7 +538,7 @@ public class UserPreferences {
         if (valueFromPrefs.equals(context.getString(R.string.pref_episode_cache_unlimited))) {
             return EPISODE_CACHE_SIZE_UNLIMITED;
         } else {
-            return Integer.valueOf(valueFromPrefs);
+            return Integer.parseInt(valueFromPrefs);
         }
     }
 
@@ -502,15 +546,7 @@ public class UserPreferences {
         String[] selectedSpeeds = null;
         // If this preference hasn't been set yet, return the default options
         if (valueFromPrefs == null) {
-            String[] allSpeeds = context.getResources().getStringArray(R.array.playback_speed_values);
-            List<String> speedList = new ArrayList<>();
-            for (String speedStr : allSpeeds) {
-                float speed = Float.parseFloat(speedStr);
-                if (speed < 2.0001 && speed * 10 % 1 == 0) {
-                    speedList.add(speedStr);
-                }
-            }
-            selectedSpeeds = speedList.toArray(new String[speedList.size()]);
+            selectedSpeeds = new String[] { "1.00", "1.25", "1.50", "1.75", "2.00" };
         } else {
             try {
                 JSONArray jsonArray = new JSONArray(valueFromPrefs);
@@ -548,7 +584,7 @@ public class UserPreferences {
 
 
     public static EpisodeCleanupAlgorithm getEpisodeCleanupAlgorithm() {
-        int cleanupValue = Integer.valueOf(prefs.getString(PREF_EPISODE_CLEANUP, "-1"));
+        int cleanupValue = Integer.parseInt(prefs.getString(PREF_EPISODE_CLEANUP, "-1"));
         if (cleanupValue == EPISODE_CLEANUP_QUEUE) {
             return new APQueueCleanupAlgorithm();
         } else if (cleanupValue == EPISODE_CLEANUP_NULL) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/receiver/AlarmUpdateReceiver.java b/core/src/main/java/de/danoeh/antennapod/core/receiver/AlarmUpdateReceiver.java
index ce5004a98..33c15883b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/receiver/AlarmUpdateReceiver.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/receiver/AlarmUpdateReceiver.java
@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.text.TextUtils;
 import android.util.Log;
 
-import de.danoeh.antennapod.core.preferences.PlaybackPreferences;
+import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 /** Listens for events that make it necessary to reset the update alarm. */
@@ -22,8 +22,7 @@ public class AlarmUpdateReceiver extends BroadcastReceiver {
 		} else if (TextUtils.equals(intent.getAction(), Intent.ACTION_PACKAGE_REPLACED)) {
 			Log.d(TAG, "Resetting update alarm after app upgrade");
 		}
-        PlaybackPreferences.init(context);
-        UserPreferences.init(context);
+		ClientConfig.initialize(context);
         UserPreferences.restartUpdateAlarm(false);
 	}
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java b/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java
index b959c7301..e0abe0efb 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
+import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.util.NetworkUtils;
@@ -19,6 +20,7 @@ public class FeedUpdateReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         Log.d(TAG, "Received intent");
+        ClientConfig.initialize(context);
         if (NetworkUtils.isDownloadAllowed()) {
             DBTasks.refreshAllFeeds(context, null);
         } else {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/receiver/MediaButtonReceiver.java b/core/src/main/java/de/danoeh/antennapod/core/receiver/MediaButtonReceiver.java
index a900248d2..51cc52e10 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/receiver/MediaButtonReceiver.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/receiver/MediaButtonReceiver.java
@@ -5,7 +5,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 import android.view.KeyEvent;
-import de.danoeh.antennapod.core.BuildConfig;
+
+import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.service.playback.PlaybackService;
 
 /** Receives media button events. */
@@ -17,10 +18,10 @@ public class MediaButtonReceiver extends BroadcastReceiver {
 
 	@Override
 	public void onReceive(Context context, Intent intent) {
-		if (BuildConfig.DEBUG) Log.d(TAG, "Received intent");
-		KeyEvent event = (KeyEvent) intent.getExtras().get(
-				Intent.EXTRA_KEY_EVENT);
+		Log.d(TAG, "Received intent");
+		KeyEvent event = (KeyEvent) intent.getExtras().get(Intent.EXTRA_KEY_EVENT);
 		if (event.getAction() == KeyEvent.ACTION_DOWN) {
+			ClientConfig.initialize(context);
 			Intent serviceIntent = new Intent(context, PlaybackService.class);
 			int keycode = event.getKeyCode();
 			serviceIntent.putExtra(EXTRA_KEYCODE, keycode);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
index b23819ef7..5dd1e2dfa 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java
@@ -2,8 +2,10 @@ package de.danoeh.antennapod.core.service.download;
 
 import android.os.Build;
 import android.support.annotation.NonNull;
+import android.text.TextUtils;
 import android.util.Log;
 
+import com.squareup.okhttp.Credentials;
 import com.squareup.okhttp.OkHttpClient;
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.Response;
@@ -14,7 +16,10 @@ import java.net.CookieManager;
 import java.net.CookiePolicy;
 import java.net.HttpURLConnection;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.net.Socket;
+import java.net.SocketAddress;
 import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.util.concurrent.TimeUnit;
@@ -23,6 +28,7 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 
+import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBWriter;
 
 /**
@@ -44,12 +50,15 @@ public class AntennapodHttpClient {
      */
     public static synchronized OkHttpClient getHttpClient() {
         if (httpClient == null) {
-
             httpClient = newHttpClient();
         }
         return httpClient;
     }
 
+    public static synchronized void reinit() {
+        httpClient = newHttpClient();
+    }
+
     /**
      * Creates a new HTTP client.  Most users should just use
      * getHttpClient() to get the standard AntennaPod client,
@@ -69,13 +78,13 @@ public class AntennapodHttpClient {
         client.networkInterceptors().add(chain -> {
             Request request = chain.request();
             Response response = chain.proceed(request);
-            if(response.code() == HttpURLConnection.HTTP_MOVED_PERM ||
+            if (response.code() == HttpURLConnection.HTTP_MOVED_PERM ||
                     response.code() == StatusLine.HTTP_PERM_REDIRECT) {
                 String location = response.header("Location");
-                if(location.startsWith("/")) { // URL is not absolute, but relative
+                if (location.startsWith("/")) { // URL is not absolute, but relative
                     URL url = request.url();
                     location = url.getProtocol() + "://" + url.getHost() + location;
-                } else if(!location.toLowerCase().startsWith("http://") &&
+                } else if (!location.toLowerCase().startsWith("http://") &&
                         !location.toLowerCase().startsWith("https://")) {
                     // Reference is relative to current path
                     URL url = request.url();
@@ -106,6 +115,21 @@ public class AntennapodHttpClient {
         client.setFollowRedirects(true);
         client.setFollowSslRedirects(true);
 
+        ProxyConfig config = UserPreferences.getProxyConfig();
+        if (config.type != Proxy.Type.DIRECT) {
+            int port = config.port > 0 ? config.port : ProxyConfig.DEFAULT_PORT;
+            SocketAddress address = InetSocketAddress.createUnresolved(config.host, port);
+            Proxy proxy = new Proxy(config.type, address);
+            client.setProxy(proxy);
+            if (!TextUtils.isEmpty(config.username)) {
+                String credentials = Credentials.basic(config.username, config.password);
+                client.interceptors().add(chain -> {
+                    Request request = chain.request().newBuilder()
+                            .header("Proxy-Authorization", credentials).build();
+                    return chain.proceed(request);
+                });
+            }
+        }
         if(16 <= Build.VERSION.SDK_INT && Build.VERSION.SDK_INT < 21) {
             client.setSslSocketFactory(new CustomSslSocketFactory());
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
index 7f40ea6e2..de91916a9 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
@@ -128,7 +128,8 @@ public class DownloadRequest implements Parcelable {
 
         DownloadRequest that = (DownloadRequest) o;
 
-        if (lastModified != that.lastModified) return false;
+        if (lastModified != null ? !lastModified.equals(that.lastModified) : that.lastModified != null)
+            return false;
         if (deleteOnFailure != that.deleteOnFailure) return false;
         if (feedfileId != that.feedfileId) return false;
         if (feedfileType != that.feedfileType) return false;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index 090c48ca0..be6cd88cb 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -188,7 +188,7 @@ public class DownloadService extends Service {
                             if (status.getReason() == DownloadError.ERROR_UNAUTHORIZED) {
                                 postAuthenticationNotification(downloader.getDownloadRequest());
                             } else if (status.getReason() == DownloadError.ERROR_HTTP_DATA_ERROR
-                                    && Integer.valueOf(status.getReasonDetailed()) == 416) {
+                                    && Integer.parseInt(status.getReasonDetailed()) == 416) {
 
                                 Log.d(TAG, "Requested invalid range, restarting download from the beginning");
                                 FileUtils.deleteQuietly(new File(downloader.getDownloadRequest().getDestination()));
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
index e3a195253..2b26f58c0 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/HttpDownloader.java
@@ -27,6 +27,7 @@ import java.util.Date;
 import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.feed.FeedImage;
+import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.util.DateUtils;
 import de.danoeh.antennapod.core.util.DownloadError;
 import de.danoeh.antennapod.core.util.StorageUtils;
@@ -67,6 +68,12 @@ public class HttpDownloader extends Downloader {
             final URI uri = URIUtil.getURIFromRequestUrl(request.getSource());
             Request.Builder httpReq = new Request.Builder().url(uri.toURL())
                     .header("User-Agent", ClientConfig.USER_AGENT);
+            if(request.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
+                // set header explicitly so that okhttp doesn't do transparent gzip
+                Log.d(TAG, "addHeader(\"Accept-Encoding\", \"identity\")");
+                httpReq.addHeader("Accept-Encoding", "identity");
+            }
+
             if(!TextUtils.isEmpty(request.getLastModified())) {
                 String lastModified = request.getLastModified();
                 Date lastModifiedDate = DateUtils.parse(lastModified);
@@ -117,6 +124,15 @@ public class HttpDownloader extends Downloader {
                     throw e;
                 }
             }
+
+            if(request.getFeedfileType() == FeedMedia.FEEDFILETYPE_FEEDMEDIA) {
+                String contentType = response.header("Content-Type");
+                if(!contentType.startsWith("audio/") && !contentType.startsWith("video/")) {
+                    onFail(DownloadError.ERROR_FILE_TYPE, null);
+                    return;
+                }
+            }
+
             responseBody = response.body();
             String contentEncodingHeader = response.header("Content-Encoding");
             boolean isGzip = false;
@@ -180,7 +196,7 @@ public class HttpDownloader extends Downloader {
                     && !TextUtils.isEmpty(contentRangeHeader)) {
                 String start = contentRangeHeader.substring("bytes ".length(),
                         contentRangeHeader.indexOf("-"));
-                request.setSoFar(Long.valueOf(start));
+                request.setSoFar(Long.parseLong(start));
                 Log.d(TAG, "Starting download at position " + request.getSoFar());
 
                 out = new RandomAccessFile(destination, "rw");
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/ProxyConfig.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/ProxyConfig.java
new file mode 100644
index 000000000..e886932f2
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/ProxyConfig.java
@@ -0,0 +1,32 @@
+package de.danoeh.antennapod.core.service.download;
+
+import android.support.annotation.Nullable;
+
+import java.net.Proxy;
+
+public class ProxyConfig {
+
+    public final Proxy.Type type;
+    @Nullable public final String host;
+    @Nullable public final int port;
+    @Nullable public final String username;
+    @Nullable public final String password;
+
+    public final static int DEFAULT_PORT = 8080;
+
+    public static ProxyConfig direct() {
+        return new ProxyConfig(Proxy.Type.DIRECT, null, 0, null, null);
+    }
+
+    public static ProxyConfig http(String host, int port, String username, String password) {
+        return new ProxyConfig(Proxy.Type.HTTP, host, port, username, password);
+    }
+
+    public ProxyConfig(Proxy.Type type, String host, int port, String username, String password) {
+        this.type = type;
+        this.host = host;
+        this.port = port;
+        this.username = username;
+        this.password = password;
+    }
+}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
index a82e82506..775820d7d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceMediaPlayer.java
@@ -604,7 +604,11 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
      * Returns the position of the current media object or INVALID_TIME if the position could not be retrieved.
      */
     public int getPosition() {
-        if (!playerLock.tryLock()) {
+        try {
+            if (!playerLock.tryLock(50, TimeUnit.MILLISECONDS)) {
+                return INVALID_TIME;
+            }
+        } catch (InterruptedException e) {
             return INVALID_TIME;
         }
 
@@ -693,7 +697,7 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
     }
 
     /**
-     * Sets the playback speed.
+     * Sets the playback volume.
      * This method is executed on an internal executor service.
      */
     public void setVolume(final float volumeLeft, float volumeRight) {
@@ -701,7 +705,7 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
     }
 
     /**
-     * Sets the playback speed.
+     * Sets the playback volume.
      * This method is executed on the caller's thread.
      */
     private void setVolumeSync(float volumeLeft, float volumeRight) {
@@ -946,15 +950,16 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
                         if (pausedBecauseOfTransientAudiofocusLoss) { // we paused => play now
                             resume();
                         } else { // we ducked => raise audio level back
-                            audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC,
-                                    AudioManager.ADJUST_RAISE, 0);
+                            setVolumeSync(UserPreferences.getLeftVolume(),
+                                    UserPreferences.getRightVolume());
                         }
                     } else if (focusChange == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK) {
                         if (playerStatus == PlayerStatus.PLAYING) {
                             if (!UserPreferences.shouldPauseForFocusLoss()) {
                                 Log.d(TAG, "Lost audio focus temporarily. Ducking...");
-                                audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC,
-                                        AudioManager.ADJUST_LOWER, 0);
+                                final float DUCK_FACTOR = 0.25f;
+                                setVolumeSync(DUCK_FACTOR * UserPreferences.getLeftVolume(),
+                                        DUCK_FACTOR * UserPreferences.getRightVolume());
                                 pausedBecauseOfTransientAudiofocusLoss = false;
                             } else {
                                 Log.d(TAG, "Lost audio focus temporarily. Could duck, but won't, pausing...");
@@ -1204,6 +1209,71 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
 
         private static final String TAG = "MediaSessionCompat";
 
+        @Override
+        public void onPlay() {
+            Log.d(TAG, "onPlay()");
+            if (playerStatus == PlayerStatus.PAUSED || playerStatus == PlayerStatus.PREPARED) {
+                resume();
+            } else if (playerStatus == PlayerStatus.INITIALIZED) {
+                setStartWhenPrepared(true);
+                prepare();
+            }
+        }
+
+        @Override
+        public void onPause() {
+            Log.d(TAG, "onPause()");
+            if (playerStatus == PlayerStatus.PLAYING) {
+                pause(false, true);
+            }
+            if (UserPreferences.isPersistNotify()) {
+                pause(false, true);
+            } else {
+                pause(true, true);
+            }
+        }
+
+        @Override
+        public void onStop() {
+            Log.d(TAG, "onStop()");
+            stop();
+        }
+
+        @Override
+        public void onSkipToPrevious() {
+            Log.d(TAG, "onSkipToPrevious()");
+            seekDelta(-UserPreferences.getRewindSecs() * 1000);
+        }
+
+        @Override
+        public void onRewind() {
+            Log.d(TAG, "onRewind()");
+            seekDelta(-UserPreferences.getRewindSecs() * 1000);
+        }
+
+        @Override
+        public void onFastForward() {
+            Log.d(TAG, "onFastForward()");
+            seekDelta(UserPreferences.getFastFowardSecs() * 1000);
+        }
+
+        @Override
+        public void onSkipToNext() {
+            Log.d(TAG, "onSkipToNext()");
+            if(UserPreferences.shouldHardwareButtonSkip()) {
+                endPlayback(true);
+            } else {
+                seekDelta(UserPreferences.getFastFowardSecs() * 1000);
+            }
+        }
+
+
+        @Override
+        public void onSeekTo(long pos) {
+            Log.d(TAG, "onSeekTo()");
+            seekTo((int) pos);
+        }
+
         @Override
         public boolean onMediaButtonEvent(final Intent mediaButton) {
             Log.d(TAG, "onMediaButtonEvent(" + mediaButton + ")");
@@ -1240,42 +1310,27 @@ public class PlaybackServiceMediaPlayer implements SharedPreferences.OnSharedPre
                     return true;
                 }
                 case KeyEvent.KEYCODE_MEDIA_PLAY: {
-                    Log.d(TAG, "Received Play event from RemoteControlClient");
-                    if (playerStatus == PlayerStatus.PAUSED || playerStatus == PlayerStatus.PREPARED) {
-                        resume();
-                    } else if (playerStatus == PlayerStatus.INITIALIZED) {
-                        setStartWhenPrepared(true);
-                        prepare();
-                    }
+                    sessionCallback.onPlay();
                     return true;
                 }
                 case KeyEvent.KEYCODE_MEDIA_PAUSE: {
-                    Log.d(TAG, "Received Pause event from RemoteControlClient");
-                    if (playerStatus == PlayerStatus.PLAYING) {
-                        pause(false, true);
-                    }
-                    if (UserPreferences.isPersistNotify()) {
-                        pause(false, true);
-                    } else {
-                        pause(true, true);
-                    }
+                    sessionCallback.onPause();
                     return true;
                 }
                 case KeyEvent.KEYCODE_MEDIA_STOP: {
-                    Log.d(TAG, "Received Stop event from RemoteControlClient");
-                    stop();
+                    sessionCallback.onStop();
                     return true;
                 }
                 case KeyEvent.KEYCODE_MEDIA_PREVIOUS: {
-                    seekDelta(-UserPreferences.getRewindSecs() * 1000);
+                    sessionCallback.onSkipToPrevious();
                     return true;
                 }
                 case KeyEvent.KEYCODE_MEDIA_REWIND: {
-                    seekDelta(-UserPreferences.getRewindSecs() * 1000);
+                    sessionCallback.onRewind();
                     return true;
                 }
                 case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: {
-                    seekDelta(UserPreferences.getFastFowardSecs() * 1000);
+                    sessionCallback.onFastForward();
                     return true;
                 }
                 case KeyEvent.KEYCODE_MEDIA_NEXT: {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
index 68187306d..e69e1887d 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
@@ -4,6 +4,7 @@ import android.database.Cursor;
 import android.support.v4.util.ArrayMap;
 import android.util.Log;
 
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -590,17 +591,18 @@ public final class DBReader {
         FeedItem item = null;
 
         Cursor itemCursor = adapter.getFeedItemCursor(Long.toString(itemId));
-        if (itemCursor.moveToFirst()) {
-            List<FeedItem> list = extractItemlistFromCursor(adapter, itemCursor);
-            if (list.size() > 0) {
-                item = list.get(0);
-                loadAdditionalFeedItemListData(list);
-                if (item.hasChapters()) {
-                    loadChaptersOfFeedItem(adapter, item);
-                }
+        if (!itemCursor.moveToFirst()) {
+            return null;
+        }
+        List<FeedItem> list = extractItemlistFromCursor(adapter, itemCursor);
+        itemCursor.close();
+        if (list.size() > 0) {
+            item = list.get(0);
+            loadAdditionalFeedItemListData(list);
+            if (item.hasChapters()) {
+                loadChaptersOfFeedItem(adapter, item);
             }
         }
-        itemCursor.close();
         return item;
     }
 
@@ -676,7 +678,7 @@ public final class DBReader {
      * as well as chapter marks of the FeedItems will also be loaded from the database.
      */
     public static List<FeedItem> getFeedItems(final long... itemIds) {
-        Log.d(TAG, "getFeedItems() called with: " + "itemIds = [" + itemIds + "]");
+        Log.d(TAG, "getFeedItems() called with: " + "itemIds = [" + Arrays.toString(itemIds) + "]");
         PodDBAdapter adapter = PodDBAdapter.getInstance();
         adapter.open();
         List<FeedItem> items = getFeedItems(adapter, itemIds);
@@ -898,19 +900,23 @@ public final class DBReader {
         adapter.open();
         Cursor mediaCursor = adapter.getSingleFeedMediaCursor(mediaId);
 
-        FeedMedia media = null;
-        if (mediaCursor.moveToFirst()) {
-            int indexFeedItem = mediaCursor.getColumnIndex(PodDBAdapter.KEY_FEEDITEM);
-            final long itemId = mediaCursor.getLong(indexFeedItem);
-            media = FeedMedia.fromCursor(mediaCursor);
+        if (!mediaCursor.moveToFirst()) {
+            return null;
+        }
+
+        int indexFeedItem = mediaCursor.getColumnIndex(PodDBAdapter.KEY_FEEDITEM);
+        long itemId = mediaCursor.getLong(indexFeedItem);
+        FeedMedia media = FeedMedia.fromCursor(mediaCursor);
+        mediaCursor.close();
+
+        if(media != null) {
             FeedItem item = getFeedItem(itemId);
-            if (media != null && item != null) {
+            if (item != null) {
                 media.setItem(item);
                 item.setMedia(media);
             }
         }
 
-        mediaCursor.close();
         adapter.close();
 
         return media;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
index 99c4cd67a..769a796e3 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
@@ -60,12 +60,12 @@ public class NSITunes extends Namespace {
             try {
                 int duration = 0;
                 if (parts.length == 2) {
-                    duration += TimeUnit.MINUTES.toMillis(Long.valueOf(parts[0])) +
-                            TimeUnit.SECONDS.toMillis(Long.valueOf(parts[1]));
+                    duration += TimeUnit.MINUTES.toMillis(Long.parseLong(parts[0])) +
+                            TimeUnit.SECONDS.toMillis(Long.parseLong(parts[1]));
                 } else if (parts.length >= 3) {
-                    duration += TimeUnit.HOURS.toMillis(Long.valueOf(parts[0])) +
-                            TimeUnit.MINUTES.toMillis(Long.valueOf(parts[1])) +
-                            TimeUnit.SECONDS.toMillis(Long.valueOf(parts[2]));
+                    duration += TimeUnit.HOURS.toMillis(Long.parseLong(parts[0])) +
+                            TimeUnit.MINUTES.toMillis(Long.parseLong(parts[1])) +
+                            TimeUnit.SECONDS.toMillis(Long.parseLong(parts[2]));
                 } else {
                     return;
                 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java b/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java
index 1b929b214..5b046d7a7 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java
@@ -88,9 +88,9 @@ public final class Converter {
         if (parts.length != 3) {
             return 0;
         }
-        return Integer.valueOf(parts[0]) * 3600 * 1000 +
-                Integer.valueOf(parts[1]) * 60 * 1000 +
-                Integer.valueOf(parts[2]) * 1000;
+        return Integer.parseInt(parts[0]) * 3600 * 1000 +
+                Integer.parseInt(parts[1]) * 60 * 1000 +
+                Integer.parseInt(parts[2]) * 1000;
     }
 
     /** Converts short duration string (HH:MM) to milliseconds. */
@@ -99,8 +99,8 @@ public final class Converter {
         if (parts.length != 2) {
             return 0;
         }
-        return Integer.valueOf(parts[0]) * 3600 * 1000 +
-                Integer.valueOf(parts[1]) * 1000 * 60;
+        return Integer.parseInt(parts[0]) * 3600 * 1000 +
+                Integer.parseInt(parts[1]) * 1000 * 60;
     }
 
     /** Converts milliseconds to a localized string containing hours and minutes */
@@ -118,5 +118,16 @@ public final class Converter {
         result += minutes;
         return result;
     }
-    
+
+    /**
+     * Converts the volume as read as the progress from a SeekBar scaled to 100 and as saved in
+     * UserPreferences to the format taken by setVolume methods.
+     * @param progress integer between 0 to 100 taken from the SeekBar progress
+     * @return the appropriate volume as float taken by setVolume methods
+     */
+    public static float getVolumeFromPercentage(int progress){
+        if (progress==100)
+            return 1f;
+        return (float) (1 - (Math.log(101 - progress) / Math.log(101)));
+    }
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
index 155ef519b..314062e52 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
@@ -115,13 +115,13 @@ public class DateUtils {
         int idx = 0;
         if (parts.length == 3) {
             // string has hours
-            result += Integer.valueOf(parts[idx]) * 3600000L;
+            result += Integer.parseInt(parts[idx]) * 3600000L;
             idx++;
         }
         if (parts.length >= 2) {
-            result += Integer.valueOf(parts[idx]) * 60000L;
+            result += Integer.parseInt(parts[idx]) * 60000L;
             idx++;
-            result += (Float.valueOf(parts[idx])) * 1000L;
+            result += (Float.parseFloat(parts[idx])) * 1000L;
         }
         return result;
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/DownloadError.java b/core/src/main/java/de/danoeh/antennapod/core/util/DownloadError.java
index 602c221bf..d3f6c6b79 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/DownloadError.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/DownloadError.java
@@ -19,7 +19,8 @@ public enum DownloadError {
 	ERROR_UNKNOWN_HOST(11, R.string.download_error_unknown_host),
 	ERROR_REQUEST_ERROR(12, R.string.download_error_request_error),
     ERROR_DB_ACCESS_ERROR(13, R.string.download_error_db_access),
-    ERROR_UNAUTHORIZED(14, R.string.download_error_unauthorized);
+    ERROR_UNAUTHORIZED(14, R.string.download_error_unauthorized),
+	ERROR_FILE_TYPE(15, R.string.download_error_file_type_type);
 
 	private final int code;
 	private final int resId;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/IntList.java b/core/src/main/java/de/danoeh/antennapod/core/util/IntList.java
index 673c81235..1cbe7fade 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/IntList.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/IntList.java
@@ -35,7 +35,7 @@ public final class IntList {
         int hashCode = 1;
         for (int i = 0; i < size; i++) {
             int value = values[i];
-            hashCode = 31 * hashCode + (int)(value ^ (value >>> 32));
+            hashCode = 31 * hashCode + value;
         }
         return hashCode;
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/gui/FeedItemUndoToken.java b/core/src/main/java/de/danoeh/antennapod/core/util/gui/FeedItemUndoToken.java
deleted file mode 100644
index 17581d3e9..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/util/gui/FeedItemUndoToken.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package de.danoeh.antennapod.core.util.gui;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-import de.danoeh.antennapod.core.feed.FeedItem;
-
-/**
- * Used by an UndoBarController for saving a removed FeedItem
- */
-public class FeedItemUndoToken implements Parcelable {
-    private long itemId;
-    private long feedId;
-    private int position;
-
-    public FeedItemUndoToken(FeedItem item, int position) {
-        this.itemId = item.getId();
-        this.feedId = item.getFeed().getId();
-        this.position = position;
-    }
-
-    private FeedItemUndoToken(Parcel in) {
-        itemId = in.readLong();
-        feedId = in.readLong();
-        position = in.readInt();
-    }
-
-    public static final Parcelable.Creator<FeedItemUndoToken> CREATOR = new Parcelable.Creator<FeedItemUndoToken>() {
-        public FeedItemUndoToken createFromParcel(Parcel in) {
-            return new FeedItemUndoToken(in);
-        }
-
-        public FeedItemUndoToken[] newArray(int size) {
-            return new FeedItemUndoToken[size];
-        }
-    };
-
-    public int describeContents() {
-        return 0;
-    }
-
-    public void writeToParcel(Parcel out, int flags) {
-        out.writeLong(itemId);
-        out.writeLong(feedId);
-        out.writeInt(position);
-    }
-
-    public long getFeedItemId() {
-        return itemId;
-    }
-
-    public int getPosition() {
-        return position;
-    }
-}
-
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
index 27935978c..1a011a90b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java
@@ -19,7 +19,6 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
 import android.view.SurfaceHolder;
-import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 import android.widget.SeekBar;
 import android.widget.TextView;
@@ -424,6 +423,7 @@ public abstract class PlaybackController {
                 clearStatusMsg();
                 checkMediaInfoLoaded();
                 cancelPositionObserver();
+                onPositionObserverUpdate();
                 updatePlayButtonAppearance(playResource, playText);
                 if (PlaybackService.getCurrentMediaType() == MediaType.VIDEO) {
                     setScreenOn(false);
@@ -574,34 +574,32 @@ public abstract class PlaybackController {
 
     }
 
-    public OnClickListener newOnPlayButtonClickListener() {
-        return v -> {
-            if (playbackService == null) {
-                Log.w(TAG, "Play/Pause button was pressed, but playbackservice was null!");
-                return;
-            }
-            switch (status) {
-                case PLAYING:
-                    playbackService.pause(true, reinitOnPause);
-                    break;
-                case PAUSED:
-                case PREPARED:
-                    playbackService.resume();
-                    break;
-                case PREPARING:
-                    playbackService.setStartWhenPrepared(!playbackService
-                            .isStartWhenPrepared());
-                    if (reinitOnPause
-                            && playbackService.isStartWhenPrepared() == false) {
-                        playbackService.reinit();
-                    }
-                    break;
-                case INITIALIZED:
-                    playbackService.setStartWhenPrepared(true);
-                    playbackService.prepare();
-                    break;
-            }
-        };
+    public void playPause() {
+        if (playbackService == null) {
+            Log.w(TAG, "Play/Pause button was pressed, but playbackservice was null!");
+            return;
+        }
+        switch (status) {
+            case PLAYING:
+                playbackService.pause(true, reinitOnPause);
+                break;
+            case PAUSED:
+            case PREPARED:
+                playbackService.resume();
+                break;
+            case PREPARING:
+                playbackService.setStartWhenPrepared(!playbackService
+                        .isStartWhenPrepared());
+                if (reinitOnPause
+                        && playbackService.isStartWhenPrepared() == false) {
+                    playbackService.reinit();
+                }
+                break;
+            case INITIALIZED:
+                playbackService.setStartWhenPrepared(true);
+                playbackService.prepare();
+                break;
+        }
     }
 
     public boolean serviceAvailable() {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
index 2eee1ac87..8d9151396 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Timeline.java
@@ -2,7 +2,10 @@ package de.danoeh.antennapod.core.util.playback;
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.TypedValue;
 
@@ -14,6 +17,7 @@ import org.jsoup.select.Elements;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.danoeh.antennapod.core.R;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.ShownotesProvider;
 
@@ -32,26 +36,32 @@ public class Timeline {
 
     private ShownotesProvider shownotesProvider;
 
-
-    private final String colorString;
+    private final String noShownotesLabel;
+    private final String colorPrimaryString;
+    private final String colorSecondaryString;
     private final int pageMargin;
 
     public Timeline(Context context, ShownotesProvider shownotesProvider) {
         if (shownotesProvider == null) throw new IllegalArgumentException("shownotesProvider = null");
         this.shownotesProvider = shownotesProvider;
 
-        TypedArray res = context
-                .getTheme()
-                .obtainStyledAttributes(
-                        new int[]{android.R.attr.textColorPrimary});
-        int colorResource = res.getColor(0, 0);
-        colorString = String.format("#%06X",
-                0xFFFFFF & colorResource);
+        noShownotesLabel = context.getString(R.string.no_shownotes_label);
+
+        TypedArray res = context.getTheme().obtainStyledAttributes(
+                new int[]{ android.R.attr.textColorPrimary});
+        @ColorInt int col = res.getColor(0, 0);
+        colorPrimaryString = "rgba(" + Color.red(col) + "," + Color.green(col) + "," +
+                Color.blue(col) + "," + (Color.alpha(col)/256.0) + ")";
+        res.recycle();
+        res = context.getTheme().obtainStyledAttributes(
+                new int[]{android.R.attr.textColorSecondary});
+        col = res.getColor(0, 0);
+        colorSecondaryString = "rgba(" + Color.red(col) + "," + Color.green(col) + "," +
+                Color.blue(col) + "," + (Color.alpha(col)/256.0) + ")";
         res.recycle();
 
-        pageMargin = (int) TypedValue.applyDimension(
-                TypedValue.COMPLEX_UNIT_DIP, 8, context.getResources()
-                        .getDisplayMetrics()
+        pageMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8,
+                context.getResources().getDisplayMetrics()
         );
     }
 
@@ -82,9 +92,24 @@ public class Timeline {
             e.printStackTrace();
             return null;
         }
-        if (shownotes == null) {
-            Log.d(TAG, "shownotesProvider contained no shownotes. Returning empty string");
-            return "";
+
+        if(TextUtils.isEmpty(shownotes)) {
+            Log.d(TAG, "shownotesProvider contained no shownotes. Returning 'no shownotes' message");
+            shownotes ="<html>" +
+                    "<head>" +
+                    "<style type='text/css'>" +
+                    "html, body { margin: 0; padding: 0; width: 100%; height: 100%; } " +
+                    "html { display: table; }" +
+                    "body { display: table-cell; vertical-align: middle; text-align:center;" +
+                    "-webkit-text-size-adjust: none; font-size: 87%; color: " + colorSecondaryString + ";} " +
+                    "</style>" +
+                    "</head>" +
+                    "<body>" +
+                    "<p>" + noShownotesLabel + "</p>" +
+                    "</body>" +
+                    "</html>";
+            Log.d(TAG, "shownotes: " + shownotes);
+            return shownotes;
         }
 
         // replace ASCII line breaks with HTML ones if shownotes don't contain HTML line breaks already
@@ -95,7 +120,7 @@ public class Timeline {
         Document document = Jsoup.parse(shownotes);
 
         // apply style
-        String styleStr = String.format(WEBVIEW_STYLE, colorString, "100%", pageMargin,
+        String styleStr = String.format(WEBVIEW_STYLE, colorPrimaryString, "100%", pageMargin,
                 pageMargin, pageMargin, pageMargin);
         document.head().appendElement("style").attr("type", "text/css").text(styleStr);
 
@@ -125,8 +150,7 @@ public class Timeline {
                 element.html(buffer.toString());
             }
         }
-
-        Log.i(TAG, "Out: " + document.toString());
+        
         return document.toString();
     }
 
@@ -148,7 +172,7 @@ public class Timeline {
 
             try {
                 if (m.find()) {
-                    return Integer.valueOf(m.group(1));
+                    return Integer.parseInt(m.group(1));
                 }
             } catch (NumberFormatException e) {
                 e.printStackTrace();
diff --git a/core/src/main/res/drawable-hdpi-v11/ic_stat_antenna_default.png b/core/src/main/res/drawable-hdpi-v11/ic_stat_antenna_default.png
index 37d73c734..af99f4b3b 100644
Binary files a/core/src/main/res/drawable-hdpi-v11/ic_stat_antenna_default.png and b/core/src/main/res/drawable-hdpi-v11/ic_stat_antenna_default.png differ
diff --git a/core/src/main/res/drawable-hdpi-v11/ic_stat_authentication.png b/core/src/main/res/drawable-hdpi-v11/ic_stat_authentication.png
index ad148cc6b..398dffa4b 100755
Binary files a/core/src/main/res/drawable-hdpi-v11/ic_stat_authentication.png and b/core/src/main/res/drawable-hdpi-v11/ic_stat_authentication.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_add_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_add_grey600_24dp.png
index 492c8f880..69efaccd1 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_add_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_add_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_add_white_24dp.png
index 481643ecd..023e5d21a 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_add_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_add_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_av_fast_forward_80dp.png b/core/src/main/res/drawable-hdpi/ic_av_fast_forward_80dp.png
index a32968a19..43783fbce 100755
Binary files a/core/src/main/res/drawable-hdpi/ic_av_fast_forward_80dp.png and b/core/src/main/res/drawable-hdpi/ic_av_fast_forward_80dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_av_pause_circle_outline_80dp.png b/core/src/main/res/drawable-hdpi/ic_av_pause_circle_outline_80dp.png
index 6f9df0934..115f7ebef 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_av_pause_circle_outline_80dp.png and b/core/src/main/res/drawable-hdpi/ic_av_pause_circle_outline_80dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_av_play_circle_outline_80dp.png b/core/src/main/res/drawable-hdpi/ic_av_play_circle_outline_80dp.png
index bddb0b024..392c87bd2 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_av_play_circle_outline_80dp.png and b/core/src/main/res/drawable-hdpi/ic_av_play_circle_outline_80dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_av_rewind_80dp.png b/core/src/main/res/drawable-hdpi/ic_av_rewind_80dp.png
index e39de4dcf..41052af65 100755
Binary files a/core/src/main/res/drawable-hdpi/ic_av_rewind_80dp.png and b/core/src/main/res/drawable-hdpi/ic_av_rewind_80dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_cancel_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_cancel_grey600_24dp.png
index 1f4fd985f..6a2ca5023 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_cancel_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_cancel_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png
index 794b7b780..9698d4b7d 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_check_box_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_check_box_grey600_24dp.png
index e4e833242..187a426a8 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_check_box_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_check_box_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_grey600_24dp.png
index 4f1a804b3..076773bca 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_white_24dp.png
index 6dbf83c58..ecaf0d5be 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_check_box_outline_blank_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_check_box_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_check_box_white_24dp.png
index d3f636f13..5ce64cc5f 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_check_box_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_check_box_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_create_new_folder_grey600_24dp.png
index bfe98fd07..75c703ae4 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_create_new_folder_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_create_new_folder_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png
index a8b0ada87..e6ae7f36b 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_create_new_folder_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png
index b72a9f3c6..501e60fa0 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
index a9eac0ca7..4d8ce49e3 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_delete_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_delete_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_description_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_description_grey600_36dp.png
deleted file mode 100644
index dd7d0734d..000000000
Binary files a/core/src/main/res/drawable-hdpi/ic_description_grey600_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/ic_description_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_description_white_36dp.png
deleted file mode 100644
index 93aa3032a..000000000
Binary files a/core/src/main/res/drawable-hdpi/ic_description_white_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/ic_done_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_done_grey600_24dp.png
index 6e42e1359..72eea4a8d 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_done_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_done_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_done_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_done_white_24dp.png
index f42a0e2d2..9b4047a41 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_done_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_done_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_drag_vertical_grey600_48dp.9.png b/core/src/main/res/drawable-hdpi/ic_drag_vertical_grey600_48dp.9.png
index f2d9906c6..a0b47594b 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_drag_vertical_grey600_48dp.9.png and b/core/src/main/res/drawable-hdpi/ic_drag_vertical_grey600_48dp.9.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_drag_vertical_white_48dp.9.png b/core/src/main/res/drawable-hdpi/ic_drag_vertical_white_48dp.9.png
index a2a91938d..a4ce8fa7e 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_drag_vertical_white_48dp.9.png and b/core/src/main/res/drawable-hdpi/ic_drag_vertical_white_48dp.9.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_expand_more_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_expand_more_grey600_36dp.png
index 0f0ddf717..96ed70a40 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_expand_more_grey600_36dp.png and b/core/src/main/res/drawable-hdpi/ic_expand_more_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png
index 724eb1f7a..f3c628e77 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png and b/core/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_24dp.png
index 4d1c1d4ae..df9e662c1 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_36dp.png
index deeff701f..59ae40266 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_36dp.png and b/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_fast_forward_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_fast_forward_white_24dp.png
index 03a54ee75..2d61b31f1 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_fast_forward_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_fast_forward_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_fast_forward_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_fast_forward_white_36dp.png
index 60e3decf6..e5ae251d3 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_fast_forward_white_36dp.png and b/core/src/main/res/drawable-hdpi/ic_fast_forward_white_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_24dp.png
index 9866ee629..f661ca723 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_36dp.png
index 8b9bfd34b..d36891a8d 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_36dp.png and b/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_24dp.png
index b4f526e62..ab8b48ec3 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_36dp.png
index 5d9d35f70..75796d7a9 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_36dp.png and b/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_feed_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_feed_grey600_24dp.png
index d1ad6629d..c09c73441 100755
Binary files a/core/src/main/res/drawable-hdpi/ic_feed_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_feed_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_feed_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_feed_white_24dp.png
index 9ff662fca..43183d393 100755
Binary files a/core/src/main/res/drawable-hdpi/ic_feed_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_feed_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_file_download_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_file_download_grey600_24dp.png
index c2222fb8e..62caf8392 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_file_download_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_file_download_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
index 46aeab458..8300268dc 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_filter_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_filter_grey600_24dp.png
index 83c564377..0d2f6ccb4 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_filter_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_filter_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_filter_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_filter_white_24dp.png
index e3517a57d..ea6f9078e 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_filter_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_filter_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_hearing_grey600_18dp.png b/core/src/main/res/drawable-hdpi/ic_hearing_grey600_18dp.png
index 294523814..2452cfa92 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_hearing_grey600_18dp.png and b/core/src/main/res/drawable-hdpi/ic_hearing_grey600_18dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_hearing_white_18dp.png b/core/src/main/res/drawable-hdpi/ic_hearing_white_18dp.png
index 11114b568..96a06141a 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_hearing_white_18dp.png and b/core/src/main/res/drawable-hdpi/ic_hearing_white_18dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_history_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_history_grey600_24dp.png
index f87403fa5..f02be50e2 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_history_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_history_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_history_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_history_white_24dp.png
index b2b1332e1..a0756f264 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_history_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_history_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_grey600_24dp.png
index 62dd8ef48..e56fbf224 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_white_24dp.png
index 5bb43b464..dccf44930 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_indeterminate_check_box_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_info_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_info_grey600_24dp.png
index 713a9ba9a..754299c4a 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_info_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_info_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_info_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_info_white_24dp.png
index f4b88742d..61ca3fee4 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_info_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_info_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_launcher.png b/core/src/main/res/drawable-hdpi/ic_launcher.png
index 994b763cc..8bd22b54a 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_launcher.png and b/core/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_list_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_list_grey600_24dp.png
index 2aee6f902..11c973d3d 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_list_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_list_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_list_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_list_white_24dp.png
index 436113d27..4f1e57ec1 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_list_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_list_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_lock_closed_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_lock_closed_grey600_24dp.png
index b6dba1002..3e52fd88d 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_lock_closed_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_lock_closed_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_lock_closed_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_lock_closed_white_24dp.png
index 5c60ab08a..2260411cb 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_lock_closed_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_lock_closed_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_lock_open_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_lock_open_grey600_24dp.png
index a99e9f2b6..a42417431 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_lock_open_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_lock_open_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png
index 61c623ce2..7bde52e12 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_more_vert_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_more_vert_grey600_24dp.png
deleted file mode 100644
index e141502a6..000000000
Binary files a/core/src/main/res/drawable-hdpi/ic_more_vert_grey600_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png
deleted file mode 100644
index fdc4a5ad2..000000000
Binary files a/core/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/ic_new.png b/core/src/main/res/drawable-hdpi/ic_new.png
deleted file mode 100755
index 8ff519052..000000000
Binary files a/core/src/main/res/drawable-hdpi/ic_new.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/ic_new_dark.png b/core/src/main/res/drawable-hdpi/ic_new_dark.png
deleted file mode 100755
index c8581e01c..000000000
Binary files a/core/src/main/res/drawable-hdpi/ic_new_dark.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/ic_new_releases_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_new_releases_grey600_24dp.png
index 7a08c4138..2aa5de2ad 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_new_releases_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_new_releases_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png
index 0d08f329c..8f109572b 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_pause_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_pause_grey600_24dp.png
index 711e0cf94..7281f37e1 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_pause_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_pause_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_pause_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_pause_grey600_36dp.png
index 5e884dfe8..dde9bb25c 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_pause_grey600_36dp.png and b/core/src/main/res/drawable-hdpi/ic_pause_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_pause_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_pause_white_24dp.png
index b4bdbb558..1701f34b0 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_pause_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_pause_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_pause_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_pause_white_36dp.png
index da17d12ba..1d024393a 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_pause_white_36dp.png and b/core/src/main/res/drawable-hdpi/ic_pause_white_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_24dp.png
index 264416933..b540e4a63 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_36dp.png
index 8af4c6cd6..a12b921e4 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_36dp.png and b/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png
index 164385d04..f77ad6b57 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png
index 0cd5cb61a..2b8e3513f 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png and b/core/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png
index 51cc4dbd1..ec8ac3041 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
index cd16fdd50..db069b266 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_remove_red_eye_grey600_18dp.png b/core/src/main/res/drawable-hdpi/ic_remove_red_eye_grey600_18dp.png
index c4df13afa..4f1af39ab 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_remove_red_eye_grey600_18dp.png and b/core/src/main/res/drawable-hdpi/ic_remove_red_eye_grey600_18dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_remove_red_eye_white_18dp.png b/core/src/main/res/drawable-hdpi/ic_remove_red_eye_white_18dp.png
index fdf524010..abc338d51 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_remove_red_eye_white_18dp.png and b/core/src/main/res/drawable-hdpi/ic_remove_red_eye_white_18dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_sd_storage_grey600_36dp.png
index 0890b2e5c..26a39bec9 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_sd_storage_grey600_36dp.png and b/core/src/main/res/drawable-hdpi/ic_sd_storage_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_sd_storage_white_36dp.png
index d9bfcfbfb..751e0e360 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_sd_storage_white_36dp.png and b/core/src/main/res/drawable-hdpi/ic_sd_storage_white_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_search_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_search_grey600_24dp.png
index ba65a135b..022f081e0 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_search_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_search_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_search_white_24dp.png
index a2fc5b2e7..cc6d5da86 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_search_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_search_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png
index 20d2b66e0..a7c216d3d 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_grey600_24dp.png
index 9c0172ad0..f8f215236 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_white_24dp.png
index 9b5a9fb47..eb2611f95 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
index f9a8915fd..14c7da0c2 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_settings_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_settings_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_share_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_share_grey600_24dp.png
index 987e9b86c..9457cac52 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_share_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_share_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_share_white_24dp.png
index 93b3c219c..80c24d993 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_share_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_share_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_skip_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_skip_grey600_36dp.png
index edbc95b05..6e1dffc93 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_skip_grey600_36dp.png and b/core/src/main/res/drawable-hdpi/ic_skip_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_skip_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_skip_white_36dp.png
index cbfb262d8..760ec9987 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_skip_white_36dp.png and b/core/src/main/res/drawable-hdpi/ic_skip_white_36dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_sleep_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_sleep_grey600_24dp.png
index 809066499..f25063071 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_sleep_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_sleep_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_sleep_off_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_sleep_off_grey600_24dp.png
index 4496a320d..0db6381ea 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_sleep_off_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_sleep_off_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_sleep_off_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_sleep_off_white_24dp.png
index 79684ab65..c614c2b3d 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_sleep_off_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_sleep_off_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_sleep_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_sleep_white_24dp.png
index f0df6032c..5d8072149 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_sleep_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_sleep_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_sort_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_sort_grey600_24dp.png
index 0a52de9fe..715dea65f 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_sort_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_sort_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_sort_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_sort_white_24dp.png
index 26014a542..9cdac3582 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_sort_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_sort_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_star_border_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_star_border_grey600_24dp.png
index 006410bc3..6b5bc858a 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_star_border_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_star_border_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_star_border_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_star_border_white_24dp.png
index 27831192f..d59bc4792 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_star_border_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_star_border_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_star_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_star_grey600_24dp.png
index 93f70a024..e4fe7f43a 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_star_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_star_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_star_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_star_white_24dp.png
index e8619b780..394c5a60c 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_star_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_star_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_stat_antenna_default.png b/core/src/main/res/drawable-hdpi/ic_stat_antenna_default.png
index 36d502492..fb15f7ee1 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_stat_antenna_default.png and b/core/src/main/res/drawable-hdpi/ic_stat_antenna_default.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_stat_authentication.png b/core/src/main/res/drawable-hdpi/ic_stat_authentication.png
index c6b5efd33..f40820ef7 100755
Binary files a/core/src/main/res/drawable-hdpi/ic_stat_authentication.png and b/core/src/main/res/drawable-hdpi/ic_stat_authentication.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_timer_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_timer_grey600_24dp.png
deleted file mode 100644
index a5fdd2c40..000000000
Binary files a/core/src/main/res/drawable-hdpi/ic_timer_grey600_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/ic_timer_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_timer_white_24dp.png
deleted file mode 100644
index 864291fa7..000000000
Binary files a/core/src/main/res/drawable-hdpi/ic_timer_white_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/ic_toc_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_toc_grey600_36dp.png
deleted file mode 100644
index e299eb41b..000000000
Binary files a/core/src/main/res/drawable-hdpi/ic_toc_grey600_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/ic_toc_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_toc_white_36dp.png
deleted file mode 100644
index bfdc05d9e..000000000
Binary files a/core/src/main/res/drawable-hdpi/ic_toc_white_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-hdpi/ic_web_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_web_grey600_24dp.png
index 1942f3f12..57c236892 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_web_grey600_24dp.png and b/core/src/main/res/drawable-hdpi/ic_web_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_web_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_web_white_24dp.png
index 952404cbc..410ef41e9 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_web_white_24dp.png and b/core/src/main/res/drawable-hdpi/ic_web_white_24dp.png differ
diff --git a/core/src/main/res/drawable-hdpi/ic_widget_preview.png b/core/src/main/res/drawable-hdpi/ic_widget_preview.png
index 8b583b285..85a537154 100644
Binary files a/core/src/main/res/drawable-hdpi/ic_widget_preview.png and b/core/src/main/res/drawable-hdpi/ic_widget_preview.png differ
diff --git a/core/src/main/res/drawable-hdpi/navigation_up.png b/core/src/main/res/drawable-hdpi/navigation_up.png
index a2cf2ba52..370092e7e 100755
Binary files a/core/src/main/res/drawable-hdpi/navigation_up.png and b/core/src/main/res/drawable-hdpi/navigation_up.png differ
diff --git a/core/src/main/res/drawable-hdpi/navigation_up_dark.png b/core/src/main/res/drawable-hdpi/navigation_up_dark.png
index f2374a323..2b520c553 100755
Binary files a/core/src/main/res/drawable-hdpi/navigation_up_dark.png and b/core/src/main/res/drawable-hdpi/navigation_up_dark.png differ
diff --git a/core/src/main/res/drawable-hdpi/stat_notify_sync.png b/core/src/main/res/drawable-hdpi/stat_notify_sync.png
index ca6c68e4e..f70373d50 100644
Binary files a/core/src/main/res/drawable-hdpi/stat_notify_sync.png and b/core/src/main/res/drawable-hdpi/stat_notify_sync.png differ
diff --git a/core/src/main/res/drawable-hdpi/stat_notify_sync_error.png b/core/src/main/res/drawable-hdpi/stat_notify_sync_error.png
index 84f19cd4e..222e9e8b1 100644
Binary files a/core/src/main/res/drawable-hdpi/stat_notify_sync_error.png and b/core/src/main/res/drawable-hdpi/stat_notify_sync_error.png differ
diff --git a/core/src/main/res/drawable-ldpi-v11/ic_stat_antenna_default.png b/core/src/main/res/drawable-ldpi-v11/ic_stat_antenna_default.png
index e44f42510..ddf545c0b 100644
Binary files a/core/src/main/res/drawable-ldpi-v11/ic_stat_antenna_default.png and b/core/src/main/res/drawable-ldpi-v11/ic_stat_antenna_default.png differ
diff --git a/core/src/main/res/drawable-ldpi/ic_launcher.png b/core/src/main/res/drawable-ldpi/ic_launcher.png
index 546090dd2..494468020 100644
Binary files a/core/src/main/res/drawable-ldpi/ic_launcher.png and b/core/src/main/res/drawable-ldpi/ic_launcher.png differ
diff --git a/core/src/main/res/drawable-ldpi/ic_stat_antenna_default.png b/core/src/main/res/drawable-ldpi/ic_stat_antenna_default.png
index 63d72970d..501dfa848 100644
Binary files a/core/src/main/res/drawable-ldpi/ic_stat_antenna_default.png and b/core/src/main/res/drawable-ldpi/ic_stat_antenna_default.png differ
diff --git a/core/src/main/res/drawable-mdpi-v11/ic_stat_antenna_default.png b/core/src/main/res/drawable-mdpi-v11/ic_stat_antenna_default.png
index 8808dedc7..41fd20655 100644
Binary files a/core/src/main/res/drawable-mdpi-v11/ic_stat_antenna_default.png and b/core/src/main/res/drawable-mdpi-v11/ic_stat_antenna_default.png differ
diff --git a/core/src/main/res/drawable-mdpi-v11/ic_stat_authentication.png b/core/src/main/res/drawable-mdpi-v11/ic_stat_authentication.png
index de69b17c0..550b56b33 100755
Binary files a/core/src/main/res/drawable-mdpi-v11/ic_stat_authentication.png and b/core/src/main/res/drawable-mdpi-v11/ic_stat_authentication.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_add_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_add_grey600_24dp.png
index 07858bc09..27e311f39 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_add_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_add_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_add_white_24dp.png
index 977dd3427..3856041d7 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_add_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_add_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_av_fast_forward_80dp.png b/core/src/main/res/drawable-mdpi/ic_av_fast_forward_80dp.png
index 69b81c10d..0bf060d89 100755
Binary files a/core/src/main/res/drawable-mdpi/ic_av_fast_forward_80dp.png and b/core/src/main/res/drawable-mdpi/ic_av_fast_forward_80dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_av_pause_circle_outline_80dp.png b/core/src/main/res/drawable-mdpi/ic_av_pause_circle_outline_80dp.png
index 08c523d48..1e71c271f 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_av_pause_circle_outline_80dp.png and b/core/src/main/res/drawable-mdpi/ic_av_pause_circle_outline_80dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_av_play_circle_outline_80dp.png b/core/src/main/res/drawable-mdpi/ic_av_play_circle_outline_80dp.png
index 27738aacb..d305f0c69 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_av_play_circle_outline_80dp.png and b/core/src/main/res/drawable-mdpi/ic_av_play_circle_outline_80dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_av_rewind_80dp.png b/core/src/main/res/drawable-mdpi/ic_av_rewind_80dp.png
index 5355abfd6..99ac9f3c9 100755
Binary files a/core/src/main/res/drawable-mdpi/ic_av_rewind_80dp.png and b/core/src/main/res/drawable-mdpi/ic_av_rewind_80dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_cancel_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_cancel_grey600_24dp.png
index a7a30cc24..e91e2cbf6 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_cancel_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_cancel_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png
index df332ef3c..c433d9ba0 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_check_box_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_check_box_grey600_24dp.png
index a6bdce736..d5bdfa433 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_check_box_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_check_box_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_grey600_24dp.png
index cd90223d1..aefe5b6c1 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_white_24dp.png
index 8a014bda1..a3a588c64 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_check_box_outline_blank_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_check_box_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_check_box_white_24dp.png
index 0811a3493..dc94cdbf4 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_check_box_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_check_box_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_create_new_folder_grey600_24dp.png
index eeed34653..45c0c29bf 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_create_new_folder_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_create_new_folder_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png
index 3b9eaa827..02167a9f0 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_create_new_folder_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png
index e757fdb07..3bf363a2b 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
index e4ea52ef2..6b44a07da 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_delete_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_delete_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_description_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_description_grey600_36dp.png
deleted file mode 100644
index ac18b5750..000000000
Binary files a/core/src/main/res/drawable-mdpi/ic_description_grey600_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/ic_description_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_description_white_36dp.png
deleted file mode 100644
index f5612717f..000000000
Binary files a/core/src/main/res/drawable-mdpi/ic_description_white_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/ic_done_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_done_grey600_24dp.png
index 9f860915d..73f72da71 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_done_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_done_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_done_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_done_white_24dp.png
index e91f9048b..e094dee36 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_done_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_done_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_drag_vertical_grey600_48dp.9.png b/core/src/main/res/drawable-mdpi/ic_drag_vertical_grey600_48dp.9.png
index 0d8277204..7cd66845b 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_drag_vertical_grey600_48dp.9.png and b/core/src/main/res/drawable-mdpi/ic_drag_vertical_grey600_48dp.9.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_drag_vertical_white_48dp.9.png b/core/src/main/res/drawable-mdpi/ic_drag_vertical_white_48dp.9.png
index 15d016e89..3d1fd0fe3 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_drag_vertical_white_48dp.9.png and b/core/src/main/res/drawable-mdpi/ic_drag_vertical_white_48dp.9.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_expand_more_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_expand_more_grey600_36dp.png
index 00b9f645c..4d8cd8e99 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_expand_more_grey600_36dp.png and b/core/src/main/res/drawable-mdpi/ic_expand_more_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png
index 6c2476660..682bcf79f 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png and b/core/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_24dp.png
index c2864a726..c67fc25f1 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_36dp.png
index 4d1c1d4ae..df9e662c1 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_36dp.png and b/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_fast_forward_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_fast_forward_white_24dp.png
index 215099f9e..fceffcb7b 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_fast_forward_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_fast_forward_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_fast_forward_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_fast_forward_white_36dp.png
index 03a54ee75..2d61b31f1 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_fast_forward_white_36dp.png and b/core/src/main/res/drawable-mdpi/ic_fast_forward_white_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_24dp.png
index 75adfc97e..de04575da 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_36dp.png
index 9866ee629..f661ca723 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_36dp.png and b/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_24dp.png
index a050e1bb8..bfb476b4a 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_36dp.png
index b4f526e62..ab8b48ec3 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_36dp.png and b/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_feed_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_feed_grey600_24dp.png
index 3932b6eef..8037c315e 100755
Binary files a/core/src/main/res/drawable-mdpi/ic_feed_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_feed_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_feed_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_feed_white_24dp.png
index 9c2a1eb6e..026cac8f2 100755
Binary files a/core/src/main/res/drawable-mdpi/ic_feed_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_feed_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_file_download_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_file_download_grey600_24dp.png
index b3ef8ce73..74d554774 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_file_download_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_file_download_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png
index e089466de..b09c53c86 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_filter_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_filter_grey600_24dp.png
index e1e55d72b..b78e7d4d2 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_filter_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_filter_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_filter_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_filter_white_24dp.png
index 7d72e7562..59a2ec755 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_filter_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_filter_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_hearing_grey600_18dp.png b/core/src/main/res/drawable-mdpi/ic_hearing_grey600_18dp.png
index df26536f9..ea44e3f07 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_hearing_grey600_18dp.png and b/core/src/main/res/drawable-mdpi/ic_hearing_grey600_18dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_hearing_white_18dp.png b/core/src/main/res/drawable-mdpi/ic_hearing_white_18dp.png
index 0771a106d..78e98fe8d 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_hearing_white_18dp.png and b/core/src/main/res/drawable-mdpi/ic_hearing_white_18dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_history_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_history_grey600_24dp.png
index 0a62d358f..397972f67 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_history_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_history_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_history_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_history_white_24dp.png
index b93da1006..bcc729de0 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_history_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_history_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_grey600_24dp.png
index 52812c42f..0e6ce58e3 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_white_24dp.png
index 20a9fe5d7..c496b4648 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_indeterminate_check_box_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_info_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_info_grey600_24dp.png
index 2537c5f42..b5c14a369 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_info_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_info_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_info_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_info_white_24dp.png
index 34f980085..6dbeeb0b7 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_info_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_info_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_launcher.png b/core/src/main/res/drawable-mdpi/ic_launcher.png
index 403dfabc4..219e8c5ab 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_launcher.png and b/core/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_list_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_list_grey600_24dp.png
index c5c2fc195..ac5b3bed4 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_list_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_list_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_list_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_list_white_24dp.png
index 5e51ed478..15d8fc2bb 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_list_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_list_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_lock_closed_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_lock_closed_grey600_24dp.png
index f1627ce34..f9415627e 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_lock_closed_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_lock_closed_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_lock_closed_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_lock_closed_white_24dp.png
index 8f18d11e6..1203a4406 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_lock_closed_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_lock_closed_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_lock_open_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_lock_open_grey600_24dp.png
index ada8d3be4..192e27ccd 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_lock_open_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_lock_open_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png
index 72d01c406..232b4bfb4 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_more_vert_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_more_vert_grey600_24dp.png
deleted file mode 100644
index 4ed34354b..000000000
Binary files a/core/src/main/res/drawable-mdpi/ic_more_vert_grey600_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png
deleted file mode 100644
index 1d8ad18a0..000000000
Binary files a/core/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/ic_new.png b/core/src/main/res/drawable-mdpi/ic_new.png
deleted file mode 100755
index 84994bd10..000000000
Binary files a/core/src/main/res/drawable-mdpi/ic_new.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/ic_new_dark.png b/core/src/main/res/drawable-mdpi/ic_new_dark.png
deleted file mode 100755
index b723618b4..000000000
Binary files a/core/src/main/res/drawable-mdpi/ic_new_dark.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/ic_new_releases_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_new_releases_grey600_24dp.png
index 494781a20..4b3ffdbdc 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_new_releases_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_new_releases_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png
index 36e3262a4..c5bb20f49 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_pause_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_pause_grey600_24dp.png
index 06abcb50b..126ee03ef 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_pause_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_pause_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_pause_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_pause_grey600_36dp.png
index 711e0cf94..7281f37e1 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_pause_grey600_36dp.png and b/core/src/main/res/drawable-mdpi/ic_pause_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_pause_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_pause_white_24dp.png
index 026f38854..2272d478c 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_pause_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_pause_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_pause_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_pause_white_36dp.png
index b4bdbb558..1701f34b0 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_pause_white_36dp.png and b/core/src/main/res/drawable-mdpi/ic_pause_white_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_24dp.png
index 4ff5decb0..9c8f2c555 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_36dp.png
index 264416933..b540e4a63 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_36dp.png and b/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png
index 8d1e433a5..172c211ab 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png
index 164385d04..f77ad6b57 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png and b/core/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png
index c136c59fc..0e927f106 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
index 235c84f1e..79b5ec871 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_remove_red_eye_grey600_18dp.png b/core/src/main/res/drawable-mdpi/ic_remove_red_eye_grey600_18dp.png
index 9e840f03e..daa8e568e 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_remove_red_eye_grey600_18dp.png and b/core/src/main/res/drawable-mdpi/ic_remove_red_eye_grey600_18dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_remove_red_eye_white_18dp.png b/core/src/main/res/drawable-mdpi/ic_remove_red_eye_white_18dp.png
index 0bcba825f..a6b4ff0da 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_remove_red_eye_white_18dp.png and b/core/src/main/res/drawable-mdpi/ic_remove_red_eye_white_18dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_sd_storage_grey600_36dp.png
index f0c5ed4c3..26977a920 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_sd_storage_grey600_36dp.png and b/core/src/main/res/drawable-mdpi/ic_sd_storage_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_sd_storage_white_36dp.png
index 6595d2e1e..4aeb2e668 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_sd_storage_white_36dp.png and b/core/src/main/res/drawable-mdpi/ic_sd_storage_white_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_search_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_search_grey600_24dp.png
index 29954062c..c386dbb38 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_search_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_search_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_search_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_search_white_24dp.png
index dff1e3a8a..faefc59c8 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_search_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_search_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_grey600_24dp.png
index 8995d0f43..dafbeca33 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_white_24dp.png
index c31fa8309..ccf89acea 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_share_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_share_grey600_24dp.png
index ee0248838..42eb539de 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_share_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_share_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_share_white_24dp.png
index 4d0197223..9d2ef6655 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_share_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_share_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_skip_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_skip_grey600_36dp.png
index be0fcc765..229eeca47 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_skip_grey600_36dp.png and b/core/src/main/res/drawable-mdpi/ic_skip_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_skip_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_skip_white_36dp.png
index 893cf2c64..9032328d4 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_skip_white_36dp.png and b/core/src/main/res/drawable-mdpi/ic_skip_white_36dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_sleep_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_sleep_grey600_24dp.png
index ea511bf2a..df84861b9 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_sleep_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_sleep_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_sleep_off_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_sleep_off_grey600_24dp.png
index 7f631ad86..463b87d2f 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_sleep_off_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_sleep_off_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_sleep_off_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_sleep_off_white_24dp.png
index 795e318e3..942e7f380 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_sleep_off_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_sleep_off_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_sleep_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_sleep_white_24dp.png
index 4304a6bca..9f37b124d 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_sleep_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_sleep_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_sort_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_sort_grey600_24dp.png
index f527d0094..dc393caf7 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_sort_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_sort_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_sort_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_sort_white_24dp.png
index e28dd4592..3d84a4442 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_sort_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_sort_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_star_border_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_star_border_grey600_24dp.png
index dd9d11ba0..8b5275b11 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_star_border_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_star_border_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_star_border_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_star_border_white_24dp.png
index 104fb3c9d..edfd7d71d 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_star_border_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_star_border_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_star_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_star_grey600_24dp.png
index af84b71f2..246b43279 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_star_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_star_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_star_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_star_white_24dp.png
index 0ccebc7c8..c79334c61 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_star_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_star_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_stat_antenna_default.png b/core/src/main/res/drawable-mdpi/ic_stat_antenna_default.png
index 8b1206b51..152239888 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_stat_antenna_default.png and b/core/src/main/res/drawable-mdpi/ic_stat_antenna_default.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_stat_authentication.png b/core/src/main/res/drawable-mdpi/ic_stat_authentication.png
index cadfb9643..7fab11a83 100755
Binary files a/core/src/main/res/drawable-mdpi/ic_stat_authentication.png and b/core/src/main/res/drawable-mdpi/ic_stat_authentication.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_timer_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_timer_grey600_24dp.png
deleted file mode 100644
index 186887c30..000000000
Binary files a/core/src/main/res/drawable-mdpi/ic_timer_grey600_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/ic_timer_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_timer_white_24dp.png
deleted file mode 100644
index 735ed7a00..000000000
Binary files a/core/src/main/res/drawable-mdpi/ic_timer_white_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/ic_toc_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_toc_grey600_36dp.png
deleted file mode 100644
index 23bec7945..000000000
Binary files a/core/src/main/res/drawable-mdpi/ic_toc_grey600_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/ic_toc_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_toc_white_36dp.png
deleted file mode 100644
index dc03b34b9..000000000
Binary files a/core/src/main/res/drawable-mdpi/ic_toc_white_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-mdpi/ic_web_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_web_grey600_24dp.png
index cdbce22a7..c620bc4dd 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_web_grey600_24dp.png and b/core/src/main/res/drawable-mdpi/ic_web_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/ic_web_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_web_white_24dp.png
index 3602c4c48..f59e16fa9 100644
Binary files a/core/src/main/res/drawable-mdpi/ic_web_white_24dp.png and b/core/src/main/res/drawable-mdpi/ic_web_white_24dp.png differ
diff --git a/core/src/main/res/drawable-mdpi/navigation_up.png b/core/src/main/res/drawable-mdpi/navigation_up.png
index 1ee248a79..520e11da6 100755
Binary files a/core/src/main/res/drawable-mdpi/navigation_up.png and b/core/src/main/res/drawable-mdpi/navigation_up.png differ
diff --git a/core/src/main/res/drawable-mdpi/navigation_up_dark.png b/core/src/main/res/drawable-mdpi/navigation_up_dark.png
index 8ef44cbac..e53627915 100755
Binary files a/core/src/main/res/drawable-mdpi/navigation_up_dark.png and b/core/src/main/res/drawable-mdpi/navigation_up_dark.png differ
diff --git a/core/src/main/res/drawable-mdpi/stat_notify_sync.png b/core/src/main/res/drawable-mdpi/stat_notify_sync.png
index 516b65bd9..02066f847 100644
Binary files a/core/src/main/res/drawable-mdpi/stat_notify_sync.png and b/core/src/main/res/drawable-mdpi/stat_notify_sync.png differ
diff --git a/core/src/main/res/drawable-mdpi/stat_notify_sync_error.png b/core/src/main/res/drawable-mdpi/stat_notify_sync_error.png
index c3ed306cf..d797f59c3 100644
Binary files a/core/src/main/res/drawable-mdpi/stat_notify_sync_error.png and b/core/src/main/res/drawable-mdpi/stat_notify_sync_error.png differ
diff --git a/core/src/main/res/drawable-xhdpi-v11/ic_stat_antenna_default.png b/core/src/main/res/drawable-xhdpi-v11/ic_stat_antenna_default.png
index 59de64c87..30431ed6a 100644
Binary files a/core/src/main/res/drawable-xhdpi-v11/ic_stat_antenna_default.png and b/core/src/main/res/drawable-xhdpi-v11/ic_stat_antenna_default.png differ
diff --git a/core/src/main/res/drawable-xhdpi-v11/ic_stat_authentication.png b/core/src/main/res/drawable-xhdpi-v11/ic_stat_authentication.png
index f58fb21df..e83cbc333 100755
Binary files a/core/src/main/res/drawable-xhdpi-v11/ic_stat_authentication.png and b/core/src/main/res/drawable-xhdpi-v11/ic_stat_authentication.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_add_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_add_grey600_24dp.png
index 0d8af34b9..19ed567e9 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_add_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_add_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
index 67042105d..67bb598e5 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_add_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_add_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_av_fast_forward_80dp.png b/core/src/main/res/drawable-xhdpi/ic_av_fast_forward_80dp.png
index ed34e22a1..270dc9bf8 100755
Binary files a/core/src/main/res/drawable-xhdpi/ic_av_fast_forward_80dp.png and b/core/src/main/res/drawable-xhdpi/ic_av_fast_forward_80dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_av_pause_circle_outline_80dp.png b/core/src/main/res/drawable-xhdpi/ic_av_pause_circle_outline_80dp.png
index 3288241e7..2e0b8ff6f 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_av_pause_circle_outline_80dp.png and b/core/src/main/res/drawable-xhdpi/ic_av_pause_circle_outline_80dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_av_play_circle_outline_80dp.png b/core/src/main/res/drawable-xhdpi/ic_av_play_circle_outline_80dp.png
index db7b695e9..990ae524a 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_av_play_circle_outline_80dp.png and b/core/src/main/res/drawable-xhdpi/ic_av_play_circle_outline_80dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_av_rewind_80dp.png b/core/src/main/res/drawable-xhdpi/ic_av_rewind_80dp.png
index 3dc7bf5cb..d94a40811 100755
Binary files a/core/src/main/res/drawable-xhdpi/ic_av_rewind_80dp.png and b/core/src/main/res/drawable-xhdpi/ic_av_rewind_80dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_cancel_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_cancel_grey600_24dp.png
index ce0da2222..2ad1ac3f5 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_cancel_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_cancel_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png
index e9e9c7a53..e8836a1b0 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_check_box_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_check_box_grey600_24dp.png
index f7c205dd2..e46ab71b4 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_check_box_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_check_box_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_grey600_24dp.png
index ea2ff8671..bb15a903a 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_white_24dp.png
index a615ee436..336682497 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_check_box_outline_blank_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_check_box_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_check_box_white_24dp.png
index 946cfea57..cdb4a3181 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_check_box_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_check_box_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_create_new_folder_grey600_24dp.png
index 82f0ad458..bb16eabce 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_create_new_folder_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_create_new_folder_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_create_new_folder_white_24dp.png
index aa54623c8..ae5448d24 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_create_new_folder_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_create_new_folder_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png
index c6bb43e8b..5ad22d0f1 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
index cdb230c2f..63f990408 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_description_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_description_grey600_36dp.png
deleted file mode 100644
index 50f854ea5..000000000
Binary files a/core/src/main/res/drawable-xhdpi/ic_description_grey600_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_description_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_description_white_36dp.png
deleted file mode 100644
index 60d988dd4..000000000
Binary files a/core/src/main/res/drawable-xhdpi/ic_description_white_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_done_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_done_grey600_24dp.png
index 36ed24eec..3f78a47a3 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_done_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_done_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_done_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_done_white_24dp.png
index e5024472a..5567661ac 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_done_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_done_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_drag_vertical_grey600_48dp.9.png b/core/src/main/res/drawable-xhdpi/ic_drag_vertical_grey600_48dp.9.png
index 8f335e274..83cb91561 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_drag_vertical_grey600_48dp.9.png and b/core/src/main/res/drawable-xhdpi/ic_drag_vertical_grey600_48dp.9.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_drag_vertical_white_48dp.9.png b/core/src/main/res/drawable-xhdpi/ic_drag_vertical_white_48dp.9.png
index ae9972926..4b030e169 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_drag_vertical_white_48dp.9.png and b/core/src/main/res/drawable-xhdpi/ic_drag_vertical_white_48dp.9.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_expand_more_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_expand_more_grey600_36dp.png
index 921249fb2..8e697365f 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_expand_more_grey600_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_expand_more_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_expand_more_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_expand_more_white_36dp.png
index f00aa8bd4..16b7c081e 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_expand_more_white_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_expand_more_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_24dp.png
index 6c26d6ea2..6f8b42221 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_36dp.png
index 169a3b386..521f7490b 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_24dp.png
index b7c86059b..2b34fb82d 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_36dp.png
index 8aec1abb0..2d9a7e3c9 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_24dp.png
index d1db46a23..9468020b7 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_36dp.png
index ccac2c273..ea5493251 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_24dp.png
index 379435f54..f4182f174 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_36dp.png
index 857a1aaa2..de9ec1d90 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_feed_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_feed_grey600_24dp.png
index 995aafb5c..84554ce5b 100755
Binary files a/core/src/main/res/drawable-xhdpi/ic_feed_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_feed_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_feed_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_feed_white_24dp.png
index 1495c4fa6..339113c20 100755
Binary files a/core/src/main/res/drawable-xhdpi/ic_feed_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_feed_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_file_download_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_file_download_grey600_24dp.png
index aa89d4977..0d42f1749 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_file_download_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_file_download_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png
index 990dfb82b..219f47167 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_filter_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_filter_grey600_24dp.png
index fdbb8eb4e..4c6a96eba 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_filter_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_filter_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_filter_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_filter_white_24dp.png
index 7e14f7fbf..9416c70ec 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_filter_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_filter_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_hearing_grey600_18dp.png b/core/src/main/res/drawable-xhdpi/ic_hearing_grey600_18dp.png
index a0c760e6f..d014684e1 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_hearing_grey600_18dp.png and b/core/src/main/res/drawable-xhdpi/ic_hearing_grey600_18dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_hearing_white_18dp.png b/core/src/main/res/drawable-xhdpi/ic_hearing_white_18dp.png
index 1b8722a7f..91adb4437 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_hearing_white_18dp.png and b/core/src/main/res/drawable-xhdpi/ic_hearing_white_18dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_history_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_history_grey600_24dp.png
index a098d8d0f..c0ffea719 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_history_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_history_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_history_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_history_white_24dp.png
index 7681ac8b8..3aa40c305 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_history_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_history_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_grey600_24dp.png
index e67d41cc1..3b0d3aa1a 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_white_24dp.png
index 48e52d596..57e478e9f 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_indeterminate_check_box_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_info_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_info_grey600_24dp.png
index 9dcb234fe..57f3ec5e3 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_info_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_info_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_info_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_info_white_24dp.png
index bee33abb7..e18df93a1 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_info_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_info_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_launcher.png b/core/src/main/res/drawable-xhdpi/ic_launcher.png
index 857a1b12e..2dbfd8874 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_launcher.png and b/core/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_list_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_list_grey600_24dp.png
index c51f8a258..030263ce3 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_list_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_list_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_list_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_list_white_24dp.png
index abefc200a..2b7253975 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_list_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_list_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_lock_closed_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_lock_closed_grey600_24dp.png
index ca35f6d0a..c6f6fa06c 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_lock_closed_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_lock_closed_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_lock_closed_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_lock_closed_white_24dp.png
index 01fb55ca1..873687188 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_lock_closed_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_lock_closed_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_lock_open_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_lock_open_grey600_24dp.png
index 11d9a4b8b..d82d4bd8b 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_lock_open_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_lock_open_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png
index 01ca4b56c..a5ed62d8a 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_more_vert_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_more_vert_grey600_24dp.png
deleted file mode 100644
index 7bc63a511..000000000
Binary files a/core/src/main/res/drawable-xhdpi/ic_more_vert_grey600_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_more_vert_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_more_vert_white_24dp.png
deleted file mode 100644
index 1b04eda04..000000000
Binary files a/core/src/main/res/drawable-xhdpi/ic_more_vert_white_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_new.png b/core/src/main/res/drawable-xhdpi/ic_new.png
deleted file mode 100755
index 447a9398b..000000000
Binary files a/core/src/main/res/drawable-xhdpi/ic_new.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_new_dark.png b/core/src/main/res/drawable-xhdpi/ic_new_dark.png
deleted file mode 100755
index 4a23d309c..000000000
Binary files a/core/src/main/res/drawable-xhdpi/ic_new_dark.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_new_releases_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_new_releases_grey600_24dp.png
index 655658557..a2bb4d1b8 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_new_releases_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_new_releases_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png
index 00a4daa62..e78b002f2 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_pause_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_pause_grey600_24dp.png
index 3ec598cfd..6708b4161 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_pause_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_pause_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_pause_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_pause_grey600_36dp.png
index 7efc88511..aeb13ebc4 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_pause_grey600_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_pause_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png
index 14b6d17d4..f49aed757 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png
index 72dfa9fa6..7192ad487 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_24dp.png
index 689fda259..6874b8236 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_36dp.png
index ba62a8102..dabd252ee 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png
index a55d19922..5b0110454 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png
index 043acd808..fff3e1f56 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png
index 7891efffa..b2f5463a8 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
index 5f89fc257..3dffcc846 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_grey600_18dp.png b/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_grey600_18dp.png
index 7047ed7ea..2039d9ce8 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_grey600_18dp.png and b/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_grey600_18dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_white_18dp.png b/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_white_18dp.png
index ef2023b52..6dd240bca 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_white_18dp.png and b/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_white_18dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_sd_storage_grey600_36dp.png
index 48cc94622..57162f5ca 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_sd_storage_grey600_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_sd_storage_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_sd_storage_white_36dp.png
index b440536f6..ced6247ca 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_sd_storage_white_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_sd_storage_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_search_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_search_grey600_24dp.png
index f9c0b2ec3..b0999b31d 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_search_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_search_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_search_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_search_white_24dp.png
index 043759acd..ee844ccdd 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_search_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_search_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png
index 2251d2bbb..5a70fdb99 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_grey600_24dp.png
index c30f31017..49813c945 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_white_24dp.png
index ea2313395..bac1560a2 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
index 12e5d100d..d0cf80051 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_share_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_share_grey600_24dp.png
index 88a0edd6c..e856dca31 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_share_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_share_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_share_white_24dp.png
index dd536bca2..82692971c 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_share_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_share_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_skip_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_skip_grey600_36dp.png
index 2e291dd19..31aa09ca2 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_skip_grey600_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_skip_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_skip_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_skip_white_36dp.png
index fa85f1899..e664f607c 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_skip_white_36dp.png and b/core/src/main/res/drawable-xhdpi/ic_skip_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_sleep_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sleep_grey600_24dp.png
index ae0787a26..2d8cb9a75 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_sleep_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_sleep_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_sleep_off_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sleep_off_grey600_24dp.png
index 026224c5e..6ba86245c 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_sleep_off_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_sleep_off_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_sleep_off_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sleep_off_white_24dp.png
index ef39d7279..b03fb39b4 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_sleep_off_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_sleep_off_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_sleep_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sleep_white_24dp.png
index 07e156172..4d03cc0dc 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_sleep_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_sleep_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_sort_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sort_grey600_24dp.png
index f2ef499ef..91447dc4c 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_sort_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_sort_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png
index 68b0b7ad3..6d4af1bcb 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_star_border_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_star_border_grey600_24dp.png
index 5160319b5..2bd46b7e7 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_star_border_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_star_border_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_star_border_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_star_border_white_24dp.png
index 33f9727d3..4eaf8b891 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_star_border_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_star_border_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_star_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_star_grey600_24dp.png
index 7a09ebc33..30f1e6ae6 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_star_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_star_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_star_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_star_white_24dp.png
index 288799f93..93d3b5d0c 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_star_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_star_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_stat_antenna_default.png b/core/src/main/res/drawable-xhdpi/ic_stat_antenna_default.png
index 50d73271d..3d8a046a8 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_stat_antenna_default.png and b/core/src/main/res/drawable-xhdpi/ic_stat_antenna_default.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_stat_authentication.png b/core/src/main/res/drawable-xhdpi/ic_stat_authentication.png
index 4adfb636c..200b60c96 100755
Binary files a/core/src/main/res/drawable-xhdpi/ic_stat_authentication.png and b/core/src/main/res/drawable-xhdpi/ic_stat_authentication.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_timer_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_timer_grey600_24dp.png
deleted file mode 100644
index 23149552f..000000000
Binary files a/core/src/main/res/drawable-xhdpi/ic_timer_grey600_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_timer_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_timer_white_24dp.png
deleted file mode 100644
index 896d9dcf2..000000000
Binary files a/core/src/main/res/drawable-xhdpi/ic_timer_white_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_toc_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_toc_grey600_36dp.png
deleted file mode 100644
index 57a60ed9f..000000000
Binary files a/core/src/main/res/drawable-xhdpi/ic_toc_grey600_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_toc_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_toc_white_36dp.png
deleted file mode 100644
index aa7ee9c02..000000000
Binary files a/core/src/main/res/drawable-xhdpi/ic_toc_white_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_undobar_undo.png b/core/src/main/res/drawable-xhdpi/ic_undobar_undo.png
deleted file mode 100644
index 91c8429ad..000000000
Binary files a/core/src/main/res/drawable-xhdpi/ic_undobar_undo.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_web_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_web_grey600_24dp.png
index a9f5ebc33..38150f680 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_web_grey600_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_web_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/ic_web_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_web_white_24dp.png
index edc590a0b..cce57ef59 100644
Binary files a/core/src/main/res/drawable-xhdpi/ic_web_white_24dp.png and b/core/src/main/res/drawable-xhdpi/ic_web_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xhdpi/navigation_up.png b/core/src/main/res/drawable-xhdpi/navigation_up.png
index f8c3e6f75..0f954094e 100755
Binary files a/core/src/main/res/drawable-xhdpi/navigation_up.png and b/core/src/main/res/drawable-xhdpi/navigation_up.png differ
diff --git a/core/src/main/res/drawable-xhdpi/navigation_up_dark.png b/core/src/main/res/drawable-xhdpi/navigation_up_dark.png
index 6964e069b..539222b2f 100755
Binary files a/core/src/main/res/drawable-xhdpi/navigation_up_dark.png and b/core/src/main/res/drawable-xhdpi/navigation_up_dark.png differ
diff --git a/core/src/main/res/drawable-xhdpi/stat_notify_sync.png b/core/src/main/res/drawable-xhdpi/stat_notify_sync.png
index ab02927fb..d7348168d 100644
Binary files a/core/src/main/res/drawable-xhdpi/stat_notify_sync.png and b/core/src/main/res/drawable-xhdpi/stat_notify_sync.png differ
diff --git a/core/src/main/res/drawable-xhdpi/stat_notify_sync_error.png b/core/src/main/res/drawable-xhdpi/stat_notify_sync_error.png
index c1f483f71..78c5df4d9 100644
Binary files a/core/src/main/res/drawable-xhdpi/stat_notify_sync_error.png and b/core/src/main/res/drawable-xhdpi/stat_notify_sync_error.png differ
diff --git a/core/src/main/res/drawable-xhdpi/undobar.9.png b/core/src/main/res/drawable-xhdpi/undobar.9.png
deleted file mode 100644
index 22fa2205b..000000000
Binary files a/core/src/main/res/drawable-xhdpi/undobar.9.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/undobar_button_focused.9.png b/core/src/main/res/drawable-xhdpi/undobar_button_focused.9.png
deleted file mode 100644
index d284ca7cb..000000000
Binary files a/core/src/main/res/drawable-xhdpi/undobar_button_focused.9.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/undobar_button_pressed.9.png b/core/src/main/res/drawable-xhdpi/undobar_button_pressed.9.png
deleted file mode 100644
index e990659f0..000000000
Binary files a/core/src/main/res/drawable-xhdpi/undobar_button_pressed.9.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xhdpi/undobar_divider.9.png b/core/src/main/res/drawable-xhdpi/undobar_divider.9.png
deleted file mode 100644
index 1b067d4e7..000000000
Binary files a/core/src/main/res/drawable-xhdpi/undobar_divider.9.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_add_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_add_grey600_24dp.png
index 70e4e86e7..396d18bca 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_add_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_add_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
index 72cedcad4..0fdced8fc 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_av_fast_forward_80dp.png b/core/src/main/res/drawable-xxhdpi/ic_av_fast_forward_80dp.png
index f90617f45..3b55c5d55 100755
Binary files a/core/src/main/res/drawable-xxhdpi/ic_av_fast_forward_80dp.png and b/core/src/main/res/drawable-xxhdpi/ic_av_fast_forward_80dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_av_pause_circle_outline_80dp.png b/core/src/main/res/drawable-xxhdpi/ic_av_pause_circle_outline_80dp.png
index 48e28102a..76cc4db32 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_av_pause_circle_outline_80dp.png and b/core/src/main/res/drawable-xxhdpi/ic_av_pause_circle_outline_80dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_av_play_circle_outline_80dp.png b/core/src/main/res/drawable-xxhdpi/ic_av_play_circle_outline_80dp.png
index b5918c0f1..eebf0110c 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_av_play_circle_outline_80dp.png and b/core/src/main/res/drawable-xxhdpi/ic_av_play_circle_outline_80dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_av_rewind_80dp.png b/core/src/main/res/drawable-xxhdpi/ic_av_rewind_80dp.png
index 81709e0ae..38a5fc264 100755
Binary files a/core/src/main/res/drawable-xxhdpi/ic_av_rewind_80dp.png and b/core/src/main/res/drawable-xxhdpi/ic_av_rewind_80dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_cancel_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_cancel_grey600_24dp.png
index f6f7844de..3d2aba75b 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_cancel_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_cancel_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png
index faa409f80..5bb0c3cc4 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_check_box_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_check_box_grey600_24dp.png
index 5e52fa65e..7093f28d5 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_check_box_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_check_box_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_grey600_24dp.png
index 9c8615618..050e6cd6c 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_white_24dp.png
index 565a755f3..56d380575 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_check_box_outline_blank_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_check_box_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_check_box_white_24dp.png
index 7b1d9ea34..ba9af5265 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_check_box_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_check_box_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_grey600_24dp.png
index 802fc6fa0..23fa54d28 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png
index 91cbc73d1..d8391d37c 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_create_new_folder_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png
index 4886ab1e9..1a3a6192b 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
index 0e95e9b1d..e4a5d0261 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_description_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_description_grey600_36dp.png
deleted file mode 100644
index 33df5d9d2..000000000
Binary files a/core/src/main/res/drawable-xxhdpi/ic_description_grey600_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_description_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_description_white_36dp.png
deleted file mode 100644
index aa5e73299..000000000
Binary files a/core/src/main/res/drawable-xxhdpi/ic_description_white_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_done_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_done_grey600_24dp.png
index c836c5490..7feeca3a1 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_done_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_done_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png
index f801e7ab3..edb552b49 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_grey600_48dp.9.png b/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_grey600_48dp.9.png
index 88a800f24..dc8682716 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_grey600_48dp.9.png and b/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_grey600_48dp.9.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_48dp.9.png b/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_48dp.9.png
index 148891e6c..808186aa9 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_48dp.9.png and b/core/src/main/res/drawable-xxhdpi/ic_drag_vertical_white_48dp.9.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_expand_more_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_expand_more_grey600_36dp.png
index 503678f1b..07bb07a38 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_expand_more_grey600_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_expand_more_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png
index 16094f9bc..fe5c3d280 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_24dp.png
index 169a3b386..521f7490b 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_36dp.png
index 7b83df521..644645c8b 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_24dp.png
index 8aec1abb0..2d9a7e3c9 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_36dp.png
index b4cf934f7..76c94c3ba 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_24dp.png
index ccac2c273..ea5493251 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_36dp.png
index 940b5413d..831fda2ab 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_24dp.png
index 857a1aaa2..de9ec1d90 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_36dp.png
index 751e5d1ba..8e11ac89e 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_feed_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_feed_grey600_24dp.png
index ddfe32b53..62decef68 100755
Binary files a/core/src/main/res/drawable-xxhdpi/ic_feed_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_feed_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_feed_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_feed_white_24dp.png
index 4929a6a11..7838ab87c 100755
Binary files a/core/src/main/res/drawable-xxhdpi/ic_feed_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_feed_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_file_download_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_file_download_grey600_24dp.png
index e61a48a4d..82b0d1986 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_file_download_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_file_download_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
index 95502de3f..0b479dba2 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_filter_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_filter_grey600_24dp.png
index 43ec90ea5..5846ad140 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_filter_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_filter_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_filter_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_filter_white_24dp.png
index d3923efee..1263ae82e 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_filter_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_filter_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_hearing_grey600_18dp.png b/core/src/main/res/drawable-xxhdpi/ic_hearing_grey600_18dp.png
index 111ed802c..19456de04 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_hearing_grey600_18dp.png and b/core/src/main/res/drawable-xxhdpi/ic_hearing_grey600_18dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_hearing_white_18dp.png b/core/src/main/res/drawable-xxhdpi/ic_hearing_white_18dp.png
index 417b39b81..82de8bb65 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_hearing_white_18dp.png and b/core/src/main/res/drawable-xxhdpi/ic_hearing_white_18dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_history_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_history_grey600_24dp.png
index 632a73e42..f083e0f2c 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_history_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_history_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png
index 3e438ec4e..17d6d29b8 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_grey600_24dp.png
index c2300b53b..2e7d39a5a 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_white_24dp.png
index 66a710d8c..ec4981f5c 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_indeterminate_check_box_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_info_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_info_grey600_24dp.png
index 64445284b..874226124 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_info_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_info_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_info_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_info_white_24dp.png
index 185d18d1a..8a1b185ff 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_info_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_info_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_launcher.png b/core/src/main/res/drawable-xxhdpi/ic_launcher.png
index 2bef52ec7..41b261b4f 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_launcher.png and b/core/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_list_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_list_grey600_24dp.png
index ceaf36811..c92e250b8 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_list_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_list_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png
index 6b7e78f83..4d2807e4e 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_lock_closed_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_lock_closed_grey600_24dp.png
index 311a7fa13..386595f99 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_lock_closed_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_lock_closed_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_lock_closed_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_lock_closed_white_24dp.png
index 39a163843..7bc7c690d 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_lock_closed_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_lock_closed_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_lock_open_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_lock_open_grey600_24dp.png
index c0552d564..a424f4c5d 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_lock_open_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_lock_open_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png
index 46852d54f..d37d40dcb 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_lock_open_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_more_vert_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_more_vert_grey600_24dp.png
deleted file mode 100644
index 44012b87d..000000000
Binary files a/core/src/main/res/drawable-xxhdpi/ic_more_vert_grey600_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png
deleted file mode 100644
index 2955c02ec..000000000
Binary files a/core/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_new.png b/core/src/main/res/drawable-xxhdpi/ic_new.png
deleted file mode 100755
index 5e836eae4..000000000
Binary files a/core/src/main/res/drawable-xxhdpi/ic_new.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_new_dark.png b/core/src/main/res/drawable-xxhdpi/ic_new_dark.png
deleted file mode 100755
index bca96b751..000000000
Binary files a/core/src/main/res/drawable-xxhdpi/ic_new_dark.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_new_releases_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_new_releases_grey600_24dp.png
index 3eccc24f0..79507d800 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_new_releases_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_new_releases_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png
index 4a7083c57..a4dbba8ae 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_24dp.png
index 7efc88511..aeb13ebc4 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_36dp.png
index c8ed1d00a..8753d9c50 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png
index 72dfa9fa6..7192ad487 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png
index 76833ff7d..fb63ddc5a 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_24dp.png
index ba62a8102..dabd252ee 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_36dp.png
index 1d44f8f2f..9fcf99558 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png
index 043acd808..fff3e1f56 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png
index fe7ea25cc..9b31e2d19 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png
index 9c1e27d74..e5eef5d8a 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
index 72128fe69..13157817d 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_grey600_18dp.png b/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_grey600_18dp.png
index 259ddcd14..16cdc31c1 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_grey600_18dp.png and b/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_grey600_18dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_white_18dp.png b/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_white_18dp.png
index ece7aeb74..695eb950e 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_white_18dp.png and b/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_white_18dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_sd_storage_grey600_36dp.png
index 4352dbc06..597f417d5 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_sd_storage_grey600_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_sd_storage_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_sd_storage_white_36dp.png
index 5e18ed274..2ef908e26 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_sd_storage_white_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_sd_storage_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_search_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_search_grey600_24dp.png
index 9424ae98e..2cac5b19c 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_search_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_search_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png
index 0bbeab150..0ada3a39f 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png
index 6a70402b4..fe7d1a24d 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_grey600_24dp.png
index 5404820db..37ce4c61a 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_white_24dp.png
index 19752dd44..0609c3154 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
index 6bb8f6e08..e5de22411 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_share_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_share_grey600_24dp.png
index 89136d7c3..97a334744 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_share_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_share_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png
index 9963c6a05..406bc9ab5 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_skip_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_skip_grey600_36dp.png
index 00a55a0f8..75a4a9545 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_skip_grey600_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_skip_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_skip_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_skip_white_36dp.png
index ac38e6d42..a31299c81 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_skip_white_36dp.png and b/core/src/main/res/drawable-xxhdpi/ic_skip_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sleep_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sleep_grey600_24dp.png
index f4bd9e94d..8346240f1 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_sleep_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_sleep_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sleep_off_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sleep_off_grey600_24dp.png
index 6c42d6051..07748be06 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_sleep_off_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_sleep_off_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sleep_off_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sleep_off_white_24dp.png
index b8e06f9b3..8e2e80e71 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_sleep_off_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_sleep_off_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sleep_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sleep_white_24dp.png
index e2249c357..33770dbb1 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_sleep_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_sleep_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sort_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sort_grey600_24dp.png
index 6cdc649ea..fa8c4c593 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_sort_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_sort_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png
index 56ea13fe2..b8ef1050e 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_star_border_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_star_border_grey600_24dp.png
index 6348e1997..06f24ef24 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_star_border_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_star_border_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_star_border_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_star_border_white_24dp.png
index aab4831ff..70785a1e3 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_star_border_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_star_border_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_star_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_star_grey600_24dp.png
index ef0294931..29fff7d5f 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_star_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_star_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_star_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_star_white_24dp.png
index de4b7b29d..d5d478096 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_star_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_star_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_stat_authentication.png b/core/src/main/res/drawable-xxhdpi/ic_stat_authentication.png
index b274bb60f..965fabc57 100755
Binary files a/core/src/main/res/drawable-xxhdpi/ic_stat_authentication.png and b/core/src/main/res/drawable-xxhdpi/ic_stat_authentication.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_timer_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_timer_grey600_24dp.png
deleted file mode 100644
index a9ae43327..000000000
Binary files a/core/src/main/res/drawable-xxhdpi/ic_timer_grey600_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_timer_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_timer_white_24dp.png
deleted file mode 100644
index 276f4e1b9..000000000
Binary files a/core/src/main/res/drawable-xxhdpi/ic_timer_white_24dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_toc_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_toc_grey600_36dp.png
deleted file mode 100644
index bb35c5657..000000000
Binary files a/core/src/main/res/drawable-xxhdpi/ic_toc_grey600_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_toc_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_toc_white_36dp.png
deleted file mode 100644
index fdbb3ac3a..000000000
Binary files a/core/src/main/res/drawable-xxhdpi/ic_toc_white_36dp.png and /dev/null differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_web_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_web_grey600_24dp.png
index 9e70743e8..abb58b77b 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_web_grey600_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_web_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png
index fcc2d1aca..abf5662b3 100644
Binary files a/core/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png and b/core/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/stat_notify_sync.png b/core/src/main/res/drawable-xxhdpi/stat_notify_sync.png
index 9cd2a53b4..dabb1ea27 100644
Binary files a/core/src/main/res/drawable-xxhdpi/stat_notify_sync.png and b/core/src/main/res/drawable-xxhdpi/stat_notify_sync.png differ
diff --git a/core/src/main/res/drawable-xxhdpi/stat_notify_sync_error.png b/core/src/main/res/drawable-xxhdpi/stat_notify_sync_error.png
index bb76c2756..6810a8249 100644
Binary files a/core/src/main/res/drawable-xxhdpi/stat_notify_sync_error.png and b/core/src/main/res/drawable-xxhdpi/stat_notify_sync_error.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_av_fast_forward_80dp.png b/core/src/main/res/drawable-xxxhdpi/ic_av_fast_forward_80dp.png
index c9b68abf0..1c915d9dd 100755
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_av_fast_forward_80dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_av_fast_forward_80dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_av_rewind_80dp.png b/core/src/main/res/drawable-xxxhdpi/ic_av_rewind_80dp.png
index 87b0756eb..190bb0f4c 100755
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_av_rewind_80dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_av_rewind_80dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_grey600_24dp.png
index baf7b6ef7..448ca4898 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_grey600_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png
index aa103bfd0..56a47309c 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_create_new_folder_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_filter_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_filter_grey600_24dp.png
index 5d14b5b25..3fe8eb4dd 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_filter_grey600_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_filter_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_filter_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_filter_white_24dp.png
index e8b865e4a..cb2207f11 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_filter_white_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_filter_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_grey600_24dp.png
index e41d5b9ee..03ccfd0d6 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_grey600_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_white_24dp.png
index 2376b7334..2586be5ab 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_white_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_lock_closed_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_lock_open_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_lock_open_grey600_24dp.png
index c281784dd..e46b956e0 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_lock_open_grey600_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_lock_open_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png
index 25ea3ab99..b2dd88c07 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_lock_open_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_grey600_36dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_grey600_36dp.png
index cf03bc3f1..25d26d523 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_grey600_36dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_white_36dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_white_36dp.png
index 2996619c9..505fb28dc 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_white_36dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_sd_storage_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_skip_grey600_36dp.png b/core/src/main/res/drawable-xxxhdpi/ic_skip_grey600_36dp.png
index 94836e0c8..b599c2207 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_skip_grey600_36dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_skip_grey600_36dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_skip_white_36dp.png b/core/src/main/res/drawable-xxxhdpi/ic_skip_white_36dp.png
index a84f34228..a0dd670c3 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_skip_white_36dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_skip_white_36dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sleep_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sleep_grey600_24dp.png
index 9c0116c60..e8348b7e4 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_sleep_grey600_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_sleep_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_grey600_24dp.png
index e8141d0df..c06456421 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_grey600_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_white_24dp.png
index ca41ad5e6..5cf1d4f3b 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_white_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_sleep_off_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_sleep_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_sleep_white_24dp.png
index 29782e155..3e9984bf0 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_sleep_white_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_sleep_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_star_border_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_star_border_grey600_24dp.png
index 1109e95c8..d79dfa577 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_star_border_grey600_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_star_border_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_star_border_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_star_border_white_24dp.png
index 086cb677c..c2d2ee285 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_star_border_white_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_star_border_white_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_star_grey600_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_star_grey600_24dp.png
index dda3262ed..2866aff29 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_star_grey600_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_star_grey600_24dp.png differ
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_star_white_24dp.png b/core/src/main/res/drawable-xxxhdpi/ic_star_white_24dp.png
index ba29292b0..a74fee378 100644
Binary files a/core/src/main/res/drawable-xxxhdpi/ic_star_white_24dp.png and b/core/src/main/res/drawable-xxxhdpi/ic_star_white_24dp.png differ
diff --git a/core/src/main/res/drawable/undobar_button.xml b/core/src/main/res/drawable/undobar_button.xml
deleted file mode 100644
index a4de91b49..000000000
--- a/core/src/main/res/drawable/undobar_button.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-
-  Copyright 2012 Roman Nurik
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/undobar_button_pressed" android:state_pressed="true"/>
-  <item android:drawable="@drawable/undobar_button_focused" android:state_focused="true"/>
-  <item android:drawable="@android:color/transparent"/>
-</selector>
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 2d3379d95..74eef525a 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -19,8 +19,6 @@
     <attr name="navigation_expand" format="reference"/>
     <attr name="navigation_refresh" format="reference"/>
     <attr name="navigation_up" format="reference"/>
-    <attr name="navigation_shownotes" format="reference"/>
-    <attr name="navigation_chapters" format="reference"/>
     <attr name="social_share" format="reference"/>
     <attr name="stat_playlist" format="reference"/>
     <attr name="type_audio" format="reference"/>
@@ -29,7 +27,6 @@
     <attr name="overlay_drawable" format="reference"/>
     <attr name="dragview_background" format="reference"/>
     <attr name="dragview_float_background" format="reference"/>
-    <attr name="ic_action_overflow" format="reference"/>
     <attr name="ic_new" format="reference"/>
     <attr name="ic_history" format="reference"/>
     <attr name="av_play_big" format="reference"/>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 912a60f55..a94c9ad2d 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -134,6 +134,7 @@
     <string name="hide_not_downloaded_episodes_label">Not downloaded</string>
     <string name="filtered_label">Filtered</string>
     <string name="refresh_failed_msg">{fa-exclamation-circle} Last Refresh failed</string>
+    <string name="open_podcast">Open Podcast</string>
 
     <!-- actions on feeditems -->
     <string name="download_label">Download</string>
@@ -178,6 +179,7 @@
     <string name="download_error_connection_error">Connection Error</string>
     <string name="download_error_unknown_host">Unknown Host</string>
     <string name="download_error_unauthorized">Authentication Error</string>
+    <string name="download_error_file_type_type">File Type Error</string>
     <string name="cancel_all_downloads_label">Cancel all downloads</string>
     <string name="download_canceled_msg">Download canceled</string>
     <string name="download_canceled_autodownload_enabled_msg">Download canceled\nDisabled <i>Auto Download</i> for this item</string>
@@ -278,6 +280,8 @@
     <string name="no_items_label">There are no items in this list.</string>
     <string name="no_feeds_label">You haven\'t subscribed to any feeds yet.</string>
     <string name="no_chapters_label">This episode has no chapters.</string>
+    <string name="no_shownotes_label">This episode has no shownotes.</string>
+
 
     <!-- Preferences -->
     <string name="other_pref">Other</string>
@@ -358,6 +362,9 @@
     <string name="pref_gpodnet_logout_toast">Logout was successful</string>
     <string name="pref_gpodnet_setlogin_information_title">Change login information</string>
     <string name="pref_gpodnet_setlogin_information_sum">Change the login information for your gpodder.net account.</string>
+    <string name="pref_gpodnet_sync_title">Sync now</string>
+    <string name="pref_gpodnet_sync_sum">Sync subscriptions and episode states with gpodder.net</string>
+    <string name="pref_gpodnet_sync_started">Sync started</string>
     <string name="pref_playback_speed_title">Playback Speeds</string>
     <string name="pref_playback_speed_sum">Customize the speeds available for variable speed audio playback</string>
     <string name="pref_fast_forward">Fast forward time</string>
@@ -385,6 +392,8 @@
     <string name="pref_sonic_title">Sonic media player</string>
     <string name="pref_sonic_message">Use built-in sonic media player as a replacement for Android\'s native mediaplayer and Prestissimo</string>
     <string name="pref_current_value">Current value: %1$s</string>
+    <string name="pref_proxy_title">Proxy</string>
+    <string name="pref_proxy_sum">Set a network proxy</string>
 
     <!-- Auto-Flattr dialog -->
     <string name="auto_flattr_enable">Enable automatic flattring</string>
@@ -409,8 +418,8 @@
     <string name="opml_import_label">OPML Import</string>
     <string name="opml_directory_error">ERROR!</string>
     <string name="reading_opml_label">Reading OPML file</string>
-    <string name="opml_reader_error">An error has occurred while reading the opml document:</string>
-    <string name="opml_import_error_dir_empty">The import directory is empty.</string>
+    <string name="opml_reader_error">An error has occurred while reading the OPML document:</string>
+    <string name="opml_import_error_no_file">No file selected!</string>
     <string name="select_all_label">Select all</string>
     <string name="deselect_all_label">Deselect all</string>
     <string name="select_options_label">Select&#8230;</string>
@@ -591,4 +600,17 @@
     <string name="stereo_to_mono">Downmix: Stereo to mono</string>
     <string name="sonic_only">Sonic only</string>
 
+    <!-- proxy settings -->
+    <string name="proxy_type_label">Type</string>
+    <string name="host_label">Host</string>
+    <string name="port_label">Port</string>
+    <string name="optional_hint">(Optional)</string>
+    <string name="proxy_test_label">Test</string>
+    <string name="proxy_checking">Checking&#8230;</string>
+    <string name="proxy_test_successful">Test successful</string>
+    <string name="proxy_test_failed">Test failed</string>
+    <string name="proxy_host_empty_error">Host must not be empty</string>
+    <string name="proxy_host_invalid_error">Host not valid UP or domain</string>
+    <string name="proxy_port_invalid_error">Port not valid</string>
+
 </resources>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index d79ba6b45..27500b3e4 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -25,8 +25,6 @@
         <item name="attr/navigation_expand">@drawable/ic_expand_more_grey600_36dp</item>
         <item name="attr/navigation_refresh">@drawable/ic_refresh_grey600_24dp</item>
         <item name="attr/navigation_up">@drawable/navigation_up</item>
-        <item name="attr/navigation_shownotes">@drawable/ic_description_grey600_36dp</item>
-        <item name="attr/navigation_chapters">@drawable/ic_toc_grey600_36dp</item>
         <item name="attr/social_share">@drawable/ic_share_grey600_24dp</item>
         <item name="attr/stat_playlist">@drawable/ic_list_grey600_24dp</item>
         <item name="attr/type_audio">@drawable/ic_hearing_grey600_18dp</item>
@@ -37,7 +35,6 @@
         <item name="attr/dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
         <item name="attr/dragview_float_background">@color/white</item>
         <item name="attr/nav_drawer_background">@color/white</item>
-        <item name="attr/ic_action_overflow">@drawable/ic_more_vert_grey600_24dp</item>
         <item name="attr/ic_new">@drawable/ic_new_releases_grey600_24dp</item>
         <item name="attr/ic_history">@drawable/ic_history_grey600_24dp</item>
         <item name="attr/av_play_big">@drawable/ic_play_arrow_grey600_36dp</item>
@@ -85,8 +82,6 @@
         <item name="attr/navigation_expand">@drawable/ic_expand_more_white_36dp</item>
         <item name="attr/navigation_refresh">@drawable/ic_refresh_white_24dp</item>
         <item name="attr/navigation_up">@drawable/navigation_up_dark</item>
-        <item name="attr/navigation_shownotes">@drawable/ic_description_white_36dp</item>
-        <item name="attr/navigation_chapters">@drawable/ic_toc_white_36dp</item>
         <item name="attr/social_share">@drawable/ic_share_white_24dp</item>
         <item name="attr/stat_playlist">@drawable/ic_list_white_24dp</item>
         <item name="attr/type_audio">@drawable/ic_hearing_white_18dp</item>
@@ -97,7 +92,6 @@
         <item name="attr/dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
         <item name="attr/dragview_float_background">@color/black</item>
         <item name="attr/nav_drawer_background">#3B3B3B</item>
-        <item name="attr/ic_action_overflow">@drawable/ic_more_vert_white_24dp</item>
         <item name="attr/ic_new">@drawable/ic_new_releases_white_24dp</item>
         <item name="attr/ic_history">@drawable/ic_history_white_24dp</item>
         <item name="attr/av_play_big">@drawable/ic_play_arrow_white_36dp</item>
@@ -146,8 +140,6 @@
         <item name="attr/navigation_expand">@drawable/ic_expand_more_grey600_36dp</item>
         <item name="attr/navigation_refresh">@drawable/ic_refresh_grey600_24dp</item>
         <item name="attr/navigation_up">@drawable/navigation_up</item>
-        <item name="attr/navigation_shownotes">@drawable/ic_description_grey600_36dp</item>
-        <item name="attr/navigation_chapters">@drawable/ic_toc_grey600_36dp</item>
         <item name="attr/social_share">@drawable/ic_share_grey600_24dp</item>
         <item name="attr/stat_playlist">@drawable/ic_list_grey600_24dp</item>
         <item name="attr/type_audio">@drawable/ic_hearing_grey600_18dp</item>
@@ -158,7 +150,6 @@
         <item name="attr/dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
         <item name="attr/dragview_float_background">@color/white</item>
         <item name="attr/nav_drawer_background">@color/white</item>
-        <item name="attr/ic_action_overflow">@drawable/ic_more_vert_grey600_24dp</item>
         <item name="attr/ic_new">@drawable/ic_new_releases_grey600_24dp</item>
         <item name="attr/ic_history">@drawable/ic_history_grey600_24dp</item>
         <item name="attr/av_play_big">@drawable/ic_play_arrow_grey600_36dp</item>
@@ -207,8 +198,6 @@
         <item name="attr/navigation_expand">@drawable/ic_expand_more_white_36dp</item>
         <item name="attr/navigation_refresh">@drawable/ic_refresh_white_24dp</item>
         <item name="attr/navigation_up">@drawable/navigation_up_dark</item>
-        <item name="attr/navigation_shownotes">@drawable/ic_description_white_36dp</item>
-        <item name="attr/navigation_chapters">@drawable/ic_toc_white_36dp</item>
         <item name="attr/social_share">@drawable/ic_share_white_24dp</item>
         <item name="attr/stat_playlist">@drawable/ic_list_white_24dp</item>
         <item name="attr/type_audio">@drawable/ic_hearing_white_18dp</item>
@@ -219,7 +208,6 @@
         <item name="attr/dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
         <item name="attr/dragview_float_background">@color/black</item>
         <item name="attr/nav_drawer_background">#3B3B3B</item>
-        <item name="attr/ic_action_overflow">@drawable/ic_more_vert_white_24dp</item>
         <item name="attr/ic_new">@drawable/ic_new_releases_white_24dp</item>
         <item name="attr/ic_history">@drawable/ic_history_white_24dp</item>
         <item name="attr/av_play_big">@drawable/ic_play_arrow_white_36dp</item>