diff --git a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java
index 826de3736..a205ab066 100644
--- a/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java
+++ b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java
@@ -567,7 +567,7 @@ public class SwapService extends Service {
         return new NotificationCompat.Builder(this)
                 .setContentTitle(getText(R.string.local_repo_running))
                 .setContentText(getText(R.string.touch_to_configure_local_repo))
-                .setSmallIcon(R.drawable.ic_swap)
+                .setSmallIcon(R.drawable.ic_nearby)
                 .setContentIntent(contentIntent)
                 .build();
     }
diff --git a/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java b/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java
index 023524a9a..baf3a68a1 100644
--- a/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java
+++ b/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java
@@ -14,6 +14,7 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.Log;
 import org.apache.commons.net.util.SubnetUtils;
+import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.UpdateService;
@@ -266,11 +267,17 @@ public class WifiStateChangeService extends IntentService {
                                 // java.lang.IllegalArgumentException: Value [64] not in range [0,32]
                                 continue;
                             }
-                            if (inetAddress.equals(address.getAddress()) && !TextUtils.isEmpty(FDroidApp.ipAddressString)) {
+                            try {
                                 String cidr = String.format(Locale.ENGLISH, "%s/%d",
                                         FDroidApp.ipAddressString, networkPrefixLength);
                                 FDroidApp.subnetInfo = new SubnetUtils(cidr).getInfo();
                                 break;
+                            } catch (IllegalArgumentException e) {
+                                if (BuildConfig.DEBUG) {
+                                    e.printStackTrace();
+                                } else {
+                                    Log.i(TAG, e.getLocalizedMessage());
+                                }
                             }
                         }
                     }
diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java b/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
index dd476de05..8c0d8e4a0 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
@@ -68,7 +68,7 @@ class CategoriesViewBinder implements LoaderManager.LoaderCallbacks<Cursor> {
             }
         });
 
-        FloatingActionButton searchFab = (FloatingActionButton) categoriesView.findViewById(R.id.btn_search);
+        FloatingActionButton searchFab = (FloatingActionButton) categoriesView.findViewById(R.id.fab_search);
         searchFab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java b/app/src/full/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java
index 051da5b4f..acb91388a 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java
@@ -67,7 +67,7 @@ class WhatsNewViewBinder implements LoaderManager.LoaderCallbacks<Cursor> {
             }
         });
 
-        FloatingActionButton searchFab = (FloatingActionButton) whatsNewView.findViewById(R.id.btn_search);
+        FloatingActionButton searchFab = (FloatingActionButton) whatsNewView.findViewById(R.id.fab_search);
         searchFab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/full/res/drawable-hdpi/ic_swap.png b/app/src/full/res/drawable-hdpi/ic_swap.png
deleted file mode 100644
index 4f155215a..000000000
Binary files a/app/src/full/res/drawable-hdpi/ic_swap.png and /dev/null differ
diff --git a/app/src/full/res/drawable-ldpi/ic_swap.png b/app/src/full/res/drawable-ldpi/ic_swap.png
deleted file mode 100644
index 3920e0a80..000000000
Binary files a/app/src/full/res/drawable-ldpi/ic_swap.png and /dev/null differ
diff --git a/app/src/full/res/drawable-mdpi/ic_swap.png b/app/src/full/res/drawable-mdpi/ic_swap.png
deleted file mode 100644
index ba66d65d7..000000000
Binary files a/app/src/full/res/drawable-mdpi/ic_swap.png and /dev/null differ
diff --git a/app/src/full/res/drawable-xhdpi/ic_swap.png b/app/src/full/res/drawable-xhdpi/ic_swap.png
deleted file mode 100644
index 00b028953..000000000
Binary files a/app/src/full/res/drawable-xhdpi/ic_swap.png and /dev/null differ
diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java
index 33b6b5ee4..75d7d5b1b 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/App.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/App.java
@@ -381,6 +381,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
         App app = new App();
         PackageInfo packageInfo = pm.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS);
         SanitizedFile apkFile = SanitizedFile.knownSanitized(packageInfo.applicationInfo.publicSourceDir);
+        app.installedApk = new Apk();
         if (apkFile.canRead()) {
             String hashType = "SHA-256";
             String hash = Utils.getBinaryHash(apkFile, hashType);
@@ -389,11 +390,9 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
             }
             app.installedApk.hashType = hashType;
             app.installedApk.hash = hash;
-            app.installedApk.sig = Utils.getPackageSig(packageInfo);
         }
 
         app.setFromPackageInfo(pm, packageInfo);
-        app.installedApk = new Apk();
         app.initInstalledApk(context, app.installedApk, packageInfo, apkFile);
         return app;
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
index 8c49f0617..a9a9153fe 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
@@ -295,6 +295,8 @@ public class PreferencesFragment extends PreferenceFragment
                     if (TextUtils.equals(Preferences.PREF_EXPERT, pref.getDependency())) {
                         pref.setVisible(isExpertMode);
                     }
+                }
+                if (changing) {
                     RecyclerView recyclerView = getListView();
                     recyclerView.smoothScrollToPosition(recyclerView.getAdapter().getItemCount() - 1);
                 }
diff --git a/app/src/main/res/layout/fab_search.xml b/app/src/main/res/layout/fab_search.xml
index 006bd38d4..de7f83d4f 100644
--- a/app/src/main/res/layout/fab_search.xml
+++ b/app/src/main/res/layout/fab_search.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.FloatingActionButton
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/btn_search"
+    android:id="@+id/fab_search"
     android:src="@drawable/ic_search_white"
     android:contentDescription="@string/menu_search"
     android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/preference_seekbar.xml b/app/src/main/res/layout/preference_seekbar.xml
index b3b91d9a9..84a95b2ed 100644
--- a/app/src/main/res/layout/preference_seekbar.xml
+++ b/app/src/main/res/layout/preference_seekbar.xml
@@ -21,10 +21,8 @@
               android:layout_below="@android:id/title"
               android:layout_alignLeft="@android:id/title"
               android:layout_alignStart="@android:id/title"
-              android:textAppearance="?attr/textAppearanceListItemSmall"
+              android:textAppearance="?attr/textAppearanceListItemSecondary"
               android:textColor="?android:attr/textColorSecondary"
-              android:singleLine="true"
-              android:ellipsize="marquee"
               android:fadingEdge="horizontal"/>
 
     <!-- @+id/seekbar_value must be present in a SeekBarPreference, but we don't use it -->