diff --git a/apk/PhotoAffix.apk b/apk/PhotoAffix.apk
index 112c79d..d939ec6 100644
Binary files a/apk/PhotoAffix.apk and b/apk/PhotoAffix.apk differ
diff --git a/app/build.gradle b/app/build.gradle
index 9be30f6..58da4b1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,8 +28,8 @@ android {
         applicationId "com.afollestad.photoaffix"
         minSdkVersion 21
         targetSdkVersion 23
-        versionCode 14
-        versionName "0.3.0 BETA"
+        versionCode 15
+        versionName "0.3.1 BETA"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/com/afollestad/photoaffix/dialogs/ImageSpacingDialog.java b/app/src/main/java/com/afollestad/photoaffix/dialogs/ImageSpacingDialog.java
index d54514f..2fc39d0 100644
--- a/app/src/main/java/com/afollestad/photoaffix/dialogs/ImageSpacingDialog.java
+++ b/app/src/main/java/com/afollestad/photoaffix/dialogs/ImageSpacingDialog.java
@@ -3,8 +3,10 @@
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.DialogFragment;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
@@ -47,7 +49,9 @@ public interface SpacingCallback {
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final int fillColor = Prefs.bgFillColor(getActivity());
+        int fillColor = Prefs.bgFillColor(getActivity());
+        if (fillColor == Color.TRANSPARENT)
+            fillColor = ContextCompat.getColor(getActivity(), R.color.colorAccent);
         MaterialDialog dialog = new MaterialDialog.Builder(getActivity())
                 .title(R.string.image_spacing)
                 .customView(R.layout.dialog_imagespacing, true)
@@ -55,6 +59,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
                 .negativeText(android.R.string.cancel)
                 .positiveColor(fillColor)
                 .negativeColor(fillColor)
+                .widgetColor(fillColor)
                 .onPositive(new MaterialDialog.SingleButtonCallback() {
                     @Override
                     public void onClick(@NonNull MaterialDialog materialDialog, @NonNull DialogAction dialogAction) {
diff --git a/app/src/main/java/com/afollestad/photoaffix/ui/MainActivity.java b/app/src/main/java/com/afollestad/photoaffix/ui/MainActivity.java
index 8b81b83..1145bad 100644
--- a/app/src/main/java/com/afollestad/photoaffix/ui/MainActivity.java
+++ b/app/src/main/java/com/afollestad/photoaffix/ui/MainActivity.java
@@ -17,6 +17,7 @@
 import android.os.PersistableBundle;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.Size;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
@@ -224,7 +225,8 @@ protected void onResume() {
     @Override
     protected void onPause() {
         super.onPause();
-        Inquiry.deinit();
+        if (isFinishing())
+            Inquiry.deinit();
     }
 
     public void clearSelection() {
@@ -348,7 +350,9 @@ private int[] getNextBitmapSize() {
         return new int[]{options.outWidth, options.outHeight};
     }
 
+    @Nullable
     private BitmapFactory.Options getNextBitmapOptions() {
+        if (mSelectedPhotos == null) return null;
         mTraverseIndex++;
         if (mTraverseIndex > mSelectedPhotos.length - 1)
             return null;