diff --git a/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java b/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java
index 272b3b6..b30b8e4 100644
--- a/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java
+++ b/app/src/main/java/com/doplgangr/secrecy/activities/FilesActivity.java
@@ -37,7 +37,7 @@ protected void onCreate(Bundle savedInstanceState) {
         String vault = extras.getString(Config.vault_extra);
         String password = extras.getString(Config.password_extra);
 
-        overridePendingTransition(R.anim.slide_in_right, R.anim.fadeout);
+        overridePendingTransition(R.anim.slide_in_right, R.animator.fadeout);
         fragmentManager = getFragmentManager();
         if (fragmentManager.findFragmentByTag(FilesListFragment.class.getName()) == null) {
             FilesListFragment fragment = new FilesListFragment();
@@ -91,7 +91,7 @@ void switchFragment(final Fragment fragment) {
 
     @Override
     public void onPause() {
-        overridePendingTransition(R.anim.fadein, R.anim.slide_out_right);
+        overridePendingTransition(R.animator.fadein, R.anim.slide_out_right);
         super.onPause();
         if (isChangingConfigurations())
             onPauseDecision.startActivity();
diff --git a/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java b/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java
index 83c1f21..4cc685c 100644
--- a/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java
+++ b/app/src/main/java/com/doplgangr/secrecy/activities/MainActivity.java
@@ -102,7 +102,7 @@ public void onCreate(Bundle savedInstanceState) {
         }
         if (pInfo != null) {
             if (pInfo.versionCode != versionNumber)
-                addFragment(new UpdateManager(), R.anim.slide_in_right, R.anim.fadeout);
+                addFragment(new UpdateManager(), R.anim.slide_in_right, R.animator.fadeout);
         }
         mNavigation.addNavigationItem(
                 CustomApp.context.getString(R.string.Page_header__vaults),
@@ -284,7 +284,7 @@ public void onFinish(Fragment fragment) {
     @Override
     public void onNew(Bundle bundle, Fragment fragment) {
         fragment.setArguments(bundle);
-        addFragment(fragment, R.anim.slide_in_right, R.anim.fadeout);
+        addFragment(fragment, R.anim.slide_in_right, R.animator.fadeout);
     }
 
     @Override
diff --git a/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java b/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java
index 542c1c1..59d3e2b 100644
--- a/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java
+++ b/app/src/main/java/com/doplgangr/secrecy/fragments/FilesListFragment.java
@@ -29,7 +29,6 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
-import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
@@ -52,21 +51,21 @@
 
 import com.doplgangr.secrecy.Config;
 import com.doplgangr.secrecy.CustomApp;
+import com.doplgangr.secrecy.R;
 import com.doplgangr.secrecy.activities.FilesActivity;
+import com.doplgangr.secrecy.adapters.FilesListAdapter;
 import com.doplgangr.secrecy.events.AddingFileDoneEvent;
 import com.doplgangr.secrecy.events.AddingFileEvent;
 import com.doplgangr.secrecy.events.BackUpDoneEvent;
 import com.doplgangr.secrecy.events.DecryptingFileDoneEvent;
 import com.doplgangr.secrecy.events.NewFileEvent;
 import com.doplgangr.secrecy.exceptions.SecrecyCipherStreamException;
+import com.doplgangr.secrecy.filesystem.Storage;
 import com.doplgangr.secrecy.filesystem.encryption.Vault;
 import com.doplgangr.secrecy.filesystem.files.EncryptedFile;
-import com.doplgangr.secrecy.filesystem.Storage;
 import com.doplgangr.secrecy.jobs.BackupJob;
 import com.doplgangr.secrecy.jobs.InitializeVaultJob;
-import com.doplgangr.secrecy.R;
 import com.doplgangr.secrecy.utils.Util;
-import com.doplgangr.secrecy.adapters.FilesListAdapter;
 import com.ipaulpro.afilechooser.FileChooserActivity;
 
 import java.io.File;
diff --git a/app/src/main/res/anim/fadein.xml b/app/src/main/res/anim/fadein.xml
deleted file mode 100644
index 38e73ae..0000000
--- a/app/src/main/res/anim/fadein.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_mediumAnimTime"
-    android:fromAlpha="0.0"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:toAlpha="1.0"
-    android:zAdjustment="bottom" />
\ No newline at end of file
diff --git a/app/src/main/res/animator/fadein.xml b/app/src/main/res/animator/fadein.xml
new file mode 100644
index 0000000..402d2b7
--- /dev/null
+++ b/app/src/main/res/animator/fadein.xml
@@ -0,0 +1,7 @@
+<objectAnimator  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@android:integer/config_mediumAnimTime"
+    android:valueFrom="0.0"
+    android:interpolator="@android:anim/accelerate_interpolator"
+    android:valueTo="1.0"
+    android:propertyName="alpha"
+    android:zAdjustment="bottom" />
\ No newline at end of file
diff --git a/app/src/main/res/anim/fadeout.xml b/app/src/main/res/animator/fadeout.xml
similarity index 55%
rename from app/src/main/res/anim/fadeout.xml
rename to app/src/main/res/animator/fadeout.xml
index a002af4..5e06425 100644
--- a/app/src/main/res/anim/fadeout.xml
+++ b/app/src/main/res/animator/fadeout.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
     android:duration="@android:integer/config_mediumAnimTime"
-    android:fromAlpha="1.0"
+    android:valueFrom="1.0"
     android:interpolator="@android:anim/accelerate_interpolator"
-    android:toAlpha="0.0"
+    android:valueTo="0.0"
+    android:propertyName="alpha"
     android:zAdjustment="bottom" />
\ No newline at end of file