diff --git a/app/src/main/res/values-v21/styles_services.xml b/app/src/main/res/values-v21/styles_services.xml
index 176bc1f51..1c725f887 100644
--- a/app/src/main/res/values-v21/styles_services.xml
+++ b/app/src/main/res/values-v21/styles_services.xml
@@ -1,69 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- YouTube -->
-    <style name="LightTheme.YouTube" parent="LightTheme.Switchable">
+    <style name="LightTheme.YouTube" parent="LightTheme">
         <item name="colorPrimaryDark">@color/light_youtube_statusbar_color</item>
     </style>
 
-    <style name="DarkTheme.YouTube" parent="DarkTheme.Switchable">
+    <style name="DarkTheme.YouTube" parent="DarkTheme">
         <item name="colorPrimaryDark">@color/dark_youtube_statusbar_color</item>
     </style>
 
-    <style name="BlackTheme.YouTube" parent="BlackTheme.Switchable">
+    <style name="BlackTheme.YouTube" parent="BlackTheme">
         <item name="colorPrimaryDark">@color/dark_youtube_statusbar_color</item>
     </style>
     <!-- SoundCloud -->
-    <style name="LightTheme.SoundCloud" parent="LightTheme.Switchable">
+    <style name="LightTheme.SoundCloud" parent="LightTheme">
         <item name="colorPrimary">@color/light_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/light_soundcloud_statusbar_color</item>
         <item name="colorAccent">@color/light_soundcloud_accent_color</item>
     </style>
 
-    <style name="DarkTheme.SoundCloud" parent="DarkTheme.Switchable">
+    <style name="DarkTheme.SoundCloud" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_soundcloud_statusbar_color</item>
         <item name="colorAccent">@color/dark_soundcloud_accent_color</item>
     </style>
 
-    <style name="BlackTheme.SoundCloud" parent="BlackTheme.Switchable">
+    <style name="BlackTheme.SoundCloud" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_soundcloud_statusbar_color</item>
         <item name="colorAccent">@color/dark_soundcloud_accent_color</item>
     </style>
 
     <!-- PeerTube -->
-    <style name="LightTheme.PeerTube" parent="LightTheme.Switchable">
+    <style name="LightTheme.PeerTube" parent="LightTheme">
         <item name="colorPrimary">@color/light_peertube_primary_color</item>
         <item name="colorPrimaryDark">@color/light_peertube_dark_color</item>
         <item name="colorAccent">@color/light_peertube_accent_color</item>
     </style>
 
-    <style name="DarkTheme.PeerTube" parent="DarkTheme.Switchable">
+    <style name="DarkTheme.PeerTube" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_peertube_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
         <item name="colorAccent">@color/dark_peertube_accent_color</item>
     </style>
 
-    <style name="BlackTheme.PeerTube" parent="BlackTheme.Switchable">
+    <style name="BlackTheme.PeerTube" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_peertube_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
         <item name="colorAccent">@color/dark_peertube_accent_color</item>
     </style>
 
     <!-- Media.ccc -->
-    <style name="LightTheme.MediaCCC" parent="LightTheme.Switchable">
+    <style name="LightTheme.MediaCCC" parent="LightTheme">
         <item name="colorPrimary">@color/light_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/light_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/light_media_ccc_accent_color</item>
     </style>
 
-    <style name="DarkTheme.MediaCCC" parent="DarkTheme.Switchable">
+    <style name="DarkTheme.MediaCCC" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
     </style>
 
-    <style name="BlackTheme.MediaCCC" parent="BlackTheme.Switchable">
+    <style name="BlackTheme.MediaCCC" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 633003092..d72a1b092 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -74,10 +74,6 @@
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
-    <style name="LightTheme.Switchable">
-        <item name="android:windowAnimationStyle">@style/SwitchAnimation</item>
-    </style>
-
     <style name="Base.V7.DarkTheme" parent="Theme.AppCompat.NoActionBar" />
     <style name="Base.DarkTheme" parent="Base.V7.DarkTheme" />
     <style name="DarkTheme" parent="Base.DarkTheme">
@@ -144,10 +140,6 @@
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
-    <style name="DarkTheme.Switchable">
-        <item name="android:windowAnimationStyle">@style/SwitchAnimation</item>
-    </style>
-
     <style name="Base.V7.BlackTheme" parent="DarkTheme"/>
     <style name="Base.BlackTheme" parent="Base.V7.BlackTheme"/>
     <style name="BlackTheme" parent="Base.BlackTheme">
@@ -158,10 +150,6 @@
         <item name="contrast_background_color">@color/black_contrast_background_color</item>
     </style>
 
-    <style name="BlackTheme.Switchable">
-        <item name="android:windowAnimationStyle">@style/SwitchAnimation</item>
-    </style>
-
     <!-- Dialogs -->
     <style name="LightDialogTheme" parent="Theme.AppCompat.Light.Dialog">
         <item name="colorPrimary">@color/light_youtube_primary_color</item>
@@ -192,11 +180,6 @@
         <item name="colorAccent">@color/black_settings_accent_color</item>
     </style>
 
-    <style name="SwitchAnimation" parent="@android:style/Animation.Activity">
-        <item name="android:windowEnterAnimation">@anim/switch_service_in</item>
-        <item name="android:windowExitAnimation">@anim/switch_service_out</item>
-    </style>
-
     <style name="Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
         <item name="android:textSize">18sp</item>
     </style>
diff --git a/app/src/main/res/values/styles_services.xml b/app/src/main/res/values/styles_services.xml
index 28490d7c6..013690b44 100644
--- a/app/src/main/res/values/styles_services.xml
+++ b/app/src/main/res/values/styles_services.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- YouTube -->
-    <style name="LightTheme.YouTube" parent="LightTheme.Switchable">
+    <style name="LightTheme.YouTube" parent="LightTheme">
     </style>
 
-    <style name="DarkTheme.YouTube" parent="DarkTheme.Switchable">
+    <style name="DarkTheme.YouTube" parent="DarkTheme">
     </style>
 
-    <style name="BlackTheme.YouTube" parent="BlackTheme.Switchable">
+    <style name="BlackTheme.YouTube" parent="BlackTheme">
     </style>
 
     <!-- SoundCloud -->
-    <style name="LightTheme.SoundCloud" parent="LightTheme.Switchable">
+    <style name="LightTheme.SoundCloud" parent="LightTheme">
         <item name="colorPrimary">@color/light_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/light_soundcloud_dark_color</item>
         <item name="colorAccent">@color/light_soundcloud_accent_color</item>
         <item name="progress_horizontal_drawable">@drawable/progress_soundcloud_horizontal_light</item>
     </style>
 
-    <style name="DarkTheme.SoundCloud" parent="DarkTheme.Switchable">
+    <style name="DarkTheme.SoundCloud" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_soundcloud_dark_color</item>
         <item name="colorAccent">@color/dark_soundcloud_accent_color</item>
         <item name="progress_horizontal_drawable">@drawable/progress_soundcloud_horizontal_dark</item>
     </style>
 
-    <style name="BlackTheme.SoundCloud" parent="BlackTheme.Switchable">
+    <style name="BlackTheme.SoundCloud" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_soundcloud_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_soundcloud_dark_color</item>
         <item name="colorAccent">@color/dark_soundcloud_accent_color</item>
@@ -33,38 +33,38 @@
     </style>
 
     <!-- PeerTube -->
-    <style name="LightTheme.PeerTube" parent="LightTheme.Switchable">
+    <style name="LightTheme.PeerTube" parent="LightTheme">
         <item name="colorPrimary">@color/light_peertube_primary_color</item>
         <item name="colorPrimaryDark">@color/light_peertube_dark_color</item>
         <item name="colorAccent">@color/light_peertube_accent_color</item>
     </style>
 
-    <style name="DarkTheme.PeerTube" parent="DarkTheme.Switchable">
+    <style name="DarkTheme.PeerTube" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_peertube_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
         <item name="colorAccent">@color/dark_peertube_accent_color</item>
     </style>
 
-    <style name="BlackTheme.PeerTube" parent="BlackTheme.Switchable">
+    <style name="BlackTheme.PeerTube" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_peertube_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
         <item name="colorAccent">@color/dark_peertube_accent_color</item>
     </style>
 
     <!-- Media.ccc -->
-    <style name="LightTheme.MediaCCC" parent="LightTheme.Switchable">
+    <style name="LightTheme.MediaCCC" parent="LightTheme">
         <item name="colorPrimary">@color/light_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/light_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/light_media_ccc_accent_color</item>
     </style>
 
-    <style name="DarkTheme.MediaCCC" parent="DarkTheme.Switchable">
+    <style name="DarkTheme.MediaCCC" parent="DarkTheme">
         <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>
     </style>
 
-    <style name="BlackTheme.MediaCCC" parent="BlackTheme.Switchable">
+    <style name="BlackTheme.MediaCCC" parent="BlackTheme">
         <item name="colorPrimary">@color/dark_media_ccc_primary_color</item>
         <item name="colorPrimaryDark">@color/dark_media_ccc_statusbar_color</item>
         <item name="colorAccent">@color/dark_media_ccc_accent_color</item>