diff --git a/app/build.gradle b/app/build.gradle
index bd18cc0e..f63a4e9a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,8 +24,8 @@ android {
         vectorDrawables.useSupportLibrary = true
 
         applicationId "code.name.monkey.retromusic"
-        versionCode 438
-        versionName '3.5.650'
+        versionCode 10438
+        versionName '3.5.650' + "_" + getDate()
 
         multiDexEnabled true
 
@@ -53,17 +53,6 @@ android {
         }
     }
 
-
-    flavorDimensions "default"
-
-    productFlavors {
-        normal {
-            versionCode defaultConfig.versionCode + 10000
-            versionName defaultConfig.versionName + "_" + getDate()
-            dimension "default"
-        }
-    }
-
     packagingOptions {
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/NOTICE'
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt
index b9cb0362..8d5cdb1a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt
@@ -130,9 +130,9 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpda
 
     protected fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            miniPlayerPlayPauseButton!!.setImageResource(R.drawable.ic_pause_white_24dp)
+            miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
         } else {
-            miniPlayerPlayPauseButton!!.setImageResource(R.drawable.ic_play_arrow_white_24dp)
+            miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp)
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml b/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml
index 0fe0360e..1cd7da06 100644
--- a/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml
+++ b/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml
@@ -17,12 +17,7 @@
     android:height="64dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:rotation="90">
-        <path
-            android:fillColor="@color/md_white_1000"
-            android:pathData="M8 5v14l11-7L8 5z" />
-    </group>
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M8 5v14l11-7L8 5z" />
 </vector>
\ No newline at end of file