diff --git a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
index e3476931..3e4a2ef4 100644
--- a/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java
@@ -660,7 +660,7 @@ public class FullPlaybackActivity extends PlaybackActivity
 			SharedPreferences.Editor editor = PlaybackService.getSettings(this).edit();
 			editor.putBoolean(PrefKeys.VISIBLE_CONTROLS, mControlsVisible);
 			editor.putBoolean(PrefKeys.VISIBLE_EXTRA_INFO, mExtraInfoVisible);
-			editor.commit();
+			editor.apply();
 			break;
 		}
 		case MSG_UPDATE_PROGRESS:
diff --git a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
index ad4f07ae..ad3377d4 100644
--- a/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/LibraryActivity.java
@@ -896,7 +896,7 @@ public class LibraryActivity
 		case MSG_SAVE_PAGE: {
 			SharedPreferences.Editor editor = PlaybackService.getSettings(this).edit();
 			editor.putInt("library_page", message.arg1);
-			editor.commit();
+			editor.apply();
 			break;
 		}
 		case MSG_UPDATE_COVER: {
diff --git a/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java b/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
index 35ad7e3a..6961fece 100644
--- a/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
@@ -661,7 +661,7 @@ public class LibraryPagerAdapter
 			MediaAdapter adapter = (MediaAdapter)message.obj;
 			SharedPreferences.Editor editor = PlaybackService.getSettings(mActivity).edit();
 			editor.putInt(String.format("sort_%d_%d", adapter.getMediaType(), adapter.getLimiterType()), adapter.getSortMode());
-			editor.commit();
+			editor.apply();
 			break;
 		}
 		case MSG_REQUEST_REQUERY:
diff --git a/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java b/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java
index d41db0bc..e36ec2ce 100644
--- a/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java
+++ b/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java
@@ -231,7 +231,7 @@ public class SeekBarPreference extends DialogPreference implements SeekBar.OnSee
 	private void saveCheckBoxPreference(boolean enabled) {
 		SharedPreferences.Editor editor = PlaybackService.getSettings(mContext).edit();
 		editor.putBoolean(mCheckBoxKey, enabled);
-		editor.commit();
+		editor.apply();
 	}
 
 	private boolean getCheckBoxPreference() {
diff --git a/src/ch/blinkenlights/android/vanilla/TabOrderActivity.java b/src/ch/blinkenlights/android/vanilla/TabOrderActivity.java
index 7613f255..702a850b 100644
--- a/src/ch/blinkenlights/android/vanilla/TabOrderActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/TabOrderActivity.java
@@ -117,7 +117,7 @@ public class TabOrderActivity extends Activity
 
 		SharedPreferences.Editor editor = PlaybackService.getSettings(this).edit();
 		editor.putString(PrefKeys.TAB_ORDER, new String(out));
-		editor.commit();
+		editor.apply();
 	}
 
 	/**