diff --git a/app/src/main/java/i2p/bote/android/BoteActivityBase.java b/app/src/main/java/i2p/bote/android/BoteActivityBase.java
index 96ea783..85aa8bc 100644
--- a/app/src/main/java/i2p/bote/android/BoteActivityBase.java
+++ b/app/src/main/java/i2p/bote/android/BoteActivityBase.java
@@ -1,10 +1,12 @@
 package i2p.bote.android;
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
 import i2p.bote.android.util.LocaleManager;
 
+@SuppressLint("Registered")
 public class BoteActivityBase extends AppCompatActivity {
     private final LocaleManager localeManager = new LocaleManager();
 
diff --git a/app/src/main/java/i2p/bote/android/config/SetPasswordActivity.java b/app/src/main/java/i2p/bote/android/config/SetPasswordActivity.java
index 78e361e..c16842e 100644
--- a/app/src/main/java/i2p/bote/android/config/SetPasswordActivity.java
+++ b/app/src/main/java/i2p/bote/android/config/SetPasswordActivity.java
@@ -19,6 +19,7 @@ public class SetPasswordActivity extends BoteActivityBase implements
         setSupportActionBar(toolbar);
 
         // Enable ActionBar app icon to behave as action to go back
+        //noinspection ConstantConditions
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     }
 
diff --git a/app/src/main/java/i2p/bote/android/config/SettingsActivity.java b/app/src/main/java/i2p/bote/android/config/SettingsActivity.java
index 6a80d1a..621303d 100644
--- a/app/src/main/java/i2p/bote/android/config/SettingsActivity.java
+++ b/app/src/main/java/i2p/bote/android/config/SettingsActivity.java
@@ -37,6 +37,7 @@ public class SettingsActivity extends BoteActivityBase implements
         // Set the action bar
         Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
         setSupportActionBar(toolbar);
+        //noinspection ConstantConditions
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         Fragment fragment;
@@ -98,6 +99,7 @@ public class SettingsActivity extends BoteActivityBase implements
         @Override
         public void onResume() {
             super.onResume();
+            //noinspection ConstantConditions
             ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.action_settings);
         }
 
diff --git a/app/src/main/java/org/sufficientlysecure/htmltextview/HtmlTagHandler.java b/app/src/main/java/org/sufficientlysecure/htmltextview/HtmlTagHandler.java
index 4225e08..b96503a 100644
--- a/app/src/main/java/org/sufficientlysecure/htmltextview/HtmlTagHandler.java
+++ b/app/src/main/java/org/sufficientlysecure/htmltextview/HtmlTagHandler.java
@@ -17,10 +17,6 @@
 
 package org.sufficientlysecure.htmltextview;
 
-import java.util.Vector;
-
-import org.xml.sax.XMLReader;
-
 import android.text.Editable;
 import android.text.Html;
 import android.text.Layout;
@@ -31,12 +27,16 @@ import android.text.style.LeadingMarginSpan;
 import android.text.style.TypefaceSpan;
 import android.util.Log;
 
+import org.xml.sax.XMLReader;
+
+import java.util.Vector;
+
 /**
  * Some parts of this code are based on android.text.Html
  */
 public class HtmlTagHandler implements Html.TagHandler {
     private int mListItemCount = 0;
-    private Vector<String> mListParents = new Vector<String>();
+    private Vector<String> mListParents = new Vector<>();
 
     private static class Code {
     }
diff --git a/app/src/main/java/org/sufficientlysecure/htmltextview/UrlImageGetter.java b/app/src/main/java/org/sufficientlysecure/htmltextview/UrlImageGetter.java
index 1e08b52..d5b12a2 100644
--- a/app/src/main/java/org/sufficientlysecure/htmltextview/UrlImageGetter.java
+++ b/app/src/main/java/org/sufficientlysecure/htmltextview/UrlImageGetter.java
@@ -75,7 +75,7 @@ public class UrlImageGetter implements ImageGetter {
         @Override
         protected void onPostExecute(Drawable result) {
             // set the correct bound according to the result from HTTP call
-            urlDrawable.setBounds(0, 0, 0 + result.getIntrinsicWidth(), 0 + result.getIntrinsicHeight());
+            urlDrawable.setBounds(0, 0, result.getIntrinsicWidth(), result.getIntrinsicHeight());
 
             // change the reference of the current drawable to the result from the HTTP call
             urlDrawable.drawable = result;
@@ -94,7 +94,7 @@ public class UrlImageGetter implements ImageGetter {
             try {
                 InputStream is = fetch(urlString);
                 Drawable drawable = Drawable.createFromStream(is, "src");
-                drawable.setBounds(0, 0, 0 + drawable.getIntrinsicWidth(), 0 + drawable.getIntrinsicHeight());
+                drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
                 return drawable;
             } catch (Exception e) {
                 return null;
diff --git a/app/src/main/res/layout/fragment_list_identities.xml b/app/src/main/res/layout/fragment_list_identities.xml
index fefc418..d32eba5 100644
--- a/app/src/main/res/layout/fragment_list_identities.xml
+++ b/app/src/main/res/layout/fragment_list_identities.xml
@@ -1,33 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <FrameLayout
+    <i2p.bote.android.widget.LoadingRecyclerView
+        android:id="@+id/identities_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical"/>
+
+    <RelativeLayout
+        android:id="@+id/empty"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <i2p.bote.android.widget.LoadingRecyclerView
-            android:id="@+id/identities_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="vertical"/>
-
-        <RelativeLayout
-            android:id="@+id/empty"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <com.pnikosis.materialishprogress.ProgressWheel
-                android:id="@+id/loading"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                app:matProg_barColor="@color/accent"
-                app:matProg_progressIndeterminate="true"/>
-        </RelativeLayout>
-    </FrameLayout>
-</RelativeLayout>
\ No newline at end of file
+        <com.pnikosis.materialishprogress.ProgressWheel
+            android:id="@+id/loading"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            app:matProg_barColor="@color/accent"
+            app:matProg_progressIndeterminate="true"/>
+    </RelativeLayout>
+</FrameLayout>
\ No newline at end of file