diff --git a/res/layout/media_overview_activity.xml b/res/layout/media_overview_activity.xml
index 89303486c4..79fd04f126 100644
--- a/res/layout/media_overview_activity.xml
+++ b/res/layout/media_overview_activity.xml
@@ -16,7 +16,6 @@
                 android:layout_height="?android:attr/actionBarSize"
                 android:background="?attr/media_overview_toolbar_background"
                 android:titleTextColor="?attr/media_overview_toolbar_foreground"
-                android:foreground="?attr/media_overview_toolbar_foreground"
                 app:layout_scrollFlags="scroll|enterAlways"/>
 
         <android.support.design.widget.TabLayout
diff --git a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
index 38adf7b72d..bc911e0e3a 100644
--- a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
@@ -59,6 +59,8 @@ import java.util.Locale;
  * Activity for displaying media attachments in-app
  */
 public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity  {
+
+  @SuppressWarnings("unused")
   private final static String TAG = MediaOverviewActivity.class.getSimpleName();
 
   public static final String ADDRESS_EXTRA   = "address";
@@ -198,7 +200,7 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity
     private StickyHeaderGridLayoutManager gridManager;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
       View view = inflater.inflate(R.layout.media_overview_gallery_fragment, container, false);
 
       this.recyclerView = ViewUtil.findById(view, R.id.media_grid);
@@ -244,7 +246,7 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity
   public static class MediaOverviewDocumentsFragment extends MediaOverviewFragment<Cursor> {
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
       View                  view    = inflater.inflate(R.layout.media_overview_documents_fragment, container, false);
       MediaDocumentsAdapter adapter = new MediaDocumentsAdapter(getContext(), masterSecret, null, locale);