diff --git a/app/src/main/java/me/impy/aegis/ui/EditEntryActivity.java b/app/src/main/java/me/impy/aegis/ui/EditEntryActivity.java
index 66b995be..07d90a99 100644
--- a/app/src/main/java/me/impy/aegis/ui/EditEntryActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/EditEntryActivity.java
@@ -310,7 +310,7 @@ public class EditEntryActivity extends AegisActivity {
                     finish(true);
                 });
                 break;
-            case R.id.action_default_image:
+            case R.id.action_default_icon:
                 TextDrawable drawable = TextDrawableHelper.generate(_entry.getIssuer(), _entry.getName(), _iconView);
                 _iconView.setImageDrawable(drawable);
                 _hasCustomImage = false;
@@ -328,7 +328,7 @@ public class EditEntryActivity extends AegisActivity {
             menu.findItem(R.id.action_delete).setVisible(false);
         }
         if (!_hasCustomImage) {
-            menu.findItem(R.id.action_default_image).setVisible(false);
+            menu.findItem(R.id.action_default_icon).setVisible(false);
         }
 
         return true;
diff --git a/app/src/main/java/me/impy/aegis/ui/MainActivity.java b/app/src/main/java/me/impy/aegis/ui/MainActivity.java
index e2c238c8..3092e955 100644
--- a/app/src/main/java/me/impy/aegis/ui/MainActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/MainActivity.java
@@ -99,7 +99,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         setIntent(intent);
 
         if (!doShortcutActions() || _db.isLocked()) {
-            startAuthActivity();
+            unlockDatabase(null);
         }
     }
 
@@ -155,6 +155,7 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
         } else if (data.getBooleanExtra("needsRefresh", false)) {
             boolean showIssuer = getPreferences().isIssuerVisible();
             _entryListView.setShowIssuer(showIssuer);
+            _entryListView.refresh(true);
         }
     }
 
@@ -361,6 +362,10 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
     }
 
     private void unlockDatabase(MasterKey key) {
+        if (_loaded) {
+            return;
+        }
+
         try {
             if (!_db.isLoaded()) {
                 _db.load();
diff --git a/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java b/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java
index fed1c3b4..8b8e8fc2 100644
--- a/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java
+++ b/app/src/main/java/me/impy/aegis/ui/PreferencesFragment.java
@@ -142,7 +142,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat implements Pas
                 if (!_db.getFile().isEncrypted()) {
                     PasswordDialogFragment dialog = new PasswordDialogFragment();
                     // TODO: find a less ugly way to obtain the fragment manager
-                    dialog.show(((AppCompatActivity)getActivity()).getSupportFragmentManager(), null);
+                    dialog.show(getActivity().getSupportFragmentManager(), null);
                 } else {
                     new AlertDialog.Builder(getActivity())
                             .setTitle("Disable encryption")
diff --git a/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java b/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java
index 992273a6..b0953d9c 100644
--- a/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java
+++ b/app/src/main/java/me/impy/aegis/ui/views/EntryListView.java
@@ -131,7 +131,6 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
 
     public void setShowIssuer(boolean showIssuer) {
         _adapter.setShowIssuer(showIssuer);
-        _adapter.refresh(true);
     }
 
     public void addEntry(DatabaseEntry entry) {
diff --git a/app/src/main/res/menu/menu_edit.xml b/app/src/main/res/menu/menu_edit.xml
index 3a99d087..6ac59e45 100644
--- a/app/src/main/res/menu/menu_edit.xml
+++ b/app/src/main/res/menu/menu_edit.xml
@@ -13,7 +13,7 @@
         app:showAsAction="never"/>
 
     <item
-        android:id="@+id/action_default_image"
-        android:title="@string/action_default_image"
+        android:id="@+id/action_default_icon"
+        android:title="@string/action_default_icon"
         app:showAsAction="never"/>
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 352bb667..9e4f336a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="action_settings">Settings</string>
     <string name="action_import">Import</string>
     <string name="action_delete">Delete</string>
-    <string name="action_default_image">Set default image</string>
+    <string name="action_default_icon">Restore default icon</string>
     <string name="discard">Discard</string>
     <string name="save">Save</string>
     <string name="title_activity_intro">IntroActivity</string>