Merge branch 'develop' into lock-queue

21 files changed, 37 insertions, 263 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 7545386a2..f9ef8a7ef 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
         // "1.2.3-SNAPSHOT" -> 1020300
         // "1.2.3-RC4"      -> 1020304
         // "1.2.3"          -> 1020395
-        versionCode 1070306
-        versionName "1.7.3-RC6"
+        versionCode 1070395
+        versionName "1.7.3"
         testApplicationId "de.test.antennapod"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         generatedDensities = []
diff --git a/app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java b/app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java
index 3d8417bf6..4158fd31c 100644
--- a/app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java
+++ b/app/src/androidTest/java/de/test/antennapod/util/service/download/HTTPBin.java
@@ -72,20 +72,6 @@ public class HTTPBin extends NanoHTTPD {
         return servedFiles.size() - 1;
     }
 
-    /**
-     * Removes the file with the given ID from the server.
-     *
-     * @return True if a file was removed, false otherwise
-     */
-    public synchronized boolean removeFile(int id) {
-        if (id < 0) throw new IllegalArgumentException("ID < 0");
-        if (id >= servedFiles.size()) {
-            return false;
-        } else {
-            return servedFiles.remove(id) != null;
-        }
-    }
-
     public synchronized File accessFile(int id) {
         if (id < 0 || id >= servedFiles.size()) {
             return null;
diff --git a/app/src/free/java/de/danoeh/antennapod/activity/CastEnabledActivity.java b/app/src/free/java/de/danoeh/antennapod/activity/CastEnabledActivity.java
index 79d7e02f2..519d4c61b 100644
--- a/app/src/free/java/de/danoeh/antennapod/activity/CastEnabledActivity.java
+++ b/app/src/free/java/de/danoeh/antennapod/activity/CastEnabledActivity.java
@@ -7,212 +7,9 @@ import android.support.v7.app.AppCompatActivity;
  * network.
  */
 public abstract class CastEnabledActivity extends AppCompatActivity {
-//        implements SharedPreferences.OnSharedPreferenceChangeListener {
     public static final String TAG = "CastEnabledActivity";
 
-//    protected CastManager castManager;
-//    protected SwitchableMediaRouteActionProvider mediaRouteActionProvider;
-//    private final CastButtonVisibilityManager castButtonVisibilityManager = new CastButtonVisibilityManager();
-//
-//    @Override
-//    protected void onCreate(Bundle savedInstanceState) {
-//        super.onCreate(savedInstanceState);
-//
-//        PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).
-//                registerOnSharedPreferenceChangeListener(this);
-//
-//        castManager = CastManager.getInstance();
-//        castManager.addCastConsumer(castConsumer);
-//        castButtonVisibilityManager.setPrefEnabled(UserPreferences.isCastEnabled());
-//        onCastConnectionChanged(castManager.isConnected());
-//    }
-//
-//    @Override
-//    protected void onDestroy() {
-//        PreferenceManager.getDefaultSharedPreferences(getApplicationContext())
-//                .unregisterOnSharedPreferenceChangeListener(this);
-//        castManager.removeCastConsumer(castConsumer);
-//        super.onDestroy();
-//    }
-//
-//    @Override
-//    @CallSuper
-//    public boolean onCreateOptionsMenu(Menu menu) {
-//        super.onCreateOptionsMenu(menu);
-//        getMenuInflater().inflate(R.menu.cast_enabled, menu);
-//        castButtonVisibilityManager.setMenu(menu);
-//        return true;
-//    }
-//
-//    @Override
-//    @CallSuper
-//    public boolean onPrepareOptionsMenu(Menu menu) {
-//        super.onPrepareOptionsMenu(menu);
-//        mediaRouteActionProvider = castManager
-//                .addMediaRouterButton(menu.findItem(R.id.media_route_menu_item));
-//        mediaRouteActionProvider.setEnabled(castButtonVisibilityManager.shouldEnable());
-//        return true;
-//    }
-//
-//    @Override
-//    protected void onResume() {
-//        super.onResume();
-//        castButtonVisibilityManager.setResumed(true);
-//    }
-//
-//    @Override
-//    protected void onPause() {
-//        super.onPause();
-//        castButtonVisibilityManager.setResumed(false);
-//    }
-//
-//    @Override
-//    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-//        if (UserPreferences.PREF_CAST_ENABLED.equals(key)) {
-//            boolean newValue = UserPreferences.isCastEnabled();
-//            Log.d(TAG, "onSharedPreferenceChanged(), isCastEnabled set to " + newValue);
-//            castButtonVisibilityManager.setPrefEnabled(newValue);
-//            // PlaybackService has its own listener, so if it's active we don't have to take action here.
-//            if (!newValue && !PlaybackService.isRunning) {
-//                CastManager.getInstance().disconnect();
-//            }
-//        }
-//    }
-//
-//    CastConsumer castConsumer = new DefaultCastConsumer() {
-//        @Override
-//        public void onApplicationConnected(ApplicationMetadata appMetadata, String sessionId, boolean wasLaunched) {
-//            onCastConnectionChanged(true);
-//        }
-//
-//        @Override
-//        public void onDisconnected() {
-//            onCastConnectionChanged(false);
-//        }
-//    };
-//
-//    private void onCastConnectionChanged(boolean connected) {
-//        if (connected) {
-//            castButtonVisibilityManager.onConnected();
-//            setVolumeControlStream(AudioManager.USE_DEFAULT_STREAM_TYPE);
-//        } else {
-//            castButtonVisibilityManager.onDisconnected();
-//            setVolumeControlStream(AudioManager.STREAM_MUSIC);
-//        }
-//    }
-//
-//    /**
-//     * Should be called by any activity or fragment for which the cast button should be shown.
-//     *
-//     * @param showAsAction refer to {@link MenuItem#setShowAsAction(int)}
-//     */
     public final void requestCastButton(int showAsAction) {
         // no-op
     }
-
-//    private class CastButtonVisibilityManager {
-//        private volatile boolean prefEnabled = false;
-//        private volatile boolean viewRequested = false;
-//        private volatile boolean resumed = false;
-//        private volatile boolean connected = false;
-//        private volatile int showAsAction = MenuItem.SHOW_AS_ACTION_IF_ROOM;
-//        private Menu menu;
-//
-//        public synchronized void setPrefEnabled(boolean newValue) {
-//            if (prefEnabled != newValue && resumed && (viewRequested || connected)) {
-//                if (newValue) {
-//                    castManager.incrementUiCounter();
-//                } else {
-//                    castManager.decrementUiCounter();
-//                }
-//            }
-//            prefEnabled = newValue;
-//            if (mediaRouteActionProvider != null) {
-//                mediaRouteActionProvider.setEnabled(prefEnabled && (viewRequested || connected));
-//            }
-//        }
-//
-//        public synchronized void setResumed(boolean newValue) {
-//            if (resumed == newValue) {
-//                Log.e(TAG, "resumed should never change to the same value");
-//                return;
-//            }
-//            resumed = newValue;
-//            if (prefEnabled && (viewRequested || connected)) {
-//                if (resumed) {
-//                    castManager.incrementUiCounter();
-//                } else {
-//                    castManager.decrementUiCounter();
-//                }
-//            }
-//        }
-//
-//        public synchronized void setViewRequested(boolean newValue) {
-//            if (viewRequested != newValue && resumed && prefEnabled && !connected) {
-//                if (newValue) {
-//                    castManager.incrementUiCounter();
-//                } else {
-//                    castManager.decrementUiCounter();
-//                }
-//            }
-//            viewRequested = newValue;
-//            if (mediaRouteActionProvider != null) {
-//                mediaRouteActionProvider.setEnabled(prefEnabled && (viewRequested || connected));
-//            }
-//        }
-//
-//        public synchronized void setConnected(boolean newValue) {
-//            if (connected != newValue && resumed && prefEnabled && !prefEnabled) {
-//                if (newValue) {
-//                    castManager.incrementUiCounter();
-//                } else {
-//                    castManager.decrementUiCounter();
-//                }
-//            }
-//            connected = newValue;
-//            if (mediaRouteActionProvider != null) {
-//                mediaRouteActionProvider.setEnabled(prefEnabled && (viewRequested || connected));
-//            }
-//        }
-//
-//        public synchronized boolean shouldEnable() {
-//            return prefEnabled && viewRequested;
-//        }
-//
-//        public void setMenu(Menu menu) {
-//            setViewRequested(false);
-//            showAsAction = MenuItem.SHOW_AS_ACTION_IF_ROOM;
-//            this.menu = menu;
-//            setShowAsAction();
-//        }
-//
-//        public void requestCastButton(int showAsAction) {
-//            setViewRequested(true);
-//            this.showAsAction = showAsAction;
-//            setShowAsAction();
-//        }
-//
-//        public void onConnected() {
-//            setConnected(true);
-//            setShowAsAction();
-//        }
-//
-//        public void onDisconnected() {
-//            setConnected(false);
-//            setShowAsAction();
-//        }
-//
-//        private void setShowAsAction() {
-//            if (menu == null) {
-//                Log.d(TAG, "setShowAsAction() without a menu");
-//                return;
-//            }
-//            MenuItem item = menu.findItem(R.id.media_route_menu_item);
-//            if (item == null) {
-//                Log.e(TAG, "setShowAsAction(), but cast button not inflated");
-//                return;
-//            }
-//            MenuItemCompat.setShowAsAction(item, connected? MenuItem.SHOW_AS_ACTION_ALWAYS : showAsAction);
-//        }
-//    }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 73af654e9..707850837 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
         android:usesCleartextTraffic="true"
         android:logo="@mipmap/ic_launcher">
         <meta-data android:name="com.google.android.gms.car.notification.SmallIcon"
-                    android:resource="@drawable/ic_notification" />
+                    android:resource="@drawable/ic_antenna" />
         <meta-data
             android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAI3a05VToCTlqBymJrbFGaKQMvF-bBAuLsOdavBA"/>
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 339ce01c2..a0a3c85c2 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -240,7 +240,7 @@ public class MainActivity extends CastEnabledActivity implements NavDrawerActivi
 
             SharedPreferences.Editor edit = prefs.edit();
             edit.putBoolean(PREF_IS_FIRST_LAUNCH, false);
-            edit.commit();
+            edit.apply();
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java b/app/src/main/java/de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java
index eb70d8e0b..c3f5d898c 100644
--- a/app/src/main/java/de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java
+++ b/app/src/main/java/de/danoeh/antennapod/config/PlaybackServiceCallbacksImpl.java
@@ -35,6 +35,6 @@ public class PlaybackServiceCallbacksImpl implements PlaybackServiceCallbacks {
 
     @Override
     public int getNotificationIconResource(Context context) {
-        return R.drawable.ic_stat_antenna_default;
+        return R.drawable.ic_antenna;
     }
 }
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 4bebfe4c9..bb8f4df9a 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
@@ -87,11 +87,10 @@ public class ChaptersFragment extends ListFragment {
         controller = null;
     }
 
-    private void scrollTo(int position) {
-        getListView().setSelection(position);
-    }
-
     private int getCurrentChapter(Playable media) {
+        if (media == null || media.getChapters() == null || media.getChapters().size() == 0 || controller == null) {
+            return -1;
+        }
         int currentPosition = controller.getPosition();
 
         List<Chapter> chapters = media.getChapters();
@@ -126,8 +125,10 @@ public class ChaptersFragment extends ListFragment {
         if (adapter != null) {
             adapter.setMedia(media);
             adapter.notifyDataSetChanged();
-            if (media != null && media.getChapters() != null && media.getChapters().size() != 0) {
-                scrollTo(getCurrentChapter(media));
+
+            int positionOfCurrentChapter = getCurrentChapter(media);
+            if (positionOfCurrentChapter != -1) {
+                getListView().setSelection(positionOfCurrentChapter);
             }
         }
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java
index 1cedb5a91..951dad38e 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java
@@ -149,7 +149,7 @@ public abstract class EpisodesListFragment extends Fragment {
         SharedPreferences.Editor editor = prefs.edit();
         editor.putInt(PREF_SCROLL_POSITION, firstItem);
         editor.putFloat(PREF_SCROLL_OFFSET, topOffset);
-        editor.commit();
+        editor.apply();
     }
 
     private void restoreScrollPosition() {
@@ -162,7 +162,7 @@ public abstract class EpisodesListFragment extends Fragment {
             SharedPreferences.Editor editor = prefs.edit();
             editor.putInt(PREF_SCROLL_POSITION, 0);
             editor.putFloat(PREF_SCROLL_OFFSET, 0.0f);
-            editor.commit();
+            editor.apply();
         }
     }
 
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
index f8ef7f7a3..4e4b40096 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
@@ -17,7 +17,6 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -141,13 +140,6 @@ public class FeedItemlistFragment extends ListFragment {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = super.onCreateView(inflater, container, savedInstanceState);
-        ((ListView) view.findViewById(android.R.id.list)).setFastScrollEnabled(true);
-        return view;
-    }
-
-    @Override
     public void onStart() {
         super.onStart();
         EventDistributor.getInstance().register(contentUpdate);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/StoragePreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/StoragePreferencesFragment.java
index b4226b546..87d436eda 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/StoragePreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/StoragePreferencesFragment.java
@@ -171,7 +171,9 @@ public class StoragePreferencesFragment extends PreferenceFragmentCompat {
         return true;
     }
 
-    public void unsubscribeExportSubscription() {
+    @Override
+    public void onStop() {
+        super.onStop();
         if (disposable != null) {
             disposable.dispose();
         }
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java
index 7ca43547a..a33faeb69 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java
@@ -42,10 +42,8 @@ public class PreferenceUpgrader {
             }
         }
         if (oldVersion < 1070300) {
-            if (UserPreferences.getMediaPlayer().equals("builtin")) {
-                prefs.edit().putString(UserPreferences.PREF_MEDIA_PLAYER,
-                        UserPreferences.PREF_MEDIA_PLAYER_EXOPLAYER).apply();
-            }
+            prefs.edit().putString(UserPreferences.PREF_MEDIA_PLAYER,
+                    UserPreferences.PREF_MEDIA_PLAYER_EXOPLAYER).apply();
 
             if (prefs.getBoolean("prefEnableAutoDownloadOnMobile", false)) {
                 UserPreferences.setAllowMobileAutoDownload(true);
diff --git a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
index 03958508d..5fa6588d9 100644
--- a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
+++ b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java
@@ -46,7 +46,7 @@ public class SPAUtil {
 
             SharedPreferences.Editor editor = prefs.edit();
             editor.putBoolean(PREF_HAS_QUERIED_SP_APPS, true);
-            editor.commit();
+            editor.apply();
 
             return true;
         } else {
@@ -63,7 +63,7 @@ public class SPAUtil {
             SharedPreferences.Editor editor = PreferenceManager
                     .getDefaultSharedPreferences(c.getApplicationContext()).edit();
             editor.putBoolean(PREF_HAS_QUERIED_SP_APPS, false);
-            editor.commit();
+            editor.apply();
         }
     }
 }
diff --git a/app/src/main/res/layout/downloaded_episodeslist_item.xml b/app/src/main/res/layout/downloaded_episodeslist_item.xml
index 65a08251f..3f8065466 100644
--- a/app/src/main/res/layout/downloaded_episodeslist_item.xml
+++ b/app/src/main/res/layout/downloaded_episodeslist_item.xml
@@ -17,7 +17,7 @@
         android:layout_marginTop="@dimen/listitem_threeline_verticalpadding"
         android:contentDescription="@string/cover_label"
         android:scaleType="centerCrop"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
 
diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml
index 78c0b3b16..b047b3da0 100644
--- a/app/src/main/res/layout/feeditem_fragment.xml
+++ b/app/src/main/res/layout/feeditem_fragment.xml
@@ -36,7 +36,8 @@
                 android:layout_marginBottom="16dp"
                 android:contentDescription="@string/cover_label"
                 android:gravity="center_vertical"
-                tools:src="@drawable/ic_stat_antenna_default"
+                android:foreground="?attr/selectableItemBackground"
+                tools:src="@drawable/ic_antenna"
                 tools:background="@android:color/holo_green_dark" />
 
             <TextView
@@ -47,6 +48,7 @@
                 android:layout_alignTop="@id/imgvCover"
                 android:layout_toRightOf="@id/imgvCover"
                 android:layout_toEndOf="@id/imgvCover"
+                android:foreground="?attr/selectableItemBackground"
                 tools:text="Podcast title"
                 tools:background="@android:color/holo_green_dark" />
 
diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index ba39307b0..596135d88 100644
--- a/app/src/main/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
@@ -27,7 +27,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:contentDescription="@string/cover_label"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
     <ImageButton
@@ -37,11 +37,9 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
-        android:layout_marginLeft="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
         android:background="?attr/selectableItemBackground"
         android:contentDescription="@string/show_info_label"
         android:src="@drawable/ic_info_white_24dp"
@@ -57,8 +55,6 @@
         tools:background="@android:color/holo_green_dark"
         android:layout_below="@+id/butShowInfo"
         android:layout_marginBottom="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginEnd="16dp"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"/>
 
@@ -92,8 +88,8 @@
         android:layout_marginBottom="16dp"
         android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_toLeftOf="@id/butShowSettings"
         android:layout_toStartOf="@id/butShowSettings"
         android:layout_toRightOf="@id/imgvCover"
diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
index 27a8bbdca..6e02fa090 100644
--- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml
+++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
@@ -23,7 +23,7 @@
         android:contentDescription="@string/cover_label"
         android:cropToPadding="true"
         android:scaleType="fitXY"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/itunes_podcast_listitem.xml b/app/src/main/res/layout/itunes_podcast_listitem.xml
index 4848563b1..b2411c5df 100644
--- a/app/src/main/res/layout/itunes_podcast_listitem.xml
+++ b/app/src/main/res/layout/itunes_podcast_listitem.xml
@@ -25,7 +25,7 @@
         android:cropToPadding="true"
         android:scaleType="fitXY"
         tools:background="@android:color/holo_green_dark"
-        tools:src="@drawable/ic_stat_antenna_default" />
+        tools:src="@drawable/ic_antenna" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml
index 816870d1c..52833b3cd 100644
--- a/app/src/main/res/layout/nav_feedlistitem.xml
+++ b/app/src/main/res/layout/nav_feedlistitem.xml
@@ -25,7 +25,7 @@
         android:scaleType="centerCrop"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
     <TextView
diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml
index 6b41b68d5..1dcc34bce 100644
--- a/app/src/main/res/layout/queue_listitem.xml
+++ b/app/src/main/res/layout/queue_listitem.xml
@@ -51,7 +51,7 @@
             android:layout_height="@dimen/thumbnail_length_queue_item"
             android:layout_centerVertical="true"
             android:contentDescription="@string/cover_label"
-            tools:src="@drawable/ic_stat_antenna_default"
+            tools:src="@drawable/ic_antenna"
             tools:background="@android:color/holo_green_dark"/>
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/searchlist_item.xml b/app/src/main/res/layout/searchlist_item.xml
index 50374c737..4a055fea9 100644
--- a/app/src/main/res/layout/searchlist_item.xml
+++ b/app/src/main/res/layout/searchlist_item.xml
@@ -18,7 +18,7 @@
         android:layout_marginStart="@dimen/listitem_threeline_horizontalpadding"
         android:contentDescription="@string/cover_label"
         android:scaleType="centerCrop"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/statistics_listitem.xml b/app/src/main/res/layout/statistics_listitem.xml
index b186add9e..f52aa73e0 100644
--- a/app/src/main/res/layout/statistics_listitem.xml
+++ b/app/src/main/res/layout/statistics_listitem.xml
@@ -23,7 +23,7 @@
         android:scaleType="centerCrop"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
     <TextView