diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ListAdapter.java
index eab8eab3e..fa06cc65c 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ListAdapter.java
@@ -100,9 +100,12 @@ public class ListAdapter extends BaseAdapter implements OnListActionInterface {
         if( theme == Helper.THEME_LIGHT){
             holder.search_container.setBackgroundResource(R.color.mastodonC3__);
             changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.black);
-        }else {
+        }else if(theme == Helper.THEME_DARK){
             holder.search_container.setBackgroundResource(R.color.mastodonC1_);
             changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.dark_text);
+        }else if(theme == Helper.THEME_BLACK) {
+            holder.search_container.setBackgroundResource(R.color.black_2);
+            changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.dark_text);
         }
         Drawable next = ContextCompat.getDrawable(context, R.drawable.ic_keyboard_arrow_right);
         holder.search_title.setText(list.getTitle());
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java
index 56f2def44..26bf591b0 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java
@@ -97,9 +97,12 @@ public class SearchTootsListAdapter extends BaseAdapter  {
         if( theme == Helper.THEME_LIGHT){
             holder.search_container.setBackgroundResource(R.color.mastodonC3__);
             changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.black);
-        }else {
+        }else if(theme == Helper.THEME_DARK){
             holder.search_container.setBackgroundResource(R.color.mastodonC1_);
             changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.dark_text);
+        }else if(theme == Helper.THEME_BLACK) {
+            holder.search_container.setBackgroundResource(R.color.black_2);
+            changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.dark_text);
         }
         Drawable next = ContextCompat.getDrawable(context, R.drawable.ic_keyboard_arrow_right);
         holder.search_title.setText(search);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/TagsSearchAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/TagsSearchAdapter.java
index 4b117b2c1..75c11a46c 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/TagsSearchAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/TagsSearchAdapter.java
@@ -66,7 +66,7 @@ public class TagsSearchAdapter extends ArrayAdapter<String> implements Filterabl
 
     @NonNull
     @Override
-    public View getView(final int position, View convertView, ViewGroup parent) {
+    public View getView(final int position, View convertView, @NonNull ViewGroup parent) {
 
         final String tag = tags.get(position);
         final ViewHolder holder;
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplaySearchFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplaySearchFragment.java
index 1441c6c88..1cc12b048 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplaySearchFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplaySearchFragment.java
@@ -117,7 +117,9 @@ public class DisplaySearchFragment extends Fragment {
                             int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
                             if( theme == Helper.THEME_LIGHT){
                                 changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.black);
-                            }else {
+                            }else if(theme == Helper.THEME_DARK){
+                                changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.dark_text);
+                            }else if(theme == Helper.THEME_BLACK) {
                                 changeDrawableColor(context, R.drawable.ic_keyboard_arrow_right,R.color.dark_text);
                             }
                             searchTootsListAdapter.notifyDataSetChanged();
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 88bd35c22..2c366be90 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -34,7 +34,7 @@
     <color name="buttonb">#B3E5FC</color>
     <color name="titleb">#D7CCC8</color>
     <color name="black">#000</color>
-    <color name="black_2">#222</color>
+    <color name="black_2">#050505</color>
     <!-- Mastodon color scheme -->
     <color name="mastodonC1__">#585c67</color>
     <color name="mastodonC1___">#454b5b</color>
@@ -68,7 +68,4 @@
     <color name="notif_light_3">#d9e1e8</color>
     <color name="notif_light_4">#c9d1d8</color>
 
-    <color name="foreground_material_dark" >@color/mastodonC3__</color>
-    <color name="foreground_material_light">@color/mastodonC1</color>
-
 </resources>