diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/InstanceActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/InstanceActivity.java
index ff783a4e1..e6956f594 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/InstanceActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/InstanceActivity.java
@@ -35,7 +35,6 @@ import fr.gouv.etalab.mastodon.R;
 import fr.gouv.etalab.mastodon.asynctasks.RetrieveInstanceAsyncTask;
 import fr.gouv.etalab.mastodon.client.APIResponse;
 import fr.gouv.etalab.mastodon.client.Entities.Instance;
-import fr.gouv.etalab.mastodon.client.Entities.InstanceSocial;
 import fr.gouv.etalab.mastodon.helper.Helper;
 import fr.gouv.etalab.mastodon.interfaces.OnRetrieveInstanceInterface;
 
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/InstanceHealthActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/InstanceHealthActivity.java
index 00bd71694..93e04b081 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/InstanceHealthActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/InstanceHealthActivity.java
@@ -39,7 +39,6 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
index 33c571375..b40414a14 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
@@ -216,6 +216,19 @@ public class SettingsFragment extends Fragment {
             }
         });
 
+        boolean disableGif = sharedpreferences.getBoolean(Helper.SET_DISABLE_GIF, false);
+        final CheckBox set_disable_gif = rootView.findViewById(R.id.set_disable_gif);
+        set_disable_gif.setChecked(disableGif);
+        set_disable_gif.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                SharedPreferences.Editor editor = sharedpreferences.edit();
+                editor.putBoolean(Helper.SET_DISABLE_GIF, set_disable_gif.isChecked());
+                editor.apply();
+            }
+        });
+
+
         boolean livenotif = sharedpreferences.getBoolean(Helper.SET_LIVE_NOTIFICATIONS, true);
         final CheckBox set_live_notif = rootView.findViewById(R.id.set_live_notify);
         set_live_notif.setChecked(livenotif);
@@ -235,6 +248,7 @@ public class SettingsFragment extends Fragment {
         });
 
 
+
         boolean display_global = sharedpreferences.getBoolean(Helper.SET_DISPLAY_GLOBAL, true);
         final CheckBox set_display_global = rootView.findViewById(R.id.set_display_global);
         set_display_global.setChecked(display_global);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 5229d18d4..528237b37 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -216,6 +216,7 @@ public class Helper {
     public static final String INSTANCE_VERSION = "instance_version";
     public static final String SET_LIVE_NOTIFICATIONS = "set_show_replies";
     public static final String SET_PICTURE_URL = "set_picture_url";
+    public static final String SET_DISABLE_GIF = "set_disable_gif";
     public static final int ATTACHMENT_ALWAYS = 1;
     public static final int ATTACHMENT_WIFI = 2;
     public static final int ATTACHMENT_ASK = 3;
diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml
index 0811afc73..b6f465f30 100644
--- a/app/src/main/res/layout-sw600dp/fragment_settings.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml
@@ -119,6 +119,14 @@
             android:text="@string/live_notif"
             android:layout_height="wrap_content" />
 
+
+        <!-- GIF AVATARS -->
+        <CheckBox
+            android:id="@+id/set_disable_gif"
+            android:layout_width="wrap_content"
+            android:text="@string/set_disable_gif"
+            android:layout_height="wrap_content" />
+
         <!-- TABS Layout -->
         <LinearLayout
             android:id="@+id/translation_layout_container"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 31696193c..cc02baa79 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -120,6 +120,14 @@
             android:text="@string/live_notif"
             android:layout_height="wrap_content" />
 
+        <!-- GIF AVATARS -->
+        <CheckBox
+            android:id="@+id/set_disable_gif"
+            android:layout_width="wrap_content"
+            android:text="@string/set_disable_gif"
+            android:layout_height="wrap_content" />
+
+
         <!-- Translation engine -->
         <LinearLayout
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index b3f8a005f..07e46ca4b 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -413,4 +413,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index cb6f85b78..41c3d19d6 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -443,4 +443,5 @@
   <string name="search">البحث</string>
   <string name="delete">حذف</string>
   <string name="fetch_more_toots">تحميل المزيد من التبويقات ...</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index b3f8a005f..07e46ca4b 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -413,4 +413,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 34451088e..09b86e7b3 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -421,4 +421,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index b3f8a005f..07e46ca4b 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -413,4 +413,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4894d8060..1ac933e42 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -402,4 +402,5 @@
   <string name="search">Suche</string>
   <string name="delete">Löschen</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index b3f8a005f..07e46ca4b 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -413,4 +413,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index b3f8a005f..07e46ca4b 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -413,4 +413,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b3f8a005f..07e46ca4b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -413,4 +413,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b3f8a005f..07e46ca4b 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -413,4 +413,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7fc3490c4..b73fbd5c7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -412,4 +412,5 @@
   <string name="search">Rechercher</string>
   <string name="delete">Supprimer</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index ea9db485a..f2ffcbdab 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -429,4 +429,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index b3f8a005f..07e46ca4b 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -413,4 +413,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 18066c8d2..83be9a800 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -406,4 +406,5 @@ https://yandex.ru/legal/confidential/?lang=en
   <string name="search">Cari</string>
   <string name="delete">Hapus</string>
   <string name="fetch_more_toots">Ambil lebih banyak kutipan…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b3f8a005f..07e46ca4b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -413,4 +413,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ab37a23e0..f58a82eb8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -405,4 +405,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ab37a23e0..f58a82eb8 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -405,4 +405,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 4b2c9ca05..42229df1e 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -413,4 +413,5 @@
   <string name="search">Zoeken</string>
   <string name="delete">Verwijderen</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index b3f8a005f..07e46ca4b 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -413,4 +413,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 34451088e..09b86e7b3 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -421,4 +421,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 1e7ee8b60..d9e2b08e4 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -413,4 +413,5 @@
   <string name="search">Pesquisar</string>
   <string name="delete">Eliminar</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 11bce0480..ee2f297b4 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -417,4 +417,5 @@ Vă mulțumesc:
   <string name="search">Căutare</string>
   <string name="delete">Șterge</string>
 <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2e9e567c0..655b6bfc3 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -421,4 +421,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
 <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 2e9e567c0..655b6bfc3 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -421,4 +421,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
 <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index d46a631fd..346232f08 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -413,4 +413,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
 <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 09a66edb2..ca16edd5d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -405,4 +405,5 @@ Teşekkürler:    </string>
   <string name="search">Search</string>
   <string name="delete">Delete</string>
 <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2e9e567c0..655b6bfc3 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -421,4 +421,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
 <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index ab37a23e0..f58a82eb8 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -405,4 +405,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 1b89abda2..0e4b9ecc1 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -399,4 +399,5 @@
   <string name="search">Search</string>
   <string name="delete">Delete</string>
   <string name="fetch_more_toots">Fetch more toots…</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 24c17eec5..e74902015 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -300,6 +300,7 @@
     <string name="set_display_reply">Display previous message in responses</string>
     <string name="set_display_local">Display local timeline</string>
     <string name="set_display_global">Display federated timeline</string>
+    <string name="set_disable_gif">Disable GIF avatars</string>
     <string name="set_folder_title">Path: </string>
     <string name="set_auto_store_toot">Save drafts automatically</string>
     <string name="set_bubble_counter">Display counters</string>