diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac74e26fc..510801847 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ stages:
   stage: build-and-test
   retry: 2
 
+
 assembleDebug:
   <<: *no-upload
   cache:
@@ -39,6 +40,7 @@ debugTests:
   except:
     - tags
 
+
 ## PROTECTED VARIABLES TO SET IN GITLAB:
 # - GITLAB_API_TOKEN: token you create on Gitlab
 # - NC_REMOTE_DIR:    like https://YOUR_NEXTCLOUD/remote.php/dav/files/YOUR_USER/mastalab (no trailing slash)
diff --git a/README.md b/README.md
index 16749ff82..6053674b2 100644
--- a/README.md
+++ b/README.md
@@ -40,9 +40,9 @@
 <img src="./images/device-2019-02-02-114910.png" width="250">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
-Lead developer: [framapiaf.org/@fedilab](https://framapiaf.org/@fedilab)
+Lead developer: [toot.fedilab.app/@fedilab](https://toot.fedilab.app/@fedilab)
 <br>
-Developer: [mastodon.social/@kasun](https://mastodon.social/@kasun)
+Developer: [toot.fedilab.app/@kasun](https://toot.fedilab.app/@kasun)
 
 ## Backers
 
diff --git a/app/build.gradle b/app/build.gradle
index 72d6a9bdd..ed40e5358 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 334
-        versionName "2.25.0-beta-2"
+        versionCode 346
+        versionName "2.28.2"
         multiDexEnabled true
         renderscriptTargetApi 28 as int
         renderscriptSupportModeEnabled true
@@ -55,6 +55,20 @@ allprojects {
         maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
     }
 }
+
+
+task copyAllReleaseNotes(type: Copy) {
+    from "$buildDir/../src/main/assets/changelogs/"
+    include "*.txt"
+    into "$buildDir/../../fastlane/metadata/android/en-US/changelogs/"
+}
+
+task gitPushReleaseNotes(type: Exec, dependsOn: 'copyAllReleaseNotes') {
+    ['sh', '-c', "git add $buildDir/../../fastlane/metadata/android/en-US/changelogs/*"].execute().text.trim()
+    ['sh', '-c', "git commit -m 'copy release notes'"].execute().text.trim()
+    ['sh', '-c', "git push"].execute().text.trim()
+}
+
 ext.supportLibraryVersion = '29.0.2'
 ext.glideLibraryVersion = '4.9.0'
 ext.conscryptLibraryVersion = '2.2.1'
@@ -74,11 +88,15 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.browser:browser:1.0.0'
-    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation "com.github.bumptech.glide:glide:$glideLibraryVersion"
+    implementation ("com.github.bumptech.glide:recyclerview-integration:$glideLibraryVersion") {
+        // Excludes the support library because it's already included by Glide.
+        transitive = false
+    }
     annotationProcessor "com.github.bumptech.glide:compiler:$glideLibraryVersion"
     annotationProcessor 'com.android.support:support-annotations:28.0.0'
     implementation "org.conscrypt:conscrypt-android:$conscryptLibraryVersion"
@@ -88,7 +106,7 @@ dependencies {
     implementation "com.github.chrisbanes:PhotoView:$photoViewLibraryVersion"
     implementation 'com.r0adkll:slidableactivity:2.1.0'
     implementation 'com.github.stom79:country-picker-android:1.2.0'
-    implementation 'com.github.stom79:mytransl:1.5'
+    implementation 'com.github.stom79:mytransl:2.0'
     implementation 'com.github.stom79:SparkButton:1.0.13'
     implementation "com.koushikdutta.async:androidasync:2.+"
     implementation 'com.vanniktech:emoji-one:0.6.0'
@@ -100,7 +118,6 @@ dependencies {
     implementation 'com.google.android.exoplayer:exoplayer:2.10.6'
     implementation 'org.apache.poi:poi:3.16'
     implementation 'com.github.mabbas007:TagsEditText:1.0.5'
-    implementation 'com.jaredrummler:material-spinner:1.3.1'
     implementation "com.tonyodev.fetch2:fetch2:2.3.6"
     implementation 'com.github.stom79:horizontalbargraph:1.6'
     implementation 'jp.wasabeef:glide-transformations:4.0.0'
@@ -125,6 +142,6 @@ dependencies {
     implementation 'com.github.penfeizhou.android.animation:gif:1.1.0'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
     implementation 'com.github.smarteist:autoimageslider:1.3.2'
-    //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-2'
+    //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0'
     implementation 'com.jaredrummler:cyanea:1.0.2'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 71ab6b438..bda37587e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,6 +41,7 @@
         android:required="false" />
     <application
         android:name="app.fedilab.android.activities.MainApplication"
+        android:requestLegacyExternalStorage="true"
         android:allowBackup="false"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher_bubbles"
@@ -89,7 +90,13 @@
                 <action android:name="StopLiveNotificationReceiver" />
             </intent-filter>
         </receiver>
-
+        <receiver
+            android:name="app.fedilab.android.services.StopDelayedNotificationReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="StopDelayedNotificationReceiver" />
+            </intent-filter>
+        </receiver>
         <service
             android:name="app.fedilab.android.services.StreamingHomeTimelineService"
             android:exported="false" />
@@ -470,6 +477,10 @@
             android:name="app.fedilab.android.activities.InstanceHealthActivity"
             android:excludeFromRecents="true"
             android:theme="@style/Base.V7.Theme.AppCompat.Dialog" />
+        <activity
+            android:name="app.fedilab.android.activities.InstanceProfileActivity"
+            android:excludeFromRecents="true"
+            android:theme="@style/Base.V7.Theme.AppCompat.Dialog" />
         <activity
             android:name="app.fedilab.android.activities.ProxyActivity"
             android:excludeFromRecents="true"
diff --git a/app/src/main/assets/changelogs/342.txt b/app/src/main/assets/changelogs/342.txt
new file mode 100644
index 000000000..2d2b53d36
--- /dev/null
+++ b/app/src/main/assets/changelogs/342.txt
@@ -0,0 +1,12 @@
+Added
+- Unshortened URLs can be copied or shared
+- Trends in tags search
+- Image are shared/stored from cache
+- Message when a media is successfully downloaded
+
+Fixed
+- Issue with polls not displayed
+- Notifications not stopped
+- Pleroma wysiwyg
+- Login issue
+- Some crashes
\ No newline at end of file
diff --git a/app/src/main/assets/changelogs/343.txt b/app/src/main/assets/changelogs/343.txt
new file mode 100644
index 000000000..769ebc05d
--- /dev/null
+++ b/app/src/main/assets/changelogs/343.txt
@@ -0,0 +1,6 @@
+Added
+- Follow Nitter feeds (ie: Twitter account timelines)
+
+Fixed
+- Crash issue when no live notifications
+- Trends can't be hidden
diff --git a/app/src/main/assets/changelogs/344.txt b/app/src/main/assets/changelogs/344.txt
new file mode 100644
index 000000000..dd079ee1a
--- /dev/null
+++ b/app/src/main/assets/changelogs/344.txt
@@ -0,0 +1,14 @@
+Added
+- Original & boost dates added separately
+- Follow request notifications
+- Identity proofs support
+
+Changed
+- Media are preloaded when scrolling
+- Improve live/delayed notifications
+
+Fixed
+- Counter for mentions
+- Preview images displayed twice
+- Media not saved on Android 10+
+- Issue when following instances/pinging tags
\ No newline at end of file
diff --git a/app/src/main/assets/changelogs/345.txt b/app/src/main/assets/changelogs/345.txt
new file mode 100644
index 000000000..8bcd296b8
--- /dev/null
+++ b/app/src/main/assets/changelogs/345.txt
@@ -0,0 +1,6 @@
+Added
+- Friendica: Authorize/Reject follow requests
+
+Fixed
+- Not cropped media
+- Crash when starting the app
\ No newline at end of file
diff --git a/app/src/main/assets/test.png b/app/src/main/assets/test.png
deleted file mode 100644
index 6498fe4c9..000000000
Binary files a/app/src/main/assets/test.png and /dev/null differ
diff --git a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
index 6c6243b03..dda95cf50 100644
--- a/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/AboutActivity.java
@@ -66,11 +66,9 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
 
     private List<Account> developers = new ArrayList<>();
     private List<Account> contributors = new ArrayList<>();
-    private List<Account> designers = new ArrayList<>();
     private List<Account> uxuidesigners = new ArrayList<>();
 
     private AccountSearchDevAdapter accountSearchWebAdapterDeveloper;
-    private AccountSearchDevAdapter accountSearchWebAdapterDesigner;
     private AccountSearchDevAdapter accountSearchWebAdapterContributors;
     private AccountSearchDevAdapter accountSearchWebAdapterUxUiDesigners;
 
@@ -83,9 +81,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
             case Helper.THEME_LIGHT:
                 setTheme(R.style.AppTheme_Fedilab);
                 break;
-            case Helper.THEME_DARK:
-                setTheme(R.style.AppThemeDark);
-                break;
             case Helper.THEME_BLACK:
                 setTheme(R.style.AppThemeBlack);
                 break;
@@ -97,10 +92,10 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(AboutActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(AboutActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -123,7 +118,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
         }
 
         ExpandableHeightListView lv_developers = findViewById(R.id.lv_developers);
-        ExpandableHeightListView lv_designers = findViewById(R.id.lv_designers);
         ExpandableHeightListView lv_contributors = findViewById(R.id.lv_contributors);
         ExpandableHeightListView lv_ux = findViewById(R.id.lv_ux);
 
@@ -133,10 +127,10 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
         Button about_trunk = findViewById(R.id.about_trunk);
 
 
-        TextView txt_developers, txt_ux, txt_designers, txt_thankyou1, txt_thankyou2;
+        TextView txt_developers, txt_ux, txt_thankyou3, txt_thankyou1, txt_thankyou2;
         txt_developers = findViewById(R.id.txt_developers);
         txt_ux = findViewById(R.id.txt_ux);
-        txt_designers = findViewById(R.id.txt_designers);
+        txt_thankyou3 = findViewById(R.id.txt_thankyou3);
         txt_thankyou1 = findViewById(R.id.txt_thankyou1);
         txt_thankyou2 = findViewById(R.id.txt_thankyou2);
 
@@ -237,34 +231,31 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
         setTitle(R.string.action_about);
         lv_contributors.setExpanded(true);
         lv_developers.setExpanded(true);
-        lv_designers.setExpanded(true);
         lv_ux.setExpanded(true);
 
         accountSearchWebAdapterContributors = new AccountSearchDevAdapter(contributors);
         lv_contributors.setAdapter(accountSearchWebAdapterContributors);
-        accountSearchWebAdapterDesigner = new AccountSearchDevAdapter(designers);
-        lv_designers.setAdapter(accountSearchWebAdapterDesigner);
         accountSearchWebAdapterDeveloper = new AccountSearchDevAdapter(developers);
         lv_developers.setAdapter(accountSearchWebAdapterDeveloper);
         accountSearchWebAdapterUxUiDesigners = new AccountSearchDevAdapter(uxuidesigners);
         lv_ux.setAdapter(accountSearchWebAdapterUxUiDesigners);
 
         if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
-            new RetrieveRemoteDataAsyncTask(getApplicationContext(), "fedilab", "framapiaf.org", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+            new RetrieveRemoteDataAsyncTask(getApplicationContext(), "kasun", "toot.fedilab.app", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+            new RetrieveRemoteDataAsyncTask(getApplicationContext(), "fedilab", "toot.fedilab.app", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             new RetrieveRemoteDataAsyncTask(getApplicationContext(), "mmarif", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-            new RetrieveRemoteDataAsyncTask(getApplicationContext(), "kasun", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             new RetrieveRemoteDataAsyncTask(getApplicationContext(), "PhotonQyv", "mastodon.xyz", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             new RetrieveRemoteDataAsyncTask(getApplicationContext(), "angrytux", "social.tchncs.de", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             new RetrieveRemoteDataAsyncTask(getApplicationContext(), "guzzisti", "mastodon.social", AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         } else {
-            SpannableString name = new SpannableString("@fedilab@framapiaf.org");
+            SpannableString name = new SpannableString("@fedilab@toot.fedilab.app");
             name.setSpan(new UnderlineSpan(), 0, name.length(), 0);
             txt_developers.setText(name);
             txt_developers.setVisibility(View.VISIBLE);
             txt_developers.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Helper.openBrowser(AboutActivity.this, "https://framapiaf.org/@fedilab");
+                    Helper.openBrowser(AboutActivity.this, "https://toot.fedilab.app/@fedilab");
                 }
             });
             name = new SpannableString("@mmarif@mastodon.social");
@@ -297,25 +288,33 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
                     Helper.openBrowser(AboutActivity.this, "https://social.tchncs.de/@angrytux");
                 }
             });
+
+            name = new SpannableString("@kasun@stoot.fedilab.app");
+            name.setSpan(new UnderlineSpan(), 0, name.length(), 0);
+            txt_thankyou3.setText(name);
+            txt_thankyou3.setVisibility(View.VISIBLE);
+            txt_thankyou3.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Helper.openBrowser(AboutActivity.this, "https://toot.fedilab.app/@kasun");
+                }
+            });
         }
     }
 
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                finish();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
         }
+        return super.onOptionsItemSelected(item);
     }
 
 
     @Override
-    public void onRetrieveRemoteAccount(Results results) {
-        SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
+    public void onRetrieveRemoteAccount(Results results, boolean developerAccount) {
         if (results == null) {
             Toasty.error(getApplicationContext(), getString(R.string.toast_error), Toast.LENGTH_LONG).show();
             return;
@@ -330,10 +329,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
                     developers.add(account);
                     accountSearchWebAdapterDeveloper.notifyDataSetChanged();
                     break;
-                case "kasun":
-                    designers.add(account);
-                    accountSearchWebAdapterDesigner.notifyDataSetChanged();
-                    break;
                 case "mmarif":
                     uxuidesigners.add(account);
                     accountSearchWebAdapterUxUiDesigners.notifyDataSetChanged();
@@ -356,11 +351,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
                 new RetrieveRelationshipAsyncTask(getApplicationContext(), account.getId(), AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             }
         }
-        if (designers != null) {
-            for (Account account : designers) {
-                new RetrieveRelationshipAsyncTask(getApplicationContext(), account.getId(), AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-            }
-        }
         if (contributors != null) {
             for (Account account : contributors) {
                 new RetrieveRelationshipAsyncTask(getApplicationContext(), account.getId(), AboutActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -387,13 +377,6 @@ public class AboutActivity extends BaseActivity implements OnRetrieveRemoteAccou
                 break;
             }
         }
-        for (int i = 0; i < designers.size(); i++) {
-            if (designers.get(i).getId() != null && designers.get(i).getId().equals(relationship.getId())) {
-                designers.get(i).setFollowing(relationship.isFollowing() || userId.trim().equals(relationship.getId()));
-                accountSearchWebAdapterDesigner.notifyDataSetChanged();
-                break;
-            }
-        }
         for (int i = 0; i < contributors.size(); i++) {
             if (contributors.get(i).getId() != null && contributors.get(i).getId().equals(relationship.getId())) {
                 contributors.get(i).setFollowing(relationship.isFollowing() || userId.trim().equals(relationship.getId()));
diff --git a/app/src/main/java/app/fedilab/android/activities/AdminActivity.java b/app/src/main/java/app/fedilab/android/activities/AdminActivity.java
index 80694c05d..bec98e3cf 100644
--- a/app/src/main/java/app/fedilab/android/activities/AdminActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/AdminActivity.java
@@ -26,6 +26,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.core.content.ContextCompat;
@@ -70,10 +71,10 @@ public class AdminActivity extends BaseActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(AdminActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(AdminActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -362,7 +363,10 @@ public class AdminActivity extends BaseActivity {
             return null;
         }
 
+        @Override
+        public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
 
+        }
         @Override
         public int getCount() {
             return 2;
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
index 9a2804d72..5af656c4f 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java
@@ -6,6 +6,8 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.os.StrictMode;
+import android.view.ActionMode;
 import android.view.View;
 import android.widget.Toast;
 
@@ -21,6 +23,7 @@ import com.vanniktech.emoji.one.EmojiOneProvider;
 
 import java.util.Timer;
 
+import app.fedilab.android.BuildConfig;
 import app.fedilab.android.helper.Helper;
 import es.dmoral.toasty.Toasty;
 
@@ -35,6 +38,7 @@ public class BaseActivity extends CyaneaAppCompatActivity {
 
     public static final int READ_WRITE_STORAGE = 52;
     public static Timer timer;
+    public static boolean canShowActionMode = true;
 
     static {
         Helper.installProvider();
@@ -46,7 +50,7 @@ public class BaseActivity extends CyaneaAppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
-       /* if (BuildConfig.DEBUG) {
+        /*if (BuildConfig.DEBUG) {
             StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
                     .detectDiskReads()
                     .detectDiskWrites()
@@ -59,9 +63,10 @@ public class BaseActivity extends CyaneaAppCompatActivity {
                     .detectLeakedRegistrationObjects()
                     .detectActivityLeaks()
                     .penaltyLog()
-                    .penaltyDeath()
+                   // .penaltyDeath()
                     .build());
         }*/
+        canShowActionMode = true;
         super.onCreate(savedInstanceState);
 
     }
@@ -135,4 +140,14 @@ public class BaseActivity extends CyaneaAppCompatActivity {
             Toasty.info(getApplicationContext(), message, Toast.LENGTH_SHORT).show();
         }
     }
+
+
+    @Override
+    public void onActionModeStarted(ActionMode mode) {
+        if (!canShowActionMode) {
+            mode.finish();
+        }
+        super.onActionModeStarted(mode);
+
+    }
 }
diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
index a42ddc708..f14a1a19f 100644
--- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java
@@ -33,21 +33,25 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.Parcelable;
 import android.preference.PreferenceManager;
 import android.util.Patterns;
+import android.view.ActionMode;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
+import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -71,9 +75,11 @@ import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.tabs.TabLayout;
-import com.jaredrummler.materialspinner.MaterialSpinner;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -92,6 +98,7 @@ import app.fedilab.android.asynctasks.RetrieveFeedsAsyncTask;
 import app.fedilab.android.asynctasks.RetrieveInstanceAsyncTask;
 import app.fedilab.android.asynctasks.RetrieveMetaDataAsyncTask;
 import app.fedilab.android.asynctasks.RetrievePeertubeInformationAsyncTask;
+import app.fedilab.android.asynctasks.RetrieveRelationshipAsyncTask;
 import app.fedilab.android.asynctasks.RetrieveRemoteDataAsyncTask;
 import app.fedilab.android.asynctasks.RetrieveStoriesAsyncTask;
 import app.fedilab.android.asynctasks.SyncTimelinesAsyncTask;
@@ -99,13 +106,16 @@ import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
 import app.fedilab.android.asynctasks.UpdateAccountInfoByIDAsyncTask;
 import app.fedilab.android.client.APIResponse;
 import app.fedilab.android.client.Entities.Account;
+import app.fedilab.android.client.Entities.Error;
 import app.fedilab.android.client.Entities.Filters;
 import app.fedilab.android.client.Entities.Instance;
 import app.fedilab.android.client.Entities.ManageTimelines;
+import app.fedilab.android.client.Entities.Relationship;
 import app.fedilab.android.client.Entities.Results;
 import app.fedilab.android.client.Entities.Status;
 import app.fedilab.android.client.Entities.TagTimeline;
 import app.fedilab.android.client.Entities.Version;
+import app.fedilab.android.drawers.AccountSearchDevAdapter;
 import app.fedilab.android.fragments.DisplayAccountsFragment;
 import app.fedilab.android.fragments.DisplayBookmarksPixelfedFragment;
 import app.fedilab.android.fragments.DisplayDraftsFragment;
@@ -124,12 +134,14 @@ import app.fedilab.android.fragments.TabLayoutNotificationsFragment;
 import app.fedilab.android.fragments.TabLayoutScheduleFragment;
 import app.fedilab.android.fragments.WhoToFollowFragment;
 import app.fedilab.android.helper.CrossActions;
+import app.fedilab.android.helper.ExpandableHeightListView;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.MenuFloating;
 import app.fedilab.android.interfaces.OnFilterActionInterface;
 import app.fedilab.android.interfaces.OnRetrieveEmojiAccountInterface;
 import app.fedilab.android.interfaces.OnRetrieveInstanceInterface;
 import app.fedilab.android.interfaces.OnRetrieveMetaDataInterface;
+import app.fedilab.android.interfaces.OnRetrieveRelationshipInterface;
 import app.fedilab.android.interfaces.OnRetrieveRemoteAccountInterface;
 import app.fedilab.android.interfaces.OnSyncTimelineInterface;
 import app.fedilab.android.interfaces.OnUpdateAccountInfoInterface;
@@ -148,7 +160,7 @@ import static app.fedilab.android.helper.Helper.changeDrawableColor;
 
 
 public abstract class BaseMainActivity extends BaseActivity
-        implements NavigationView.OnNavigationItemSelectedListener, OnUpdateAccountInfoInterface, OnRetrieveMetaDataInterface, OnRetrieveInstanceInterface, OnRetrieveRemoteAccountInterface, OnRetrieveEmojiAccountInterface, OnFilterActionInterface, OnSyncTimelineInterface {
+        implements NavigationView.OnNavigationItemSelectedListener, OnUpdateAccountInfoInterface, OnRetrieveMetaDataInterface, OnRetrieveInstanceInterface, OnRetrieveRemoteAccountInterface, OnRetrieveEmojiAccountInterface, OnFilterActionInterface, OnSyncTimelineInterface, OnRetrieveRelationshipInterface {
 
 
     public static String currentLocale;
@@ -185,6 +197,8 @@ public abstract class BaseMainActivity extends BaseActivity
     private Activity activity;
     private BroadcastReceiver hidde_menu, update_topbar;
     private Instance instanceClass;
+    private View dialogReleaseNoteView;
+    private List<Account> developers;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -430,6 +444,15 @@ public abstract class BaseMainActivity extends BaseActivity
             pTabLocal.setCustomView(R.layout.tab_badge);
 
 
+
+
+            Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_subscriptions, R.attr.iconColorMenu);
+            Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_overview, R.attr.iconColorMenu);
+            Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_trending_up, R.attr.iconColorMenu);
+            Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_recently_added, R.attr.iconColorMenu);
+            Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_home, R.attr.iconColorMenu);
+
+
             @SuppressWarnings("ConstantConditions") @SuppressLint("CutPasteId")
             ImageView iconSub = pTabsub.getCustomView().findViewById(R.id.tab_icon);
 
@@ -522,6 +545,10 @@ public abstract class BaseMainActivity extends BaseActivity
             //TabLayout.Tab pfTabDiscover = tabLayout.newTab();
 
 
+            Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_notifications, R.attr.iconColorMenu);
+            Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_people, R.attr.iconColorMenu);
+            Helper.changeDrawableColor(getApplicationContext(),R.drawable.ic_home, R.attr.iconColorMenu);
+
             pfTabHome.setCustomView(R.layout.tab_badge);
             pfTabLocal.setCustomView(R.layout.tab_badge);
             pfTabNotification.setCustomView(R.layout.tab_badge);
@@ -628,9 +655,7 @@ public abstract class BaseMainActivity extends BaseActivity
         }
 
 
-        if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA || social == UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED) {
-            Helper.startStreaming(BaseMainActivity.this);
-        }
+        Helper.startStreaming(BaseMainActivity.this);
 
         if (hidde_menu != null)
             LocalBroadcastManager.getInstance(getApplicationContext()).unregisterReceiver(hidde_menu);
@@ -1123,10 +1148,12 @@ public abstract class BaseMainActivity extends BaseActivity
         MenuFloating.tags = new ArrayList<>();
         Helper.updateHeaderAccountInfo(activity, account, headerLayout);
         //Locked account can see follow request
-        if (account.isLocked()) {
-            navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(true);
-        } else {
-            navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(false);
+        if( MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.GNU && MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA ) {
+            if (account.isLocked()) {
+                navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(true);
+            } else {
+                navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(false);
+            }
         }
 
         if (!BuildConfig.DONATIONS) {
@@ -1179,7 +1206,6 @@ public abstract class BaseMainActivity extends BaseActivity
                 delete_instance.setVisibility(View.GONE);
             }
         });
-        final int[] count2 = {0};
 
         // Asked once for notification opt-in
         boolean popupShown = sharedpreferences.getBoolean(Helper.SET_POPUP_PUSH, false);
@@ -1199,9 +1225,9 @@ public abstract class BaseMainActivity extends BaseActivity
 
 
             //Live notification mode
-            final MaterialSpinner set_live_type = dialogView.findViewById(R.id.set_live_type);
+            final Spinner set_live_type = dialogView.findViewById(R.id.set_live_type);
             String[] labels = {getString(R.string.live_notif), getString(R.string.live_delayed), getString(R.string.no_live_notif)};
-            ArrayAdapter<String> adapterLive = new ArrayAdapter<>(getApplicationContext(),
+            ArrayAdapter<String> adapterLive = new ArrayAdapter<>(BaseMainActivity.this,
                     android.R.layout.simple_spinner_dropdown_item, labels);
             set_live_type.setAdapter(adapterLive);
             TextView set_live_type_indication = dialogView.findViewById(R.id.set_live_type_indication);
@@ -1216,10 +1242,10 @@ public abstract class BaseMainActivity extends BaseActivity
                     set_live_type_indication.setText(R.string.no_live_indication);
                     break;
             }
-            set_live_type.setSelectedIndex(Helper.liveNotifType(getApplicationContext()));
-            set_live_type.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener() {
+            set_live_type.setSelection(Helper.liveNotifType(getApplicationContext()));
+            set_live_type.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
                 @Override
-                public void onItemSelected(MaterialSpinner view, int position, long id, Object item) {
+                public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                     SharedPreferences.Editor editor = sharedpreferences.edit();
                     switch (position) {
                         case Helper.NOTIF_LIVE:
@@ -1254,9 +1280,12 @@ public abstract class BaseMainActivity extends BaseActivity
                             break;
                     }
                 }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> parent) {
+
+                }
             });
-
-
             dialogBuilderOptin.setTitle(R.string.settings_popup_title);
             dialogBuilderOptin.setCancelable(false);
             dialogBuilderOptin.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() {
@@ -1268,14 +1297,72 @@ public abstract class BaseMainActivity extends BaseActivity
                 }
             });
             try {
-                dialogBuilderOptin.show();
-            } catch (Exception ignored) {
-            }
+                Handler handler = new Handler();
+                handler.postDelayed(new Runnable() {
+                    public void run() {
+                        dialogBuilderOptin.show();
+                    }
+                }, 1000);
+            } catch (Exception ignored) {}
 
+        }else{
+
+            int lastReleaseNoteRead = sharedpreferences.getInt(Helper.SET_POPUP_RELEASE_NOTES, 0);
+            int versionCode = BuildConfig.VERSION_CODE;
+            if( lastReleaseNoteRead != versionCode ){ //Need to push release notes
+                if( social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA ) {
+                    new RetrieveRemoteDataAsyncTask(getApplicationContext(), BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+                }
+                BufferedReader reader = null;
+                try {
+                    reader = new BufferedReader(
+                            new InputStreamReader(getAssets().open("changelogs/"+versionCode+".txt")));
+                    String mLine;
+                    StringBuilder finalContent = new StringBuilder();
+                    while ((mLine = reader.readLine()) != null) {
+                      finalContent.append(mLine).append("\n");
+                    }
+                    AlertDialog.Builder dialogBuilderOptin = new AlertDialog.Builder(BaseMainActivity.this, style);
+                    LayoutInflater inflater = getLayoutInflater();
+                    dialogReleaseNoteView = inflater.inflate(R.layout.popup_release_notes, new LinearLayout(getApplicationContext()), false);
+                    dialogBuilderOptin.setView(dialogReleaseNoteView);
+                    TextView release_title = dialogReleaseNoteView.findViewById(R.id.release_title);
+                    TextView release_notes = dialogReleaseNoteView.findViewById(R.id.release_notes);
+                    release_title.setText(getString(R.string.release_note_title, BuildConfig.VERSION_NAME));
+                    release_notes.setText(finalContent);
+
+                    dialogBuilderOptin.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            dialog.dismiss();
+                        }
+                    });
+                    try {
+                        Handler handler = new Handler();
+                        handler.postDelayed(new Runnable() {
+                            public void run() {
+                                if (!BaseMainActivity.this.isFinishing()) {
+                                    dialogBuilderOptin.show();
+                                }
+                            }
+                        }, 1000);
+                    } catch (Exception ignored) {}
+                }
+                catch (IOException ignored) {}
+                finally {
+                    if (reader != null) {
+                        try {
+                            reader.close();
+                        } catch (IOException ignored) {}
+                    }
+                }
+
+
+                SharedPreferences.Editor editor = sharedpreferences.edit();
+                editor.putInt(Helper.SET_POPUP_RELEASE_NOTES, versionCode);
+                editor.apply();
+            }
         }
         Helper.switchLayout(BaseMainActivity.this);
-
-
         mamageNewIntent(getIntent());
 
         if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA || social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
@@ -1629,6 +1716,12 @@ public abstract class BaseMainActivity extends BaseActivity
 
     }
 
+
+
+
+
+
+
     @Override
     protected void onPause() {
         super.onPause();
@@ -1684,6 +1777,13 @@ public abstract class BaseMainActivity extends BaseActivity
             Intent myIntent = new Intent(BaseMainActivity.this, OwnerStatusActivity.class);
             startActivity(myIntent);
             return false;
+        }if (id == R.id.nav_trends) {
+            Intent myIntent = new Intent(BaseMainActivity.this, SearchResultActivity.class);
+            Bundle b = new Bundle();
+            b.putString("search", "fedilab_trend");
+            myIntent.putExtras(b);
+            startActivity(myIntent);
+            return false;
         } else if (id == R.id.nav_archive_notifications) {
             Intent myIntent = new Intent(BaseMainActivity.this, OwnerNotificationActivity.class);
             startActivity(myIntent);
@@ -1992,23 +2092,49 @@ public abstract class BaseMainActivity extends BaseActivity
     }
 
     @Override
-    public void onRetrieveRemoteAccount(Results results) {
+    public void onRetrieveRemoteAccount(Results results, boolean developerAccount) {
         if (results == null)
             return;
         List<Account> accounts = results.getAccounts();
         List<Status> statuses = results.getStatuses();
-        if (accounts != null && accounts.size() > 0) {
-            Intent intent = new Intent(BaseMainActivity.this, ShowAccountActivity.class);
-            Bundle b = new Bundle();
-            b.putParcelable("account", accounts.get(0));
-            intent.putExtras(b);
-            startActivity(intent);
-        } else if (statuses != null && statuses.size() > 0) {
-            Intent intent = new Intent(getApplicationContext(), ShowConversationActivity.class);
-            Bundle b = new Bundle();
-            b.putParcelable("status", statuses.get(0));
-            intent.putExtras(b);
-            startActivity(intent);
+        if( !developerAccount) {
+
+            if (accounts != null && accounts.size() > 0) {
+                Intent intent = new Intent(BaseMainActivity.this, ShowAccountActivity.class);
+                Bundle b = new Bundle();
+                b.putParcelable("account", accounts.get(0));
+                intent.putExtras(b);
+                startActivity(intent);
+            } else if (statuses != null && statuses.size() > 0) {
+                Intent intent = new Intent(getApplicationContext(), ShowConversationActivity.class);
+                Bundle b = new Bundle();
+                b.putParcelable("status", statuses.get(0));
+                intent.putExtras(b);
+                startActivity(intent);
+            }
+        }else{
+            if( accounts != null && accounts.size() > 0 ) {
+                developers = new ArrayList<>();
+                developers.addAll(accounts);
+                new RetrieveRelationshipAsyncTask(getApplicationContext(), accounts.get(0).getId(), BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+            }
+        }
+    }
+
+    @Override
+    public void onRetrieveRelationship(Relationship relationship, Error error) {
+        if( dialogReleaseNoteView != null && developers != null && developers.size() > 0){
+            if( !relationship.isFollowing()){
+                TextView dev_follow_title = dialogReleaseNoteView.findViewById(R.id.dev_follow_title);
+                if( dev_follow_title != null){
+                    dev_follow_title.setVisibility(View.VISIBLE);
+                }
+                ExpandableHeightListView lv_developers = dialogReleaseNoteView.findViewById(R.id.lv_developers);
+                lv_developers.setExpanded(true);
+                AccountSearchDevAdapter accountSearchWebAdapterDeveloper = new AccountSearchDevAdapter(developers);
+                lv_developers.setAdapter(accountSearchWebAdapterDeveloper);
+                accountSearchWebAdapterDeveloper.notifyDataSetChanged();
+            }
         }
     }
 
@@ -2044,12 +2170,6 @@ public abstract class BaseMainActivity extends BaseActivity
         if (position >= manageTimelines.size()) {
             position = manageTimelines.size() - 1;
         }
-        if (position == -1)
-            position = (timelines.size() - 1);
-        if (position < 0)
-            position = 0;
-        if (toolbarTitle != null)
-            viewPager.setOffscreenPageLimit(2);
         main_app_container = findViewById(R.id.main_app_container);
 
         boolean iconOnly = true;
@@ -2139,8 +2259,6 @@ public abstract class BaseMainActivity extends BaseActivity
                         displayStatusFragment.scrollToTop();
                     }
                 }
-                DrawerLayout drawer = findViewById(R.id.drawer_layout);
-                drawer.closeDrawer(GravityCompat.START);
             }
         });
 
@@ -2307,6 +2425,8 @@ public abstract class BaseMainActivity extends BaseActivity
         return toot.getVisibility() == View.VISIBLE;
     }
 
+
+
     public enum iconLauncher {
         BUBBLES,
         FEDIVERSE,
@@ -2327,6 +2447,8 @@ public abstract class BaseMainActivity extends BaseActivity
             this.mNumOfTabs = NumOfTabs;
         }
 
+
+
         @Override
         public Parcelable saveState() {
             return null;
@@ -2466,7 +2588,7 @@ public abstract class BaseMainActivity extends BaseActivity
             } else {
                 mPageReferenceMap = new HashMap<>();
             }
-            super.destroyItem(container, position, object);
+           // super.destroyItem(container, position, object);
         }
 
         @Override
diff --git a/app/src/main/java/app/fedilab/android/activities/BookmarkActivity.java b/app/src/main/java/app/fedilab/android/activities/BookmarkActivity.java
index e845c034e..5576bcc40 100644
--- a/app/src/main/java/app/fedilab/android/activities/BookmarkActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/BookmarkActivity.java
@@ -95,10 +95,11 @@ public class BookmarkActivity extends BaseActivity implements OnRetrieveFeedsInt
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(BookmarkActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_action_bar, new LinearLayout(getApplicationContext()), false);
+            toolbar.setBackgroundColor(ContextCompat.getColor(BookmarkActivity.this, R.color.cyanea_primary));
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(BookmarkActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             TextView title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
diff --git a/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java b/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java
index 8ffa6fbe8..77487ec03 100644
--- a/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/CustomSharingActivity.java
@@ -98,10 +98,10 @@ public class CustomSharingActivity extends BaseActivity implements OnCustomShari
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(CustomSharingActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_action_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(CustomSharingActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             TextView title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
diff --git a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
index 958b51499..7637cf5b2 100644
--- a/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/EditProfileActivity.java
@@ -125,10 +125,10 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(EditProfileActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_action_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(EditProfileActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             TextView title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
@@ -456,10 +456,10 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou
                         new Thread(new Runnable() {
                             @Override
                             public void run() {
-                                GlideApp.get(getApplicationContext()).clearDiskCache();
+                                Glide.get(getApplicationContext()).clearDiskCache();
                             }
                         }).start();
-                        GlideApp.get(getApplicationContext()).clearMemory();
+                        Glide.get(getApplicationContext()).clearMemory();
                         HashMap<String, String> newCustomFields = new HashMap<>();
 
                         String key1, key2, key3, key4, val1, val2, val3, val4;
diff --git a/app/src/main/java/app/fedilab/android/activities/GroupActivity.java b/app/src/main/java/app/fedilab/android/activities/GroupActivity.java
index 9fb801541..8a53ceaba 100644
--- a/app/src/main/java/app/fedilab/android/activities/GroupActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/GroupActivity.java
@@ -25,6 +25,7 @@ import android.widget.RelativeLayout;
 import android.widget.Toast;
 
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -110,7 +111,7 @@ public class GroupActivity extends BaseActivity implements OnRetrieveFeedsInterf
         swipeRefreshLayout.setColorSchemeColors(
                 c1, c2, c1
         );
-
+        toolbar.setBackgroundColor(ContextCompat.getColor(GroupActivity.this, R.color.cyanea_primary));
         final RecyclerView lv_status = findViewById(R.id.lv_status);
         //lv_status.addItemDecoration(new DividerItemDecoration(GroupActivity.this, DividerItemDecoration.VERTICAL));
         tootsPerPage = sharedpreferences.getInt(Helper.SET_TOOT_PER_PAGE, Helper.TOOTS_PER_PAGE);
diff --git a/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java b/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
index e2fd1b7ac..10816dd1c 100644
--- a/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/HashTagActivity.java
@@ -27,6 +27,7 @@ import android.widget.RelativeLayout;
 import android.widget.Toast;
 
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -78,9 +79,6 @@ public class HashTagActivity extends BaseActivity implements OnRetrieveFeedsInte
             case Helper.THEME_LIGHT:
                 setTheme(R.style.AppTheme_NoActionBar_Fedilab);
                 break;
-            case Helper.THEME_DARK:
-                setTheme(R.style.AppThemeDark_NoActionBar);
-                break;
             case Helper.THEME_BLACK:
                 setTheme(R.style.AppThemeBlack_NoActionBar);
                 break;
@@ -95,8 +93,9 @@ public class HashTagActivity extends BaseActivity implements OnRetrieveFeedsInte
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         Bundle b = getIntent().getExtras();
-        if (b != null)
+        if (b != null) {
             tag = b.getString("tag", null);
+        }
         if (tag == null)
             finish();
         statuses = new ArrayList<>();
@@ -112,7 +111,7 @@ public class HashTagActivity extends BaseActivity implements OnRetrieveFeedsInte
         swipeRefreshLayout.setColorSchemeColors(
                 c1, c2, c1
         );
-
+        toolbar.setBackgroundColor(ContextCompat.getColor(HashTagActivity.this, R.color.cyanea_primary));
         final RecyclerView lv_status = findViewById(R.id.lv_status);
         tootsPerPage = sharedpreferences.getInt(Helper.SET_TOOT_PER_PAGE, Helper.TOOTS_PER_PAGE);
         mainLoader = findViewById(R.id.loader);
@@ -187,6 +186,7 @@ public class HashTagActivity extends BaseActivity implements OnRetrieveFeedsInte
                 SQLiteDatabase db = Sqlite.getInstance(HashTagActivity.this, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
                 new SearchDAO(HashTagActivity.this, db).insertSearch(tag);
                 Intent intent = new Intent(HashTagActivity.this, MainActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
                 intent.putExtra(Helper.INTENT_ACTION, Helper.SEARCH_TAG);
                 intent.putExtra(Helper.SEARCH_KEYWORD, tag);
                 startActivity(intent);
diff --git a/app/src/main/java/app/fedilab/android/activities/InstanceActivity.java b/app/src/main/java/app/fedilab/android/activities/InstanceActivity.java
index 294307e69..cb3eb740f 100644
--- a/app/src/main/java/app/fedilab/android/activities/InstanceActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/InstanceActivity.java
@@ -82,10 +82,10 @@ public class InstanceActivity extends BaseActivity implements OnRetrieveInstance
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(InstanceActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(InstanceActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
diff --git a/app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java b/app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java
index 65190d6e6..5381e8279 100644
--- a/app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java
@@ -124,17 +124,26 @@ public class InstanceHealthActivity extends BaseActivity {
 
     private void checkInstance() {
 
-        if (instance == null)
+        if (instance == null){
+            LinearLayout main_container = findViewById(R.id.main_container);
+            TextView no_instance = findViewById(R.id.no_instance);
+            instance_container.setVisibility(View.VISIBLE);
+            main_container.setVisibility(View.GONE);
+            no_instance.setVisibility(View.VISIBLE);
+            loader.setVisibility(View.GONE);
             return;
+        }
+
         new Thread(new Runnable() {
             @Override
             public void run() {
                 try {
                     HashMap<String, String> parameters = new HashMap<>();
                     parameters.put("name", instance.trim());
-                    final String response = new HttpsConnection(InstanceHealthActivity.this, instance).get("https://instances.social/api/1.0/instances/show", 30, parameters, Helper.THEKINRAR_SECRET_TOKEN);
-                    if (response != null)
+                    final String response = new HttpsConnection(InstanceHealthActivity.this, instance).get("https://instances.social/api/1.0/instances/show", 5, parameters, Helper.THEKINRAR_SECRET_TOKEN);
+                    if (response != null) {
                         instanceSocial = API.parseInstanceSocialResponse(getApplicationContext(), new JSONObject(response));
+                    }
                     runOnUiThread(new Runnable() {
                         @SuppressLint({"SetTextI18n", "DefaultLocale"})
                         public void run() {
@@ -160,7 +169,17 @@ public class InstanceHealthActivity extends BaseActivity {
                         }
                     });
 
-                } catch (Exception ignored) {
+                } catch (Exception e) {
+                    runOnUiThread(new Runnable() {
+                        public void run() {
+                            LinearLayout main_container = findViewById(R.id.main_container);
+                            TextView no_instance = findViewById(R.id.no_instance);
+                            instance_container.setVisibility(View.VISIBLE);
+                            main_container.setVisibility(View.GONE);
+                            no_instance.setVisibility(View.VISIBLE);
+                            loader.setVisibility(View.GONE);
+                        }
+                    });
                 }
             }
         }).start();
diff --git a/app/src/main/java/app/fedilab/android/activities/InstanceProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/InstanceProfileActivity.java
new file mode 100644
index 000000000..a311994e6
--- /dev/null
+++ b/app/src/main/java/app/fedilab/android/activities/InstanceProfileActivity.java
@@ -0,0 +1,178 @@
+/* Copyright 2019 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+package app.fedilab.android.activities;
+
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.Html;
+import android.text.SpannableString;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import com.bumptech.glide.Glide;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import app.fedilab.android.R;
+import app.fedilab.android.asynctasks.RetrieveAccountsAsyncTask;
+import app.fedilab.android.client.API;
+import app.fedilab.android.client.Entities.Account;
+import app.fedilab.android.client.Entities.InstanceNodeInfo;
+import app.fedilab.android.drawers.AccountsListAdapter;
+import app.fedilab.android.helper.Helper;
+
+import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_LEGACY;
+
+
+/**
+ * Created by Thomas on 15/11/2019.
+ * Instance info activity class
+ */
+
+public class InstanceProfileActivity extends BaseActivity {
+
+
+    private TextView name, description, userCount, statusCount, instanceCount, software, version;
+    private String instance;
+    private RecyclerView lv_accounts;
+    private ConstraintLayout instance_container;
+    private ImageView back_ground_image;
+    private ProgressBar loader;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
+        int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
+        if (theme == Helper.THEME_LIGHT) {
+            setTheme(R.style.Dialog);
+        } else {
+            setTheme(R.style.DialogDark);
+        }
+        setContentView(R.layout.activity_instance_profile);
+        getWindow().setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        Bundle b = getIntent().getExtras();
+        if (getSupportActionBar() != null)
+            getSupportActionBar().hide();
+        if (b != null)
+            instance = b.getString("instance",null);
+        if( instance == null){
+            finish();
+        }
+        Button close = findViewById(R.id.close);
+        name = findViewById(R.id.name);
+        description = findViewById(R.id.description);
+        userCount = findViewById(R.id.user_count);
+        statusCount = findViewById(R.id.status_count);
+        instanceCount = findViewById(R.id.instance_count);
+        instance_container = findViewById(R.id.instance_container);
+        loader = findViewById(R.id.loader);
+        back_ground_image = findViewById(R.id.back_ground_image);
+        software = findViewById(R.id.software);
+        version = findViewById(R.id.version);
+        lv_accounts = findViewById(R.id.lv_accounts);
+        close.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
+        checkInstance();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+
+    private void checkInstance() {
+
+        if (instance == null)
+            return;
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    InstanceNodeInfo instanceNodeInfo = new API(InstanceProfileActivity.this).instanceInfo(instance.trim());
+                    runOnUiThread(new Runnable() {
+                        public void run() {
+                            if( instanceNodeInfo == null){
+                                finish();
+                                return;
+                            }
+                            if (instanceNodeInfo.getThumbnail() != null && !instanceNodeInfo.getThumbnail().equals("null"))
+                                Glide.with(getApplicationContext())
+                                        .asBitmap()
+                                        .load(instanceNodeInfo.getThumbnail())
+                                        .into(back_ground_image);
+                            name.setText(instanceNodeInfo.getNodeName());
+
+
+                            SpannableString descriptionSpan;
+                            if( instanceNodeInfo.getNodeDescription() != null) {
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                                    descriptionSpan = new SpannableString(Html.fromHtml(instanceNodeInfo.getNodeDescription(), FROM_HTML_MODE_LEGACY));
+                                else
+                                    descriptionSpan = new SpannableString(Html.fromHtml(instanceNodeInfo.getNodeDescription()));
+                                description.setText(descriptionSpan, TextView.BufferType.SPANNABLE);
+                            }
+                            userCount.setText(Helper.withSuffix((instanceNodeInfo.getNumberOfUsers())));
+                            statusCount.setText(Helper.withSuffix((instanceNodeInfo.getNumberOfPosts())));
+                            instanceCount.setText(Helper.withSuffix((instanceNodeInfo.getNumberOfInstance())));
+                            software.setText(instanceNodeInfo.getName() + " - ");
+                            version.setText(instanceNodeInfo.getVersion());
+                            if( instanceNodeInfo.getStaffAccount() != null){
+                                List<Account> accounts = new ArrayList<>();
+                                accounts.add(instanceNodeInfo.getStaffAccount());
+                                final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+                                String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
+                                AccountsListAdapter accountsListAdapter = new AccountsListAdapter(RetrieveAccountsAsyncTask.Type.FOLLOWERS, userId, accounts);
+                                lv_accounts.setAdapter(accountsListAdapter);
+                                final LinearLayoutManager mLayoutManager;
+                                mLayoutManager = new LinearLayoutManager(InstanceProfileActivity.this);
+                                lv_accounts.setLayoutManager(mLayoutManager);
+                            }
+                            instance_container.setVisibility(View.VISIBLE);
+                            loader.setVisibility(View.GONE);
+                        }
+                    });
+
+                } catch (Exception ignored) {
+                }
+            }
+        }).start();
+    }
+
+
+}
diff --git a/app/src/main/java/app/fedilab/android/activities/ListActivity.java b/app/src/main/java/app/fedilab/android/activities/ListActivity.java
index 85c831def..c26a93258 100644
--- a/app/src/main/java/app/fedilab/android/activities/ListActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ListActivity.java
@@ -34,6 +34,7 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -92,6 +93,7 @@ public class ListActivity extends BaseActivity implements OnListActionInterface
         }
         setContentView(R.layout.activity_list);
         Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setBackgroundColor(ContextCompat.getColor(ListActivity.this, R.color.cyanea_primary));
         setSupportActionBar(toolbar);
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
diff --git a/app/src/main/java/app/fedilab/android/activities/LiveNotificationSettingsAccountsActivity.java b/app/src/main/java/app/fedilab/android/activities/LiveNotificationSettingsAccountsActivity.java
index 726e40066..37b912e59 100644
--- a/app/src/main/java/app/fedilab/android/activities/LiveNotificationSettingsAccountsActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/LiveNotificationSettingsAccountsActivity.java
@@ -63,6 +63,10 @@ public class LiveNotificationSettingsAccountsActivity extends BaseActivity {
         ArrayList<Account> accounts = new ArrayList<>();
         SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
         List<Account> accountStreams = new AccountDAO(getApplicationContext(), db).getAllAccountCrossAction();
+        if( accountStreams == null || accountStreams.size() == 0 ){
+            finish();
+            return;
+        }
         for (Account account : accountStreams) {
             if (account.getSocial() == null || account.getSocial().equals("MASTODON") || account.getSocial().equals("PLEROMA") || account.getSocial().equals("PIXELFED")) {
                 accounts.add(account);
diff --git a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java
index be5358170..81701cfad 100644
--- a/app/src/main/java/app/fedilab/android/activities/LoginActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/LoginActivity.java
@@ -51,6 +51,7 @@ import android.widget.Toast;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
@@ -95,7 +96,6 @@ public class LoginActivity extends BaseActivity {
     private static boolean client_id_for_webview = false;
     private static String instance;
     private final int PICK_IMPORT = 5557;
-    boolean isLoadingInstance = false;
     private AutoCompleteTextView login_instance;
     private EditText login_uid;
     private EditText login_passwd;
@@ -103,13 +103,12 @@ public class LoginActivity extends BaseActivity {
     private Button connectionButton, connect_button;
     private String actionToken;
     private String autofilledInstance;
-    private String social;
     private UpdateAccountInfoAsyncTask.SOCIAL socialNetwork;
     private String basicAuth;
     private InstanceNodeInfo instanceNodeInfo;
-    private LinearLayout step_login_credential, step_instance;
+    private ConstraintLayout step_login_credential, step_instance;
     private TextView instance_chosen;
-    private ImageView info_instance;
+    private Thread thread = null;
 
     public static String redirectUserToAuthorizeAndLogin(Context context, UpdateAccountInfoAsyncTask.SOCIAL socialNetwork, String clientId, String instance) {
         String queryString = Helper.CLIENT_ID + "=" + clientId;
@@ -131,7 +130,6 @@ public class LoginActivity extends BaseActivity {
         admin = false;
         if (b != null) {
             autofilledInstance = b.getString("instance", null);
-            social = b.getString("social", null);
             if (instanceNodeInfo != null) {
                 socialNetwork = Helper.setSoftware(instanceNodeInfo.getName(), false);
             }
@@ -183,9 +181,6 @@ public class LoginActivity extends BaseActivity {
                 case Helper.THEME_LIGHT:
                     setTheme(R.style.AppTheme_Fedilab);
                     break;
-                case Helper.THEME_DARK:
-                    setTheme(R.style.AppThemeDark);
-                    break;
                 case Helper.THEME_BLACK:
                     setTheme(R.style.AppThemeBlack);
                     break;
@@ -196,10 +191,10 @@ public class LoginActivity extends BaseActivity {
             setContentView(R.layout.activity_login);
             ActionBar actionBar = getSupportActionBar();
             if (actionBar != null) {
-                actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(LoginActivity.this, R.color.cyanea_primary)));
                 LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
                 assert inflater != null;
-                View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+                View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(LoginActivity.this), false);
+                view.setBackground(new ColorDrawable(ContextCompat.getColor(LoginActivity.this, R.color.cyanea_primary)));
                 actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
                 actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
                 ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -246,7 +241,7 @@ public class LoginActivity extends BaseActivity {
             instance_chosen = findViewById(R.id.instance_chosen);
             step_instance = findViewById(R.id.step_instance);
             connectionButton = findViewById(R.id.login_button);
-            info_instance = findViewById(R.id.info_instance);
+            ImageView info_instance = findViewById(R.id.info_instance);
             ImageView main_logo = findViewById(R.id.main_logo);
             main_logo.setImageResource(Helper.getMainLogo(getApplicationContext()));
             socialNetwork = UpdateAccountInfoAsyncTask.SOCIAL.MASTODON;
@@ -280,7 +275,6 @@ public class LoginActivity extends BaseActivity {
                                     connect_button.setEnabled(true);
                                     if (instanceNodeInfo != null && instanceNodeInfo.getName() != null) {
                                         socialNetwork = Helper.setSoftware(instanceNodeInfo.getName(), false);
-
                                         if (instanceNodeInfo.getName().equals("PLEROMA") || instanceNodeInfo.getName().equals("MASTODON") || instanceNodeInfo.getName().equals("PIXELFED")) {
                                             client_id_for_webview = true;
                                             retrievesClientId();
@@ -331,22 +325,37 @@ public class LoginActivity extends BaseActivity {
 
                 @Override
                 public void afterTextChanged(Editable s) {
-                    if (s.length() > 2 && !isLoadingInstance) {
+
+                    if (s.length() > 2) {
+
                         final String action = "/instances/search";
                         final HashMap<String, String> parameters = new HashMap<>();
-                        parameters.put("q", s.toString().trim());
+                        String query = s.toString().trim();
+                        if (query.startsWith("http://")){
+                            query =query.replace("http://", "");
+                        }
+                        if (query.startsWith("https://")){
+                            query =query.replace("https://", "");
+                        }
+                        parameters.put("q", query);
                         parameters.put("count", String.valueOf(1000));
                         parameters.put("name", String.valueOf(true));
-                        isLoadingInstance = true;
-                        if (oldSearch == null || !oldSearch.equals(s.toString().trim()))
-                            new Thread(new Runnable() {
+                        if( thread != null && thread.isAlive()){
+                            thread.interrupt();
+                            thread = null;
+                        }
+
+                        if (oldSearch == null || !oldSearch.equals(s.toString().trim())) {
+                            thread = new Thread(new Runnable() {
                                 @Override
                                 public void run() {
                                     try {
                                         final String response = new HttpsConnection(LoginActivity.this, instance).get("https://instances.social/api/1.0" + action, 30, parameters, Helper.THEKINRAR_SECRET_TOKEN);
+                                        if( response == null) {
+                                            return;
+                                        }
                                         runOnUiThread(new Runnable() {
                                             public void run() {
-                                                isLoadingInstance = false;
                                                 String[] instances;
                                                 try {
                                                     JSONObject jsonObject = new JSONObject(response);
@@ -373,27 +382,29 @@ public class LoginActivity extends BaseActivity {
                                                     oldSearch = s.toString().trim();
 
                                                 } catch (JSONException ignored) {
-                                                    isLoadingInstance = false;
                                                 }
                                             }
                                         });
 
                                     } catch (Exception e) {
-                                        isLoadingInstance = false;
+                                        e.printStackTrace();
                                     }
                                 }
-                            }).start();
+                            });
+                            thread.start();
+                        }
                     }
                 }
             });
 
-            if (socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.GNU)
+            if (socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.GNU && socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA)
                 connectionButton.setEnabled(false);
             login_instance.setOnFocusChangeListener(new View.OnFocusChangeListener() {
                 @Override
                 public void onFocusChange(View v, boolean hasFocus) {
-                    if (socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.GNU)
+                    if (socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.GNU && socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
                         connectionButton.setEnabled(false);
+                    }
                     TextInputLayout login_instance_layout = findViewById(R.id.login_instance_layout);
                     if (!hasFocus) {
                         retrievesClientId();
@@ -465,8 +476,14 @@ public class LoginActivity extends BaseActivity {
     }
 
     private void retrievesClientId() {
-        if (socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
+        if (socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.GNU && socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
             String instanceFromField = login_instance.getText().toString().trim();
+            if (instanceFromField.startsWith("http://")){
+                instanceFromField =instanceFromField.replace("http://", "");
+            }
+            if (instanceFromField.startsWith("https://")){
+                instanceFromField =instanceFromField.replace("https://", "");
+            }
             String host = instanceFromField;
             try {
                 URL url = new URL(instanceFromField);
@@ -564,7 +581,7 @@ public class LoginActivity extends BaseActivity {
 
                 final HashMap<String, String> parameters = new HashMap<>();
                 SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
-                if (socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
+                if (socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.GNU && socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
                     parameters.put(Helper.CLIENT_ID, sharedpreferences.getString(Helper.CLIENT_ID, null));
                     parameters.put(Helper.CLIENT_SECRET, sharedpreferences.getString(Helper.CLIENT_SECRET, null));
                 }
@@ -586,7 +603,7 @@ public class LoginActivity extends BaseActivity {
                 } else if (socialNetwork == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE) {
                     parameters.put("scope", "user");
                     oauthUrl = "/api/v1/users/token";
-                } else if (socialNetwork == UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
+                } else if (socialNetwork == UpdateAccountInfoAsyncTask.SOCIAL.GNU || socialNetwork == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
                     String instanceFromField = login_instance.getText().toString().trim();
                     String host;
                     try {
@@ -611,21 +628,21 @@ public class LoginActivity extends BaseActivity {
                     public void run() {
                         try {
                             String response;
-                            if (socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.GNU)
+                            if (socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.GNU && socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
                                 response = new HttpsConnection(LoginActivity.this, instance).post(Helper.instanceWithProtocol(getApplicationContext(), instance) + finalOauthUrl, 30, parameters, null);
-                            else {
+                            } else {
                                 response = new HttpsConnection(LoginActivity.this, instance).get(Helper.instanceWithProtocol(getApplicationContext(), instance) + finalOauthUrl, 30, null, basicAuth);
                             }
                             runOnUiThread(new Runnable() {
                                 public void run() {
                                     JSONObject resobj;
-                                    if (socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
+                                    if (socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.GNU && socialNetwork != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
                                         try {
                                             resobj = new JSONObject(response);
                                             String token = resobj.get("access_token").toString();
                                             String refresh_token = null;
                                             if (resobj.has("refresh_token"))
-                                                refresh_token = resobj.get("refresh_token").toString();
+                                                refresh_token = resobj.getString("refresh_token");
                                             SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
                                             SharedPreferences.Editor editor = sharedpreferences.edit();
                                             editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, token);
@@ -729,7 +746,7 @@ public class LoginActivity extends BaseActivity {
         menu.findItem(R.id.action_custom_tabs).setChecked(!embedded_browser);
         boolean security_provider = sharedpreferences.getBoolean(Helper.SET_SECURITY_PROVIDER, true);
         menu.findItem(R.id.action_provider).setChecked(security_provider);
-        return super.onCreateOptionsMenu(menu);
+        return true;
     }
 
     @Override
diff --git a/app/src/main/java/app/fedilab/android/activities/MastodonRegisterActivity.java b/app/src/main/java/app/fedilab/android/activities/MastodonRegisterActivity.java
index af383aa0e..1914edaa0 100644
--- a/app/src/main/java/app/fedilab/android/activities/MastodonRegisterActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/MastodonRegisterActivity.java
@@ -32,12 +32,14 @@ import android.text.style.UnderlineSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -47,8 +49,6 @@ import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.jaredrummler.materialspinner.MaterialSpinner;
-
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.net.HttpURLConnection;
@@ -91,9 +91,6 @@ public class MastodonRegisterActivity extends BaseActivity implements OnRetrieve
             case Helper.THEME_LIGHT:
                 setTheme(R.style.AppTheme_Fedilab);
                 break;
-            case Helper.THEME_DARK:
-                setTheme(R.style.AppThemeDark);
-                break;
             case Helper.THEME_BLACK:
                 setTheme(R.style.AppThemeBlack);
                 break;
@@ -104,10 +101,10 @@ public class MastodonRegisterActivity extends BaseActivity implements OnRetrieve
         setContentView(R.layout.activity_register);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(MastodonRegisterActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(MastodonRegisterActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -122,7 +119,7 @@ public class MastodonRegisterActivity extends BaseActivity implements OnRetrieve
         }
 
 
-        MaterialSpinner reg_category = findViewById(R.id.reg_category);
+        Spinner reg_category = findViewById(R.id.reg_category);
         String[] categoriesA = {
                 getString(R.string.category_general),
                 getString(R.string.category_regional),
@@ -155,12 +152,16 @@ public class MastodonRegisterActivity extends BaseActivity implements OnRetrieve
 
         reg_category.setAdapter(adcategories);
 
-        reg_category.setSelectedIndex(0);
+        reg_category.setSelection(0);
         //Manage privacies
-        reg_category.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
+        reg_category.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
-            public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 new RetrieveInstanceRegAsyncTask(MastodonRegisterActivity.this, RetrieveInstanceRegAsyncTask.instanceType.MASTODON, itemA[position], MastodonRegisterActivity.this).executeOnExecutor(THREAD_POOL_EXECUTOR);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
 
             }
         });
@@ -217,7 +218,7 @@ public class MastodonRegisterActivity extends BaseActivity implements OnRetrieve
 
     @Override
     public void onRetrieveInstance(APIResponse apiResponse) {
-        if (apiResponse.getError() != null) {
+        if (apiResponse.getError() != null || apiResponse.getInstanceRegs() == null) {
             Toasty.error(getApplicationContext(), getString(R.string.toast_error_instance_reg), Toast.LENGTH_LONG).show();
             return;
         }
diff --git a/app/src/main/java/app/fedilab/android/activities/MastodonShareRegisterActivity.java b/app/src/main/java/app/fedilab/android/activities/MastodonShareRegisterActivity.java
index 5660f49f2..a0692d09c 100644
--- a/app/src/main/java/app/fedilab/android/activities/MastodonShareRegisterActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/MastodonShareRegisterActivity.java
@@ -98,10 +98,10 @@ public class MastodonShareRegisterActivity extends BaseActivity implements OnRet
         setContentView(R.layout.activity_register);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(MastodonShareRegisterActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(MastodonShareRegisterActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -188,7 +188,7 @@ public class MastodonShareRegisterActivity extends BaseActivity implements OnRet
 
     @Override
     public void onRetrieveInstance(APIResponse apiResponse) {
-        if (apiResponse.getError() != null) {
+        if (apiResponse.getError() != null || apiResponse.getInstanceRegs() == null) {
             Toasty.error(getApplicationContext(), getString(R.string.toast_error_instance_reg), Toast.LENGTH_LONG).show();
             return;
         }
diff --git a/app/src/main/java/app/fedilab/android/activities/MutedInstanceActivity.java b/app/src/main/java/app/fedilab/android/activities/MutedInstanceActivity.java
index 40dfeb342..585085207 100644
--- a/app/src/main/java/app/fedilab/android/activities/MutedInstanceActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/MutedInstanceActivity.java
@@ -114,10 +114,10 @@ public class MutedInstanceActivity extends BaseActivity implements OnRetrieveDom
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(MutedInstanceActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar_muted_instance, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(MutedInstanceActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
diff --git a/app/src/main/java/app/fedilab/android/activities/OpencollectiveActivity.java b/app/src/main/java/app/fedilab/android/activities/OpencollectiveActivity.java
index d16725360..62e66e870 100644
--- a/app/src/main/java/app/fedilab/android/activities/OpencollectiveActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/OpencollectiveActivity.java
@@ -81,10 +81,10 @@ public class OpencollectiveActivity extends BaseActivity implements OnRetrieveRe
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(OpencollectiveActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(OpencollectiveActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -140,7 +140,7 @@ public class OpencollectiveActivity extends BaseActivity implements OnRetrieveRe
 
 
     @Override
-    public void onRetrieveRemoteAccount(Results results) {
+    public void onRetrieveRemoteAccount(Results results, boolean devAccount) {
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
         if (results == null) {
             Toasty.error(getApplicationContext(), getString(R.string.toast_error), Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/app/fedilab/android/activities/OwnerChartsActivity.java b/app/src/main/java/app/fedilab/android/activities/OwnerChartsActivity.java
index 20742203f..52c33285d 100644
--- a/app/src/main/java/app/fedilab/android/activities/OwnerChartsActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/OwnerChartsActivity.java
@@ -135,10 +135,10 @@ public class OwnerChartsActivity extends BaseActivity implements OnRetrieveChart
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(OwnerChartsActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_action_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(OwnerChartsActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.close_conversation);
diff --git a/app/src/main/java/app/fedilab/android/activities/OwnerNotificationActivity.java b/app/src/main/java/app/fedilab/android/activities/OwnerNotificationActivity.java
index 36056bf32..749759586 100644
--- a/app/src/main/java/app/fedilab/android/activities/OwnerNotificationActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/OwnerNotificationActivity.java
@@ -167,10 +167,11 @@ public class OwnerNotificationActivity extends BaseActivity implements OnRetriev
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(OwnerNotificationActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.toot_action_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(OwnerNotificationActivity.this, R.color.cyanea_primary)));
+            toolbar.setBackgroundColor(ContextCompat.getColor(OwnerNotificationActivity.this, R.color.cyanea_primary));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
 
diff --git a/app/src/main/java/app/fedilab/android/activities/OwnerNotificationChartsActivity.java b/app/src/main/java/app/fedilab/android/activities/OwnerNotificationChartsActivity.java
index 8f5f10fbe..aa8fc506c 100644
--- a/app/src/main/java/app/fedilab/android/activities/OwnerNotificationChartsActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/OwnerNotificationChartsActivity.java
@@ -142,10 +142,10 @@ public class OwnerNotificationChartsActivity extends BaseActivity implements OnR
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(OwnerNotificationChartsActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_action_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(OwnerNotificationChartsActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.close_conversation);
diff --git a/app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java b/app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java
index 9bcdd9900..db7c71889 100644
--- a/app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/OwnerStatusActivity.java
@@ -171,10 +171,11 @@ public class OwnerStatusActivity extends BaseActivity implements OnRetrieveFeeds
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(OwnerStatusActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(android.content.Context.LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.toot_action_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(OwnerStatusActivity.this, R.color.cyanea_primary)));
+            toolbar.setBackgroundColor(ContextCompat.getColor(OwnerStatusActivity.this, R.color.cyanea_primary));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
 
diff --git a/app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java b/app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java
index 0b2c298b8..32aa619f9 100644
--- a/app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java
@@ -83,10 +83,10 @@ public class PartnerShipActivity extends BaseActivity implements OnRetrieveRemot
         setContentView(R.layout.activity_partnership);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(PartnerShipActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(PartnerShipActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -139,7 +139,7 @@ public class PartnerShipActivity extends BaseActivity implements OnRetrieveRemot
 
 
     @Override
-    public void onRetrieveRemoteAccount(Results results) {
+    public void onRetrieveRemoteAccount(Results results, boolean devAccount) {
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
         if (results == null) {
             Toasty.error(getApplicationContext(), getString(R.string.toast_error), Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java b/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java
index 910cb31b9..c6ec8fe31 100644
--- a/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PeertubeActivity.java
@@ -165,9 +165,6 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube
             case Helper.THEME_LIGHT:
                 setTheme(R.style.AppTheme_Fedilab);
                 break;
-            case Helper.THEME_DARK:
-                setTheme(R.style.AppThemeDark);
-                break;
             case Helper.THEME_BLACK:
                 setTheme(R.style.AppThemeBlack);
                 break;
@@ -244,10 +241,10 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(PeertubeActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(PeertubeActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -296,6 +293,10 @@ public class PeertubeActivity extends BaseActivity implements OnRetrievePeertube
                     }
                 }
             });
+            String user_agent = sharedpreferences.getString(Helper.SET_CUSTOM_USER_AGENT, null);
+            if( user_agent != null) {
+                webview_video.getSettings().setUserAgentString(user_agent);
+            }
             webview_video.getSettings().setAllowFileAccess(true);
             webview_video.setWebChromeClient(mastalabWebChromeClient);
             webview_video.getSettings().setDomStorageEnabled(true);
diff --git a/app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java b/app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java
index fa974e12b..78f6b2700 100644
--- a/app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PeertubeEditUploadActivity.java
@@ -24,12 +24,14 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -37,8 +39,6 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 
-import com.jaredrummler.materialspinner.MaterialSpinner;
-
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -72,8 +72,8 @@ public class PeertubeEditUploadActivity extends BaseActivity implements OnRetrie
     HashMap<Integer, String> privacyToSend;
     HashMap<String, String> languageToSend;
     HashMap<String, String> channelToSend;
-    private Button set_upload_submit, set_upload_delete;
-    private MaterialSpinner set_upload_privacy, set_upload_categories, set_upload_licenses, set_upload_languages, set_upload_channel;
+    private Button set_upload_submit;
+    private Spinner set_upload_privacy, set_upload_categories, set_upload_licenses, set_upload_languages, set_upload_channel;
     private EditText p_video_title, p_video_description;
     private TagsEditText p_video_tags;
     private CheckBox set_upload_nsfw, set_upload_enable_comments;
@@ -91,9 +91,6 @@ public class PeertubeEditUploadActivity extends BaseActivity implements OnRetrie
             case Helper.THEME_LIGHT:
                 setTheme(R.style.AppTheme_Fedilab);
                 break;
-            case Helper.THEME_DARK:
-                setTheme(R.style.AppThemeDark);
-                break;
             case Helper.THEME_BLACK:
                 setTheme(R.style.AppThemeBlack);
                 break;
@@ -112,10 +109,10 @@ public class PeertubeEditUploadActivity extends BaseActivity implements OnRetrie
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(PeertubeEditUploadActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(PeertubeEditUploadActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -132,7 +129,7 @@ public class PeertubeEditUploadActivity extends BaseActivity implements OnRetrie
 
 
         set_upload_submit = findViewById(R.id.set_upload_submit);
-        set_upload_delete = findViewById(R.id.set_upload_delete);
+        Button set_upload_delete = findViewById(R.id.set_upload_delete);
         set_upload_privacy = findViewById(R.id.set_upload_privacy);
         set_upload_channel = findViewById(R.id.set_upload_channel);
         set_upload_categories = findViewById(R.id.set_upload_categories);
@@ -413,9 +410,9 @@ public class PeertubeEditUploadActivity extends BaseActivity implements OnRetrie
         }
 
         //Manage privacies
-        set_upload_privacy.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
+        set_upload_privacy.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
-            public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 LinkedHashMap<Integer, String> privaciesCheck = new LinkedHashMap<>(peertubeInformation.getPrivacies());
                 Iterator it = privaciesCheck.entrySet().iterator();
                 int i = 0;
@@ -430,11 +427,15 @@ public class PeertubeEditUploadActivity extends BaseActivity implements OnRetrie
                     i++;
                 }
             }
-        });
-        //Manage license
-        set_upload_licenses.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
+
             @Override
-            public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+        set_upload_licenses.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 LinkedHashMap<Integer, String> licensesCheck = new LinkedHashMap<>(peertubeInformation.getLicences());
                 Iterator it = licensesCheck.entrySet().iterator();
                 int i = 0;
@@ -449,11 +450,16 @@ public class PeertubeEditUploadActivity extends BaseActivity implements OnRetrie
                     i++;
                 }
             }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
         });
         //Manage categories
-        set_upload_categories.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
+        set_upload_categories.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
-            public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 LinkedHashMap<Integer, String> categoriesCheck = new LinkedHashMap<>(peertubeInformation.getCategories());
                 Iterator it = categoriesCheck.entrySet().iterator();
                 int i = 0;
@@ -468,11 +474,17 @@ public class PeertubeEditUploadActivity extends BaseActivity implements OnRetrie
                     i++;
                 }
             }
-        });
-        //Manage languages
-        set_upload_languages.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
+
             @Override
-            public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+
+        //Manage languages
+        set_upload_languages.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 LinkedHashMap<String, String> languagesCheck = new LinkedHashMap<>(peertubeInformation.getLanguages());
                 Iterator it = languagesCheck.entrySet().iterator();
                 int i = 0;
@@ -487,13 +499,16 @@ public class PeertubeEditUploadActivity extends BaseActivity implements OnRetrie
                     i++;
                 }
             }
-        });
 
-
-        //Manage languages
-        set_upload_channel.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
             @Override
-            public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+        //Manage languages
+        set_upload_channel.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 LinkedHashMap<String, String> channelsCheck = new LinkedHashMap<>(channels);
                 Iterator it = channelsCheck.entrySet().iterator();
                 int i = 0;
@@ -509,6 +524,11 @@ public class PeertubeEditUploadActivity extends BaseActivity implements OnRetrie
                     i++;
                 }
             }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
         });
 
 
@@ -535,10 +555,10 @@ public class PeertubeEditUploadActivity extends BaseActivity implements OnRetrie
             }
         });
 
-        set_upload_privacy.setSelectedIndex(privacyPosition);
-        set_upload_languages.setSelectedIndex(languagePosition);
-        set_upload_licenses.setSelectedIndex(licensePosition);
-        set_upload_categories.setSelectedIndex(categoryPosition);
+        set_upload_privacy.setSelection(privacyPosition);
+        set_upload_languages.setSelection(languagePosition);
+        set_upload_licenses.setSelection(licensePosition);
+        set_upload_categories.setSelection(categoryPosition);
 
         List<String> tags = peertube.getTags();
         if (tags != null && tags.size() > 0) {
@@ -591,7 +611,7 @@ public class PeertubeEditUploadActivity extends BaseActivity implements OnRetrie
                 channelPosition++;
             }
         }
-        set_upload_channel.setSelectedIndex(channelPosition);
+        set_upload_channel.setSelection(channelPosition);
 
         set_upload_submit.setEnabled(true);
     }
diff --git a/app/src/main/java/app/fedilab/android/activities/PeertubeRegisterActivity.java b/app/src/main/java/app/fedilab/android/activities/PeertubeRegisterActivity.java
index 3e4b1aa6e..e2e03f585 100644
--- a/app/src/main/java/app/fedilab/android/activities/PeertubeRegisterActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PeertubeRegisterActivity.java
@@ -95,10 +95,10 @@ public class PeertubeRegisterActivity extends BaseActivity implements OnRetrieve
         setContentView(R.layout.activity_register_peertube);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(PeertubeRegisterActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(PeertubeRegisterActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
diff --git a/app/src/main/java/app/fedilab/android/activities/PeertubeUploadActivity.java b/app/src/main/java/app/fedilab/android/activities/PeertubeUploadActivity.java
index 41940df06..52bf151cc 100644
--- a/app/src/main/java/app/fedilab/android/activities/PeertubeUploadActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PeertubeUploadActivity.java
@@ -31,11 +31,13 @@ import android.provider.OpenableColumns;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -43,7 +45,6 @@ import androidx.appcompat.app.ActionBar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
-import com.jaredrummler.materialspinner.MaterialSpinner;
 
 import net.gotev.uploadservice.MultipartUploadRequest;
 import net.gotev.uploadservice.ServerResponse;
@@ -57,6 +58,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -80,7 +82,7 @@ public class PeertubeUploadActivity extends BaseActivity implements OnRetrievePe
     private final int PICK_IVDEO = 52378;
     private final int MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE = 724;
     private Button set_upload_file, set_upload_submit;
-    private MaterialSpinner set_upload_privacy, set_upload_channel;
+    private Spinner set_upload_privacy, set_upload_channel;
     private TextView set_upload_file_name;
     private EditText video_title;
     private HashMap<String, String> channels;
@@ -100,9 +102,6 @@ public class PeertubeUploadActivity extends BaseActivity implements OnRetrievePe
             case Helper.THEME_LIGHT:
                 setTheme(R.style.AppTheme_Fedilab);
                 break;
-            case Helper.THEME_DARK:
-                setTheme(R.style.AppThemeDark);
-                break;
             case Helper.THEME_BLACK:
                 setTheme(R.style.AppThemeBlack);
                 break;
@@ -113,10 +112,10 @@ public class PeertubeUploadActivity extends BaseActivity implements OnRetrievePe
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(PeertubeUploadActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(PeertubeUploadActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -175,10 +174,11 @@ public class PeertubeUploadActivity extends BaseActivity implements OnRetrievePe
             } else if (uriString.startsWith("file://")) {
                 filename = myFile.getName();
             }
-            if (filename != null) {
-                set_upload_file_name.setVisibility(View.VISIBLE);
-                set_upload_file_name.setText(filename);
+            if( filename == null){
+                filename = new Date().toString();
             }
+            set_upload_file_name.setVisibility(View.VISIBLE);
+            set_upload_file_name.setText(filename);
 
         }
     }
@@ -258,9 +258,9 @@ public class PeertubeUploadActivity extends BaseActivity implements OnRetrievePe
         set_upload_privacy.setAdapter(adapterPrivacies);
 
         //Manage privacies
-        set_upload_privacy.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
+        set_upload_privacy.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
-            public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 LinkedHashMap<Integer, String> privaciesCheck = new LinkedHashMap<>(peertubeInformation.getPrivacies());
                 Iterator it = privaciesCheck.entrySet().iterator();
                 int i = 0;
@@ -275,8 +275,12 @@ public class PeertubeUploadActivity extends BaseActivity implements OnRetrievePe
                     i++;
                 }
             }
-        });
 
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
         set_upload_file.setEnabled(true);
 
         set_upload_file.setOnClickListener(new View.OnClickListener() {
@@ -308,9 +312,9 @@ public class PeertubeUploadActivity extends BaseActivity implements OnRetrievePe
         });
 
         //Manage languages
-        set_upload_channel.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
+        set_upload_channel.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
-            public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 LinkedHashMap<String, String> channelsCheck = new LinkedHashMap<>(channels);
                 Iterator it = channelsCheck.entrySet().iterator();
                 int i = 0;
@@ -326,6 +330,11 @@ public class PeertubeUploadActivity extends BaseActivity implements OnRetrievePe
                     i++;
                 }
             }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
         });
         set_upload_submit.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java b/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java
index f32623bfd..f6aa56862 100644
--- a/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PhotoEditorActivity.java
@@ -46,9 +46,6 @@ import com.theartofdev.edmodo.cropper.CropImage;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
 
 import app.fedilab.android.R;
 import app.fedilab.android.helper.Helper;
@@ -90,7 +87,6 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorLi
     private ConstraintSet mConstraintSet = new ConstraintSet();
     private boolean mIsFilterVisible;
     private Uri uri;
-    private String tempname;
     private boolean exit;
 
     private static int exifToDegrees(int exifOrientation) {
@@ -115,9 +111,6 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorLi
             case Helper.THEME_LIGHT:
                 setTheme(R.style.AppTheme_Fedilab);
                 break;
-            case Helper.THEME_DARK:
-                setTheme(R.style.AppThemeDark);
-                break;
             case Helper.THEME_BLACK:
                 setTheme(R.style.AppThemeBlack);
                 break;
@@ -188,12 +181,9 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorLi
 
         Button send = findViewById(R.id.send);
 
-        send.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                exit = true;
-                saveImage();
-            }
+        send.setOnClickListener(v -> {
+            exit = true;
+            saveImage();
         });
     }
 
@@ -295,7 +285,7 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorLi
         }
     }
 
-    @SuppressLint("MissingPermission")
+
     private void saveImage() {
         if (requestPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
             showLoading(getString(R.string.saving));
@@ -311,7 +301,6 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorLi
                         .setClearViewsEnabled(true)
                         .setTransparencyEnabled(true)
                         .build();
-
                 mPhotoEditor.saveAsFile(file.getAbsolutePath(), saveSettings, new PhotoEditor.OnSaveListener() {
                     @Override
                     public void onSuccess(@NonNull String imagePath) {
@@ -335,7 +324,9 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorLi
             } catch (IOException e) {
                 e.printStackTrace();
                 hideLoading();
-                showSnackbar(e.getMessage());
+                if (e.getMessage() != null) {
+                    showSnackbar(e.getMessage());
+                }
             }
         }
     }
@@ -344,8 +335,8 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorLi
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (resultCode == RESULT_OK) {
-            ExifInterface exif = null;
-            int rotation = 0;
+            ExifInterface exif;
+            int rotation;
             int rotationInDegrees = 0;
             if (data != null && data.getData() != null) {
                 try (InputStream inputStream = getContentResolver().openInputStream(data.getData())) {
@@ -357,42 +348,51 @@ public class PhotoEditorActivity extends BaseActivity implements OnPhotoEditorLi
                     e.printStackTrace();
                 }
             }
+
             switch (requestCode) {
                 case CAMERA_REQUEST:
-                    mPhotoEditor.clearAllViews();
-                    Bitmap photo = (Bitmap) data.getExtras().get("data");
-                    mPhotoEditorView.getSource().setImageBitmap(photo);
-                    mPhotoEditorView.getSource().setRotation(rotationInDegrees);
+                    if( data != null && data.getExtras() != null) {
+                        mPhotoEditor.clearAllViews();
+                        Bitmap photo = (Bitmap) data.getExtras().get("data");
+                        mPhotoEditorView.getSource().setImageBitmap(photo);
+                        mPhotoEditorView.getSource().setRotation(rotationInDegrees);
+                    }
                     break;
                 case PICK_REQUEST:
-                    try {
-                        mPhotoEditor.clearAllViews();
-                        Uri uri = data.getData();
-                        Bitmap bitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), uri);
-                        mPhotoEditorView.getSource().setImageBitmap(bitmap);
-                        mPhotoEditorView.getSource().setRotation(rotationInDegrees);
-                    } catch (IOException e) {
-                        e.printStackTrace();
+                    if( data != null && data.getData() != null) {
+                        try {
+                            mPhotoEditor.clearAllViews();
+                            Uri uri = data.getData();
+                            Bitmap bitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), uri);
+                            mPhotoEditorView.getSource().setImageBitmap(bitmap);
+                            mPhotoEditorView.getSource().setRotation(rotationInDegrees);
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
                     }
                     break;
                 case CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE:
-                    CropImage.ActivityResult result = CropImage.getActivityResult(data);
-                    Uri resultUri = result.getUri();
-                    if (resultUri != null) {
-                        mPhotoEditorView.getSource().setImageURI(resultUri);
-                        mPhotoEditorView.getSource().setRotation(rotationInDegrees);
-                        File fdelete = new File(uri.getPath());
-                        if (fdelete.exists()) {
-                            fdelete.delete();
-                        }
-                        uri = resultUri;
-                        String filename = System.currentTimeMillis() + "_" + Helper.getFileName(PhotoEditorActivity.this, uri);
-                        tempname = new SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()).format(new Date()) + filename;
 
+                    CropImage.ActivityResult result = CropImage.getActivityResult(data);
+                    if (result != null) {
+                        Uri resultUri = result.getUri();
+                        if (resultUri != null) {
+                            mPhotoEditorView.getSource().setImageURI(resultUri);
+                            mPhotoEditorView.getSource().setRotation(rotationInDegrees);
+                            if (uri != null && uri.getPath() != null) {
+                                File fdelete = new File(uri.getPath());
+                                if (fdelete.exists()) {
+                                    //noinspection ResultOfMethodCallIgnored
+                                    fdelete.delete();
+                                }
+                            }
+                            uri = resultUri;
+                        }
                     }
                     break;
             }
         }
+
     }
 
     @Override
diff --git a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java
index d44d002c2..fa0d22570 100644
--- a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java
@@ -512,7 +512,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
         String content = toot_content.getText().toString();
         String contentCount = content;
         if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
-            contentCount = contentCount.replaceAll("(^|[^/\\w])@(([a-z0-9_]+)@[a-z0-9.\\-]+[a-z0-9]+)", "$1@$3");
+            contentCount = contentCount.replaceAll("(?i)(^|[^/\\w])@(([a-z0-9_]+)@[a-z0-9\\.\\-]+[a-z0-9]+)", "$1@$3");
             Matcher matcherALink = Patterns.WEB_URL.matcher(contentCount);
             while (matcherALink.find()) {
                 final String url = matcherALink.group(1);
@@ -559,10 +559,10 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
         setContentView(R.layout.activity_pixelfed_compose);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(PixelfedComposeActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.toot_action_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(PixelfedComposeActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView close_toot = actionBar.getCustomView().findViewById(R.id.close_toot);
@@ -1277,7 +1277,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
         toot.setSensitive(isSensitive);
         toot.setVisibility(visibility);
         toot.setMedia_attachments(attachments);
-        toot.setContent(tootContent);
+        toot.setContent(PixelfedComposeActivity.this, tootContent);
         if (timestamp == null)
             if (scheduledstatus == null)
                 new PostStatusAsyncTask(getApplicationContext(), social, account, toot, PixelfedComposeActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -1960,7 +1960,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu
         toot.setSensitive(isSensitive);
         toot.setMedia_attachments(attachments);
         toot.setVisibility(visibility);
-        toot.setContent(currentContent);
+        toot.setContent(PixelfedComposeActivity.this, currentContent);
 
 
         SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
diff --git a/app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java b/app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java
index 322bfa79d..863406a1a 100644
--- a/app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java
@@ -94,10 +94,10 @@ public class PlaylistsActivity extends BaseActivity implements OnPlaylistActionI
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(PlaylistsActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(PlaylistsActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -113,6 +113,7 @@ public class PlaylistsActivity extends BaseActivity implements OnPlaylistActionI
         }
         setContentView(R.layout.activity_playlists);
         Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setBackgroundColor(ContextCompat.getColor(PlaylistsActivity.this, R.color.cyanea_primary));
         setSupportActionBar(toolbar);
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
diff --git a/app/src/main/java/app/fedilab/android/activities/PrivacyActivity.java b/app/src/main/java/app/fedilab/android/activities/PrivacyActivity.java
index 2cfa8cbe9..3104c6abb 100644
--- a/app/src/main/java/app/fedilab/android/activities/PrivacyActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PrivacyActivity.java
@@ -63,10 +63,10 @@ public class PrivacyActivity extends BaseActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(PrivacyActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(PrivacyActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
diff --git a/app/src/main/java/app/fedilab/android/activities/ProxyActivity.java b/app/src/main/java/app/fedilab/android/activities/ProxyActivity.java
index 133b128f1..6e4d9458e 100644
--- a/app/src/main/java/app/fedilab/android/activities/ProxyActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ProxyActivity.java
@@ -90,7 +90,7 @@ public class ProxyActivity extends BaseActivity {
         count2 = 0;
         final Spinner proxy_type = findViewById(R.id.type);
         ArrayAdapter<CharSequence> adapterTrans = ArrayAdapter.createFromResource(ProxyActivity.this,
-                R.array.proxy_type_choice, android.R.layout.simple_spinner_item);
+                R.array.proxy_type_choice, android.R.layout.simple_spinner_dropdown_item);
         proxy_type.setAdapter(adapterTrans);
 
 
diff --git a/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java b/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
index b4be8b172..f65cddbfb 100644
--- a/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java
@@ -129,10 +129,10 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(ReorderTimelinesActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar_add, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(ReorderTimelinesActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -160,13 +160,19 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
                     AutoCompleteTextView instance_list = dialogView.findViewById(R.id.search_instance);
                     //Manage download of attachments
                     RadioGroup radioGroup = dialogView.findViewById(R.id.set_attachment_group);
-
+                    radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
+                        if( checkedId == R.id.twitter_accounts){
+                            instance_list.setHint(R.string.list_of_twitter_accounts);
+                        }else {
+                            instance_list.setHint(R.string.instance);
+                        }
+                    });
                     instance_list.setFilters(new InputFilter[]{new InputFilter.LengthFilter(60)});
                     dialogBuilder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int id) {
                             SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
-                            String instanceName = instance_list.getText().toString().trim();
+                            String instanceName = instance_list.getText().toString().trim().replace("@","");
                             new Thread(new Runnable() {
                                 @Override
                                 public void run() {
@@ -182,7 +188,6 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
                                         } else if (radioGroup.getCheckedRadioButtonId() == R.id.gnu_instance) {
                                             new HttpsConnection(ReorderTimelinesActivity.this, null).get("https://" + instanceName + "/api/statuses/public_timeline.json", 10, null, null);
                                         }
-
                                         runOnUiThread(new Runnable() {
                                             public void run() {
                                                 dialog.dismiss();
@@ -196,6 +201,8 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
                                                     new InstancesDAO(ReorderTimelinesActivity.this, db).insertInstance(instanceName, "MISSKEY");
                                                 } else if (radioGroup.getCheckedRadioButtonId() == R.id.gnu_instance) {
                                                     new InstancesDAO(ReorderTimelinesActivity.this, db).insertInstance(instanceName, "GNU");
+                                                }else if (radioGroup.getCheckedRadioButtonId() == R.id.twitter_accounts) {
+                                                    new InstancesDAO(ReorderTimelinesActivity.this, db).insertInstance(instanceName, "NITTER");
                                                 }
                                                 if (timelines != null && adapter != null) {
                                                     List<RemoteInstance> instance = new InstancesDAO(ReorderTimelinesActivity.this, db).getInstanceByName(instanceName);
@@ -256,78 +263,84 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
 
                         @Override
                         public void afterTextChanged(Editable s) {
-                            Pattern host = Pattern.compile("([\\da-z\\.-]+\\.[a-z\\.]{2,12})");
-                            Matcher matcher = host.matcher(s.toString().trim());
-                            if (s.toString().trim().length() == 0 || !matcher.find()) {
-                                alertDialog.getButton(
-                                        AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-                            } else {
-                                // Something into edit text. Enable the button.
+                            if (radioGroup.getCheckedRadioButtonId() != R.id.twitter_accounts){
+                                Pattern host = Pattern.compile("([\\da-z\\.-]+\\.[a-z\\.]{2,12})");
+                                Matcher matcher = host.matcher(s.toString().trim());
+                                if (s.toString().trim().length() == 0 || !matcher.find()) {
+                                    alertDialog.getButton(
+                                            AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                                } else {
+                                    // Something into edit text. Enable the button.
+                                    alertDialog.getButton(
+                                            AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+                                }
+                                if (s.length() > 2 && !isLoadingInstance) {
+                                    final String action = "/instances/search";
+                                    final HashMap<String, String> parameters = new HashMap<>();
+                                    parameters.put("q", s.toString().trim());
+                                    parameters.put("count", String.valueOf(1000));
+                                    parameters.put("name", String.valueOf(true));
+                                    isLoadingInstance = true;
+
+                                    if (oldSearch == null || !oldSearch.equals(s.toString().trim()))
+                                        new Thread(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                try {
+                                                    final String response = new HttpsConnection(ReorderTimelinesActivity.this, null).get("https://instances.social/api/1.0" + action, 30, parameters, Helper.THEKINRAR_SECRET_TOKEN);
+                                                    runOnUiThread(new Runnable() {
+                                                        public void run() {
+                                                            isLoadingInstance = false;
+                                                            String[] instances;
+                                                            try {
+                                                                JSONObject jsonObject = new JSONObject(response);
+                                                                JSONArray jsonArray = jsonObject.getJSONArray("instances");
+                                                                if (jsonArray != null) {
+                                                                    int length = 0;
+                                                                    for (int i = 0; i < jsonArray.length(); i++) {
+                                                                        if (!jsonArray.getJSONObject(i).get("name").toString().contains("@") && jsonArray.getJSONObject(i).get("up").toString().equals("true"))
+                                                                            length++;
+                                                                    }
+                                                                    instances = new String[length];
+                                                                    int j = 0;
+                                                                    for (int i = 0; i < jsonArray.length(); i++) {
+                                                                        if (!jsonArray.getJSONObject(i).get("name").toString().contains("@") && jsonArray.getJSONObject(i).get("up").toString().equals("true")) {
+                                                                            instances[j] = jsonArray.getJSONObject(i).get("name").toString();
+                                                                            j++;
+                                                                        }
+                                                                    }
+                                                                } else {
+                                                                    instances = new String[]{};
+                                                                }
+                                                                instance_list.setAdapter(null);
+                                                                ArrayAdapter<String> adapter =
+                                                                        new ArrayAdapter<>(ReorderTimelinesActivity.this, android.R.layout.simple_list_item_1, instances);
+                                                                instance_list.setAdapter(adapter);
+                                                                if (instance_list.hasFocus() && !ReorderTimelinesActivity.this.isFinishing())
+                                                                    instance_list.showDropDown();
+                                                                oldSearch = s.toString().trim();
+
+                                                            } catch (JSONException ignored) {
+                                                                isLoadingInstance = false;
+                                                            }
+                                                        }
+                                                    });
+
+                                                } catch (HttpsConnection.HttpsConnectionException e) {
+                                                    isLoadingInstance = false;
+                                                } catch (Exception e) {
+                                                    isLoadingInstance = false;
+                                                }
+                                            }
+                                        }).start();
+                                    else
+                                        isLoadingInstance = false;
+                                }
+                            }else {
                                 alertDialog.getButton(
                                         AlertDialog.BUTTON_POSITIVE).setEnabled(true);
                             }
-                            if (s.length() > 2 && !isLoadingInstance) {
-                                final String action = "/instances/search";
-                                final HashMap<String, String> parameters = new HashMap<>();
-                                parameters.put("q", s.toString().trim());
-                                parameters.put("count", String.valueOf(1000));
-                                parameters.put("name", String.valueOf(true));
-                                isLoadingInstance = true;
 
-                                if (oldSearch == null || !oldSearch.equals(s.toString().trim()))
-                                    new Thread(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            try {
-                                                final String response = new HttpsConnection(ReorderTimelinesActivity.this, null).get("https://instances.social/api/1.0" + action, 30, parameters, Helper.THEKINRAR_SECRET_TOKEN);
-                                                runOnUiThread(new Runnable() {
-                                                    public void run() {
-                                                        isLoadingInstance = false;
-                                                        String[] instances;
-                                                        try {
-                                                            JSONObject jsonObject = new JSONObject(response);
-                                                            JSONArray jsonArray = jsonObject.getJSONArray("instances");
-                                                            if (jsonArray != null) {
-                                                                int length = 0;
-                                                                for (int i = 0; i < jsonArray.length(); i++) {
-                                                                    if (!jsonArray.getJSONObject(i).get("name").toString().contains("@") && jsonArray.getJSONObject(i).get("up").toString().equals("true"))
-                                                                        length++;
-                                                                }
-                                                                instances = new String[length];
-                                                                int j = 0;
-                                                                for (int i = 0; i < jsonArray.length(); i++) {
-                                                                    if (!jsonArray.getJSONObject(i).get("name").toString().contains("@") && jsonArray.getJSONObject(i).get("up").toString().equals("true")) {
-                                                                        instances[j] = jsonArray.getJSONObject(i).get("name").toString();
-                                                                        j++;
-                                                                    }
-                                                                }
-                                                            } else {
-                                                                instances = new String[]{};
-                                                            }
-                                                            instance_list.setAdapter(null);
-                                                            ArrayAdapter<String> adapter =
-                                                                    new ArrayAdapter<>(ReorderTimelinesActivity.this, android.R.layout.simple_list_item_1, instances);
-                                                            instance_list.setAdapter(adapter);
-                                                            if (instance_list.hasFocus() && !ReorderTimelinesActivity.this.isFinishing())
-                                                                instance_list.showDropDown();
-                                                            oldSearch = s.toString().trim();
-
-                                                        } catch (JSONException ignored) {
-                                                            isLoadingInstance = false;
-                                                        }
-                                                    }
-                                                });
-
-                                            } catch (HttpsConnection.HttpsConnectionException e) {
-                                                isLoadingInstance = false;
-                                            } catch (Exception e) {
-                                                isLoadingInstance = false;
-                                            }
-                                        }
-                                    }).start();
-                                else
-                                    isLoadingInstance = false;
-                            }
                         }
                     });
                 }
@@ -419,6 +432,7 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra
         super.onStop();
         if (updated) {
             Intent intent = new Intent(getBaseContext(), MainActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.putExtra(Helper.INTENT_ACTION, Helper.REFRESH_TIMELINE);
             intent.putExtra(Helper.REFRESH_LIST_TIMELINE, refresh_list);
             startActivity(intent);
diff --git a/app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java b/app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java
index d29516744..c6fb9ecd9 100644
--- a/app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java
@@ -41,7 +41,9 @@ import app.fedilab.android.client.APIResponse;
 import app.fedilab.android.client.Entities.Account;
 import app.fedilab.android.client.Entities.Error;
 import app.fedilab.android.client.Entities.Status;
+import app.fedilab.android.client.Entities.Trends;
 import app.fedilab.android.drawers.SearchListAdapter;
+import app.fedilab.android.drawers.TrendsAdapter;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.interfaces.OnRetrieveSearchInterface;
 import app.fedilab.android.interfaces.OnRetrieveSearchStatusInterface;
@@ -59,6 +61,7 @@ public class SearchResultActivity extends BaseActivity implements OnRetrieveSear
     private String search;
     private ListView lv_search;
     private RelativeLayout loader;
+    private boolean forTrends;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -69,16 +72,13 @@ public class SearchResultActivity extends BaseActivity implements OnRetrieveSear
             case Helper.THEME_LIGHT:
                 setTheme(R.style.AppTheme_Fedilab);
                 break;
-            case Helper.THEME_DARK:
-                setTheme(R.style.AppThemeDark);
-                break;
             case Helper.THEME_BLACK:
                 setTheme(R.style.AppThemeBlack);
                 break;
             default:
                 setTheme(R.style.AppThemeDark);
         }
-
+        forTrends = false;
         setContentView(R.layout.activity_search_result);
 
         loader = findViewById(R.id.loader);
@@ -94,14 +94,17 @@ public class SearchResultActivity extends BaseActivity implements OnRetrieveSear
         } else {
             Toasty.error(getApplicationContext(), getString(R.string.toast_error_search), Toast.LENGTH_LONG).show();
         }
+        if( search.compareTo("fedilab_trend") == 0 ) {
+            forTrends = true;
+        }
         if (getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(SearchResultActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(SearchResultActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -112,9 +115,17 @@ public class SearchResultActivity extends BaseActivity implements OnRetrieveSear
                     finish();
                 }
             });
-            toolbar_title.setText(search);
+            if( !forTrends) {
+                toolbar_title.setText(search);
+            }else{
+                toolbar_title.setText(getString(R.string.trending_now));
+            }
+        }
+        if( !forTrends) {
+            setTitle(search);
+        }else{
+            setTitle(R.string.trending_now);
         }
-        setTitle(search);
         loader.setVisibility(View.VISIBLE);
         lv_search.setVisibility(View.GONE);
 
@@ -147,20 +158,31 @@ public class SearchResultActivity extends BaseActivity implements OnRetrieveSear
                 Toasty.error(getApplicationContext(), getString(R.string.toast_error), Toast.LENGTH_LONG).show();
             return;
         }
-        if (apiResponse.getResults() == null || (apiResponse.getResults().getAccounts().size() == 0 && apiResponse.getResults().getStatuses().size() == 0 && apiResponse.getResults().getHashtags().size() == 0)) {
-            RelativeLayout no_result = findViewById(R.id.no_result);
-            no_result.setVisibility(View.VISIBLE);
-            return;
-        }
         lv_search.setVisibility(View.VISIBLE);
-        List<String> tags = apiResponse.getResults().getHashtags();
-        List<Account> accounts = apiResponse.getResults().getAccounts();
-        List<Status> statuses = apiResponse.getResults().getStatuses();
-
-        SearchListAdapter searchListAdapter = new SearchListAdapter(SearchResultActivity.this, statuses, accounts, tags);
-        lv_search.setAdapter(searchListAdapter);
-        searchListAdapter.notifyDataSetChanged();
+        if (!forTrends) {
+            if (apiResponse.getResults() == null || (apiResponse.getResults().getAccounts().size() == 0 && apiResponse.getResults().getStatuses().size() == 0 && apiResponse.getResults().getHashtags().size() == 0)) {
+                RelativeLayout no_result = findViewById(R.id.no_result);
+                no_result.setVisibility(View.VISIBLE);
+                return;
+            }
+            List<String> tags = apiResponse.getResults().getHashtags();
+            List<Account> accounts = apiResponse.getResults().getAccounts();
+            List<Status> statuses = apiResponse.getResults().getStatuses();
 
+            SearchListAdapter searchListAdapter = new SearchListAdapter(SearchResultActivity.this, statuses, accounts, tags);
+            lv_search.setAdapter(searchListAdapter);
+            searchListAdapter.notifyDataSetChanged();
+        } else {
+            if (apiResponse.getTrends() == null || apiResponse.getTrends().size() == 0 ) {
+                RelativeLayout no_result = findViewById(R.id.no_result);
+                no_result.setVisibility(View.VISIBLE);
+                return;
+            }
+            List<Trends> trends = apiResponse.getTrends();
+            TrendsAdapter trendsAdapter = new TrendsAdapter(SearchResultActivity.this, trends);
+            lv_search.setAdapter(trendsAdapter);
+            trendsAdapter.notifyDataSetChanged();
+        }
     }
 
 
diff --git a/app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java b/app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java
index 10d0ba48b..dce20cd44 100644
--- a/app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java
@@ -27,6 +27,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
@@ -104,10 +105,10 @@ public class SearchResultTabActivity extends BaseActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(SearchResultTabActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(SearchResultTabActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -233,7 +234,10 @@ public class SearchResultTabActivity extends BaseActivity {
             return null;
         }
 
+        @Override
+        public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
 
+        }
         @Override
         public int getCount() {
             return 4;
diff --git a/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java b/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java
index ac9ec6a78..652c546ab 100644
--- a/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/SettingsActivity.java
@@ -78,10 +78,11 @@ public class SettingsActivity extends BaseActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(SettingsActivity.this, R.color.cyanea_primary)));
+
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(SettingsActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -109,6 +110,7 @@ public class SettingsActivity extends BaseActivity {
         tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.notifications)));
         tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.settings_category_label_interface)));
         tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.compose)));
+        tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.action_privacy)));
         tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.theming)));
         tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.hide_menu_items)));
         tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.administration)));
@@ -215,14 +217,17 @@ public class SettingsActivity extends BaseActivity {
                     typeOfSettings = ContentSettingsFragment.type.COMPOSE;
                     break;
                 case 4:
-                    return new ColorSettingsFragment();
+                    typeOfSettings = ContentSettingsFragment.type.PRIVACY;
+                    break;
                 case 5:
+                    return new ColorSettingsFragment();
+                case 6:
                     typeOfSettings = ContentSettingsFragment.type.MENU;
                     break;
-                case 6:
+                case 7:
                     typeOfSettings = ContentSettingsFragment.type.ADMIN;
                     break;
-                case 7:
+                case 8:
                     typeOfSettings = ContentSettingsFragment.type.LANGUAGE;
                     break;
                 default:
@@ -238,7 +243,7 @@ public class SettingsActivity extends BaseActivity {
 
         @Override
         public int getCount() {
-            return 8;
+            return 9;
         }
     }
 }
diff --git a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
index c6dab6d53..1a7435a66 100644
--- a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
@@ -32,6 +32,7 @@ import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.UnderlineSpan;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -51,6 +52,8 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
@@ -77,6 +80,7 @@ import app.fedilab.android.asynctasks.PostActionAsyncTask;
 import app.fedilab.android.asynctasks.RetrieveAccountAsyncTask;
 import app.fedilab.android.asynctasks.RetrieveAccountsAsyncTask;
 import app.fedilab.android.asynctasks.RetrieveFeedsAsyncTask;
+import app.fedilab.android.asynctasks.RetrieveIdentityProofAsyncTask;
 import app.fedilab.android.asynctasks.RetrieveRelationshipAsyncTask;
 import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
 import app.fedilab.android.client.API;
@@ -84,6 +88,7 @@ import app.fedilab.android.client.APIResponse;
 import app.fedilab.android.client.Entities.Account;
 import app.fedilab.android.client.Entities.Attachment;
 import app.fedilab.android.client.Entities.Error;
+import app.fedilab.android.client.Entities.IdentityProof;
 import app.fedilab.android.client.Entities.InstanceNodeInfo;
 import app.fedilab.android.client.Entities.ManageTimelines;
 import app.fedilab.android.client.Entities.Relationship;
@@ -91,6 +96,7 @@ import app.fedilab.android.client.Entities.RemoteInstance;
 import app.fedilab.android.client.Entities.Status;
 import app.fedilab.android.client.Entities.UserNote;
 import app.fedilab.android.client.HttpsConnection;
+import app.fedilab.android.drawers.IdentityProofsAdapter;
 import app.fedilab.android.drawers.StatusListAdapter;
 import app.fedilab.android.fragments.DisplayAccountsFragment;
 import app.fedilab.android.fragments.DisplayStatusFragment;
@@ -103,6 +109,7 @@ import app.fedilab.android.interfaces.OnRetrieveAccountInterface;
 import app.fedilab.android.interfaces.OnRetrieveEmojiAccountInterface;
 import app.fedilab.android.interfaces.OnRetrieveFeedsAccountInterface;
 import app.fedilab.android.interfaces.OnRetrieveFeedsInterface;
+import app.fedilab.android.interfaces.OnRetrieveIdentityProofInterface;
 import app.fedilab.android.interfaces.OnRetrieveRelationshipInterface;
 import app.fedilab.android.sqlite.AccountDAO;
 import app.fedilab.android.sqlite.InstancesDAO;
@@ -121,7 +128,7 @@ import static app.fedilab.android.helper.Helper.getLiveInstance;
  * Show account activity class
  */
 
-public class ShowAccountActivity extends BaseActivity implements OnPostActionInterface, OnRetrieveAccountInterface, OnRetrieveFeedsAccountInterface, OnRetrieveRelationshipInterface, OnRetrieveFeedsInterface, OnRetrieveEmojiAccountInterface, OnListActionInterface {
+public class ShowAccountActivity extends BaseActivity implements OnPostActionInterface, OnRetrieveAccountInterface, OnRetrieveFeedsAccountInterface, OnRetrieveRelationshipInterface, OnRetrieveFeedsInterface, OnRetrieveEmojiAccountInterface, OnListActionInterface, OnRetrieveIdentityProofInterface {
 
 
     private List<Status> statuses;
@@ -306,7 +313,10 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
             header_edit_profile.setVisibility(View.VISIBLE);
             header_edit_profile.bringToFront();
         }
-
+        //TODO: add other software that supports identity proofs
+        if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
+            new RetrieveIdentityProofAsyncTask(ShowAccountActivity.this, account.getId(), ShowAccountActivity.this).execute();
+        }
         String urlHeader = account.getHeader();
         if (urlHeader != null && urlHeader.startsWith("/")) {
             urlHeader = Helper.getLiveInstanceWithProtocol(ShowAccountActivity.this) + account.getHeader();
@@ -335,7 +345,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
         //Redraws icon for locked accounts
         final float scale = getResources().getDisplayMetrics().density;
         if (account.isLocked()) {
-            Drawable img = ContextCompat.getDrawable(getApplicationContext(), R.drawable.ic_lock_outline);
+            Drawable img = ContextCompat.getDrawable(ShowAccountActivity.this, R.drawable.ic_locked_account);
             assert img != null;
             img.setBounds(0, 0, (int) (16 * scale + 0.5f), (int) (16 * scale + 0.5f));
             account_un.setCompoundDrawables(null, null, img, null);
@@ -343,9 +353,6 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
             account_un.setCompoundDrawables(null, null, null, null);
         }
         //Peertube account watched by a Mastodon account
-        /*if( peertubeAccount && (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA)) {
-            account_type.setVisibility(View.VISIBLE);
-        }*/
         //Bot account
         if (account.isBot()) {
             account_bot.setVisibility(View.VISIBLE);
@@ -861,6 +868,7 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
 
         TextView account_date = findViewById(R.id.account_date);
         account_date.setText(Helper.shortDateToString(account.getCreated_at()));
+        account_date.setVisibility(View.VISIBLE);
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -870,15 +878,22 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
                     instance = account.getAcct().split("@")[1];
                 }
                 InstanceNodeInfo instanceNodeInfo = new API(ShowAccountActivity.this).displayNodeInfo(instance);
-
+                String finalInstance = instance;
                 runOnUiThread(new Runnable() {
                     public void run() {
                         if (instanceNodeInfo != null && instanceNodeInfo.getName() != null) {
                             TextView instance_info = findViewById(R.id.instance_info);
                             instance_info.setText(instanceNodeInfo.getName());
                             instance_info.setVisibility(View.VISIBLE);
-                            TextView seperator = findViewById(R.id.seperator);
-                            seperator.setVisibility(View.VISIBLE);
+
+                            instance_info.setOnClickListener(v -> {
+                                Intent intent = new Intent(getApplicationContext(), InstanceProfileActivity.class);
+                                Bundle b = new Bundle();
+                                b.putString("instance", finalInstance);
+                                intent.putExtras(b);
+                                startActivity(intent);
+
+                            });
                         }
                     }
                 });
@@ -941,15 +956,34 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
     private void manageButtonVisibility() {
         if (relationship == null)
             return;
-        account_follow.setEnabled(true);
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            account_follow.setBackgroundTintList(ColorStateList.valueOf(ContextCompat.getColor(ShowAccountActivity.this, R.color.mastodonC4)));
+            int[][] states = new int[][] {
+                    new int[] { android.R.attr.state_enabled}, // enabled
+                    new int[] {-android.R.attr.state_enabled}, // disabled
+                    new int[] {-android.R.attr.state_checked}, // unchecked
+                    new int[] { android.R.attr.state_pressed}  // pressed
+            };
+
+            int[] colors = new int[] {
+                    ContextCompat.getColor(ShowAccountActivity.this, R.color.mastodonC4),
+                    ContextCompat.getColor(ShowAccountActivity.this, R.color.mastodonC4___),
+                    ContextCompat.getColor(ShowAccountActivity.this, R.color.mastodonC4),
+                    ContextCompat.getColor(ShowAccountActivity.this, R.color.mastodonC4)
+            };
+            account_follow.setBackgroundTintList(new ColorStateList(states, colors));
         }
+        account_follow.setEnabled(true);
         if (relationship.isBlocking()) {
             account_follow.setImageResource(R.drawable.ic_lock_open);
             doAction = action.UNBLOCK;
             account_follow.setVisibility(View.VISIBLE);
-        } else if (relationship.isRequested()) {
+        } else if (relationship.isBlocked_by()) {
+            account_follow.setImageResource(R.drawable.ic_user_plus);
+            account_follow.setVisibility(View.VISIBLE);
+            account_follow.setEnabled(false);
+            doAction = action.NOTHING;
+        }else if (relationship.isRequested()) {
             account_follow_request.setVisibility(View.VISIBLE);
             account_follow.setImageResource(R.drawable.ic_hourglass_full);
             account_follow.setVisibility(View.VISIBLE);
@@ -1513,6 +1547,50 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
         return show_boosts;
     }
 
+    @Override
+    public void onIdentityProof(APIResponse apiResponse) {
+        if( apiResponse == null) {
+            return;
+        }
+        List<IdentityProof> identityProofs = apiResponse.getIdentityProofs();
+        if( identityProofs != null && identityProofs.size() > 0 ){
+            ImageView identity_proofs_indicator = findViewById(R.id.identity_proofs_indicator);
+            identity_proofs_indicator.setVisibility(View.VISIBLE);
+            SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
+            int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
+            accountUrl = account.getUrl();
+            int style;
+            if (theme == Helper.THEME_LIGHT)
+                style = R.style.Dialog;
+            else if (theme == Helper.THEME_BLACK)
+                style = R.style.DialogBlack;
+            else
+                style = R.style.DialogDark;
+            identity_proofs_indicator.setOnClickListener(v -> {
+                AlertDialog.Builder builder = new AlertDialog.Builder(ShowAccountActivity.this, style);
+
+                LayoutInflater inflater = getLayoutInflater();
+                View  identityProofsView = inflater.inflate(R.layout.popup_identity_proof, new LinearLayout(ShowAccountActivity.this), false);
+                RecyclerView  identityProofsRecycler = identityProofsView.findViewById(R.id.identity_proofs_list);
+                LinearLayoutManager mLayoutManager = new LinearLayoutManager(ShowAccountActivity.this);
+                identityProofsRecycler.setLayoutManager(mLayoutManager);
+                IdentityProofsAdapter identityProofsAdapter = new IdentityProofsAdapter(identityProofs);
+                identityProofsRecycler.setAdapter(identityProofsAdapter);
+                builder.setView(identityProofsView);
+                builder
+                        .setTitle(R.string.identity_proofs)
+                        .setPositiveButton(R.string.close, new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                dialog.dismiss();
+                            }
+                        })
+                        .show();
+            });
+
+        }
+    }
+
 
     public enum action {
         FOLLOW,
diff --git a/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java
index 491fdaed4..88bed7f5a 100644
--- a/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java
@@ -20,6 +20,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
+import android.graphics.drawable.ColorDrawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.View;
@@ -28,6 +29,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -115,13 +119,16 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve
                     assert b != null;
                     Status status = b.getParcelable("status");
                     if (status != null && statusListAdapter != null) {
-                        statusListAdapter.notifyStatusWithActionChanged(status);
+                        statusListAdapter.notifyStatusChanged(status);
                     }
                 }
             };
             LocalBroadcastManager.getInstance(getApplicationContext()).registerReceiver(receive_action, new IntentFilter(Helper.RECEIVE_ACTION));
         }
-
+        Toolbar actionBar = findViewById(R.id.toolbar);
+        if (actionBar != null) {
+            actionBar.setBackground(new ColorDrawable(ContextCompat.getColor(ShowConversationActivity.this, R.color.cyanea_primary)));
+        }
         TextView title = findViewById(R.id.toolbar_title);
         ImageView pp_actionBar = findViewById(R.id.pp_actionBar);
         ImageView action_refresh = findViewById(R.id.action_refresh);
diff --git a/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java b/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java
index 83edc1c04..cbd7c1e62 100644
--- a/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/SlideMediaActivity.java
@@ -26,6 +26,7 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.graphics.Point;
+import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -63,6 +64,7 @@ import app.fedilab.android.client.Entities.Error;
 import app.fedilab.android.fragments.MediaSliderFragment;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.interfaces.OnDownloadInterface;
+import es.dmoral.toasty.Toasty;
 
 
 /**
@@ -95,13 +97,14 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
                 Uri uri = manager.getUriForDownloadedFile(downloadID);
                 Intent shareIntent = new Intent(Intent.ACTION_SEND);
                 shareIntent.putExtra(Intent.EXTRA_STREAM, uri);
-                shareIntent.putExtra(Intent.EXTRA_TEXT, getString(R.string.share_with));
                 ContentResolver cR = context.getContentResolver();
                 shareIntent.setType(cR.getType(uri));
                 try {
                     startActivity(shareIntent);
                 } catch (Exception ignored) {
                 }
+            }else{
+                Toasty.success(context, context.getString(R.string.save_over), Toasty.LENGTH_LONG).show();
             }
         }
     };
@@ -126,6 +129,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
 
         fullscreen = false;
         media_description = findViewById(R.id.media_description);
+        final int med_desc_timeout = sharedpreferences.getInt(Helper.SET_MED_DESC_TIMEOUT, 3) * 1000;
         flags = getWindow().getDecorView().getSystemUiVisibility();
 
         swipeEnabled = true;
@@ -135,6 +139,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.media_action_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(SlideMediaActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -152,17 +157,30 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
                 public void onClick(View view) {
                     int position = mPager.getCurrentItem();
                     Attachment attachment = attachments.get(position);
-                    if (Build.VERSION.SDK_INT >= 23) {
-                        if (ContextCompat.checkSelfPermission(SlideMediaActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(SlideMediaActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                            ActivityCompat.requestPermissions(SlideMediaActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, Helper.EXTERNAL_STORAGE_REQUEST_CODE);
+                    if( attachment.getType().compareTo("image") == 0 ){
+                        if (Build.VERSION.SDK_INT >= 23) {
+                            if (ContextCompat.checkSelfPermission(SlideMediaActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(SlideMediaActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                                ActivityCompat.requestPermissions(SlideMediaActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, Helper.EXTERNAL_STORAGE_REQUEST_CODE);
+                            } else {
+                                Helper.manageMove(SlideMediaActivity.this, attachment.getUrl(), false);
+                            }
+                        } else {
+                            Helper.manageMove(SlideMediaActivity.this, attachment.getUrl(), false);
+                        }
+                    }else {
+                        if (Build.VERSION.SDK_INT >= 23) {
+                            if (ContextCompat.checkSelfPermission(SlideMediaActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(SlideMediaActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                                ActivityCompat.requestPermissions(SlideMediaActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, Helper.EXTERNAL_STORAGE_REQUEST_CODE);
+                            } else {
+                                Helper.manageDownloadsNoPopup(SlideMediaActivity.this, attachment.getUrl());
+                                downloadID = -1;
+                            }
                         } else {
                             Helper.manageDownloadsNoPopup(SlideMediaActivity.this, attachment.getUrl());
                             downloadID = -1;
                         }
-                    } else {
-                        Helper.manageDownloadsNoPopup(SlideMediaActivity.this, attachment.getUrl());
-                        downloadID = -1;
                     }
+
                 }
             });
             media_share.setOnClickListener(new View.OnClickListener() {
@@ -170,7 +188,9 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
                 public void onClick(View view) {
                     int position = mPager.getCurrentItem();
                     Attachment attachment = attachments.get(position);
-                    if (attachment.getType().toLowerCase().equals("video") || attachment.getType().toLowerCase().equals("audio") || attachment.getType().toLowerCase().equals("gifv")) {
+                    if( attachment.getType().compareTo("image") == 0 ){
+                        Helper.manageMove(SlideMediaActivity.this, attachment.getUrl(), true);
+                    }else if (attachment.getType().toLowerCase().equals("video") || attachment.getType().toLowerCase().equals("audio") || attachment.getType().toLowerCase().equals("gifv")) {
                         downloadID = Helper.manageDownloadsNoPopup(SlideMediaActivity.this, attachment.getUrl());
                     } else {
                         if (Build.VERSION.SDK_INT >= 23) {
@@ -212,7 +232,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
                 public void run() {
                     media_description.setVisibility(View.GONE);
                 }
-            }, 3000);
+            }, med_desc_timeout);
 
         } else {
             media_description.setVisibility(View.GONE);
@@ -239,7 +259,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
                         public void run() {
                             media_description.setVisibility(View.GONE);
                         }
-                    }, 3000);
+                    }, med_desc_timeout);
 
                 } else {
                     media_description.setVisibility(View.GONE);
@@ -273,6 +293,9 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
     @Override
     public boolean dispatchTouchEvent(MotionEvent event) {
 
+        SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
+        final int med_desc_timeout = sharedpreferences.getInt(Helper.SET_MED_DESC_TIMEOUT, 3) * 1000;
+
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
                 startX = event.getX();
@@ -298,7 +321,7 @@ public class SlideMediaActivity extends BaseActivity implements OnDownloadInterf
                                 public void run() {
                                     media_description.setVisibility(View.GONE);
                                 }
-                            }, 3000);
+                            }, med_desc_timeout);
 
                         } else {
                             media_description.setVisibility(View.GONE);
diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
index b70d767f6..25f288962 100644
--- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
@@ -249,7 +249,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
     private ImageView pp_actionBar;
     private ProgressBar pp_progress;
     private Toast mToast;
-    private RelativeLayout drawer_layout;
+    private LinearLayout drawer_layout;
     private HorizontalScrollView picture_scrollview;
     private TextView toot_space_left;
     private String initialContent;
@@ -340,6 +340,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
 
             @Override
             public void afterTextChanged(Editable s) {
+
                 if (status != null) {
                     status.setQuickReplyContent(s.toString());
                 }
@@ -687,7 +688,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
         String cwContent = toot_cw_content.getText().toString();
         String contentCount = content;
         if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
-            contentCount = contentCount.replaceAll("(^|[^/\\w])@(([a-z0-9_]+)@[a-z0-9\\.\\-]+[a-z0-9]+)", "$1@$3");
+            contentCount = contentCount.replaceAll("(?i)(^|[^/\\w])@(([a-z0-9_]+)@[a-z0-9\\.\\-]+[a-z0-9]+)", "$1@$3");
             Matcher matcherALink = Patterns.WEB_URL.matcher(contentCount);
             while (matcherALink.find()) {
                 final String url = matcherALink.group(1);
@@ -729,13 +730,13 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
 
 
         autocomplete = false;
-
+        setContentView(R.layout.activity_toot);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(TootActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.toot_action_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(TootActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView close_toot = actionBar.getCustomView().findViewById(R.id.close_toot);
@@ -792,7 +793,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
             pp_progress = actionBar.getCustomView().findViewById(R.id.pp_progress);
 
         }
-        setContentView(R.layout.activity_toot);
+
 
         //By default the toot is not restored so the id -1 is defined
         currentToId = -1;
@@ -1005,7 +1006,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
             }
             restored = b.getLong("restored", -1);
         }
-        if (tootReply != null) {
+        if (tootReply != null && tootReply.getAccount() != null) {
             if (tootReply.getAccount() != null && tootReply.getAccount().getMoved_to_account() != null) {
                 warning_message.setVisibility(View.VISIBLE);
             }
@@ -1315,10 +1316,15 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
     private void addNewMedia(JSONObject response, ArrayList<String> successfullyUploadedFiles) {
         Attachment attachment;
         //response = new JSONObject(serverResponse.getBodyAsString());
-        if (social != UpdateAccountInfoAsyncTask.SOCIAL.GNU && social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA)
+        if( response == null ){
+            Toasty.error(TootActivity.this, getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
+            return;
+        }
+        if (social != UpdateAccountInfoAsyncTask.SOCIAL.GNU && social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
             attachment = API.parseAttachmentResponse(response);
-        else
+        } else {
             attachment = GNUAPI.parseUploadedAttachmentResponse(response);
+        }
 
         boolean alreadyAdded = false;
         int index = 0;
@@ -1691,7 +1697,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
+    public boolean onOptionsItemSelected(@NotNull MenuItem item) {
         final SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
         int style;
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
@@ -1895,6 +1901,10 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
                 picker.show(getSupportFragmentManager(), "COUNTRY_PICKER");
                 return true;
             case R.id.action_emoji:
+                if( emojis != null){
+                    emojis.clear();
+                    emojis = null;
+                }
                 emojis = new CustomEmojiDAO(getApplicationContext(), db).getAllEmojis(account.getInstance());
                 final AlertDialog.Builder builder = new AlertDialog.Builder(this, style);
                 int paddingPixel = 15;
@@ -2302,7 +2312,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
         toot.setVisibility(visibility);
         if (tootReply != null)
             toot.setIn_reply_to_id(tootReply.getId());
-        toot.setContent(tootContent);
+        toot.setContent(TootActivity.this, tootContent);
         if (social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
             if (poll != null) {
                 toot.setPoll(poll);
@@ -2692,7 +2702,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
             toot.setVisibility(visibility);
             if (apiResponse.getStatuses() != null && apiResponse.getStatuses().size() > 0)
                 toot.setIn_reply_to_id(apiResponse.getStatuses().get(0).getId());
-            toot.setContent(tootContent);
+            toot.setContent(TootActivity.this, tootContent);
             new PostStatusAsyncTask(getApplicationContext(), social, account, toot, TootActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             return;
 
@@ -3661,10 +3671,10 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
         });
 
         ArrayAdapter<CharSequence> pollduration = ArrayAdapter.createFromResource(TootActivity.this,
-                R.array.poll_duration, android.R.layout.simple_spinner_item);
+                R.array.poll_duration, android.R.layout.simple_spinner_dropdown_item);
 
         ArrayAdapter<CharSequence> pollchoice = ArrayAdapter.createFromResource(TootActivity.this,
-                R.array.poll_choice_type, android.R.layout.simple_spinner_item);
+                R.array.poll_choice_type, android.R.layout.simple_spinner_dropdown_item);
         poll_choice.setAdapter(pollchoice);
         poll_duration.setAdapter(pollduration);
         poll_duration.setSelection(4);
@@ -3857,7 +3867,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
         if (toot_cw_content.getText().toString().trim().length() > 0)
             toot.setSpoiler_text(toot_cw_content.getText().toString().trim());
         toot.setVisibility(visibility);
-        toot.setContent(currentContent);
+        toot.setContent(TootActivity.this, currentContent);
 
         if (poll != null)
             toot.setPoll(poll);
@@ -4169,8 +4179,12 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
 
         @Override
         protected void onPostExecute(Void result) {
-            activityWeakReference.get().findViewById(R.id.compression_loader).setVisibility(View.GONE);
-            activityWeakReference.get().findViewById(R.id.picture_scrollview).setVisibility(View.VISIBLE);
+            if( activityWeakReference.get().findViewById(R.id.compression_loader) != null) {
+                activityWeakReference.get().findViewById(R.id.compression_loader).setVisibility(View.GONE);
+            }
+            if( activityWeakReference.get().findViewById(R.id.picture_scrollview) != null){
+                activityWeakReference.get().findViewById(R.id.picture_scrollview).setVisibility(View.VISIBLE);
+            }
             if (!error) {
                 if (commpressedFilePath != null) {
                     uriFile = Uri.fromFile(new File(commpressedFilePath));
@@ -4181,15 +4195,19 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
                 toot_picture = this.activityWeakReference.get().findViewById(R.id.toot_picture);
                 toot_it = this.activityWeakReference.get().findViewById(R.id.toot_it);
                 toot_picture_container = this.activityWeakReference.get().findViewById(R.id.toot_picture_container);
-
-                toot_picture_container.setVisibility(View.VISIBLE);
-                toot_picture.setEnabled(false);
-                toot_it.setEnabled(false);
+                if( toot_picture_container != null){
+                    toot_picture_container.setVisibility(View.VISIBLE);
+                }
+                if( toot_picture != null){
+                    toot_picture.setEnabled(false);
+                }
+                if( toot_it != null){
+                    toot_it.setEnabled(false);
+                }
                 if (filename == null) {
                     filename = Helper.getFileName(this.activityWeakReference.get(), uriFile);
                 }
                 filesMap.put(filename, uriFile);
-
                 upload(activityWeakReference.get(), account, social, uriFile, filename, uploadReceiver);
             }
         }
diff --git a/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java b/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java
index 371a7df33..d53058a77 100644
--- a/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/WebviewConnectActivity.java
@@ -114,10 +114,10 @@ public class WebviewConnectActivity extends BaseActivity {
         clientSecret = sharedpreferences.getString(Helper.CLIENT_SECRET, null);
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(WebviewConnectActivity.this, R.color.cyanea_primary)));
             LayoutInflater inflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             assert inflater != null;
             View view = inflater.inflate(R.layout.simple_bar, new LinearLayout(getApplicationContext()), false);
+            view.setBackground(new ColorDrawable(ContextCompat.getColor(WebviewConnectActivity.this, R.color.cyanea_primary)));
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
@@ -133,6 +133,10 @@ public class WebviewConnectActivity extends BaseActivity {
         webView = findViewById(R.id.webviewConnect);
         clearCookies(getApplicationContext());
         webView.getSettings().setJavaScriptEnabled(true);
+        String user_agent = sharedpreferences.getString(Helper.SET_CUSTOM_USER_AGENT, null);
+        if( user_agent != null) {
+            webView.getSettings().setUserAgentString(user_agent);
+        }
         if (android.os.Build.VERSION.SDK_INT >= 21) {
             CookieManager.getInstance().setAcceptThirdPartyCookies(webView, true);
         } else {
diff --git a/app/src/main/java/app/fedilab/android/activities/WhoToFollowActivity.java b/app/src/main/java/app/fedilab/android/activities/WhoToFollowActivity.java
index e1a06950d..a7830539c 100644
--- a/app/src/main/java/app/fedilab/android/activities/WhoToFollowActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/WhoToFollowActivity.java
@@ -28,6 +28,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -90,6 +91,7 @@ public class WhoToFollowActivity extends BaseActivity implements OnRetrieveWhoTo
         setContentView(R.layout.activity_who_to_follow);
         no_action = findViewById(R.id.no_action);
         Toolbar toolbar = findViewById(R.id.toolbar);
+        toolbar.setBackgroundColor(ContextCompat.getColor(WhoToFollowActivity.this, R.color.cyanea_primary));
         progess_action = findViewById(R.id.progess_action);
         setSupportActionBar(toolbar);
         if (getSupportActionBar() != null)
diff --git a/app/src/main/java/app/fedilab/android/asynctasks/PostActionAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/PostActionAsyncTask.java
index dbee37368..9b3b48e87 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/PostActionAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/PostActionAsyncTask.java
@@ -239,7 +239,15 @@ public class PostActionAsyncTask extends AsyncTask<Void, Void, Void> {
                 statusCode = gnuapi.statusAction(status);
             else if (apiAction == API.StatusAction.MUTE_NOTIFICATIONS)
                 statusCode = gnuapi.muteNotifications(targetedId, muteNotifications);
-            else
+            else if (apiAction == API.StatusAction.AUTHORIZE || apiAction == API.StatusAction.REJECT) {
+                //This part uses the Mastodon API
+                API api;
+                if (account != null)
+                    api = new API(contextReference.get(), account.getInstance(), account.getToken());
+                else
+                    api = new API(contextReference.get());
+                statusCode = api.postAction(apiAction, targetedId);
+            } else
                 statusCode = gnuapi.postAction(apiAction, targetedId);
             error = gnuapi.getError();
         }
diff --git a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
index 53a885396..4ce798c55 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFeedsAsyncTask.java
@@ -32,6 +32,7 @@ import app.fedilab.android.client.Entities.Results;
 import app.fedilab.android.client.Entities.RetrieveFeedsParam;
 import app.fedilab.android.client.GNUAPI;
 import app.fedilab.android.client.PeertubeAPI;
+import app.fedilab.android.fragments.DisplayStatusFragment;
 import app.fedilab.android.helper.FilterToots;
 import app.fedilab.android.interfaces.OnRetrieveFeedsInterface;
 import app.fedilab.android.sqlite.InstancesDAO;
@@ -66,6 +67,7 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
     private int timelineId;
     private String currentfilter;
     private String social;
+    private boolean fromCahe;
 
     public RetrieveFeedsAsyncTask(Context context, FilterToots filterToots, String max_id, OnRetrieveFeedsInterface onRetrieveFeedsInterface) {
         this.contextReference = new WeakReference<>(context);
@@ -73,16 +75,26 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
         this.max_id = max_id;
         this.listener = onRetrieveFeedsInterface;
         this.filterToots = filterToots;
+        this.fromCahe = false;
     }
 
-
     public RetrieveFeedsAsyncTask(Context context, Type action, String max_id, OnRetrieveFeedsInterface onRetrieveFeedsInterface) {
         this.contextReference = new WeakReference<>(context);
         this.action = action;
         this.max_id = max_id;
         this.listener = onRetrieveFeedsInterface;
+        this.fromCahe = false;
     }
 
+    public RetrieveFeedsAsyncTask(Context context, Type action, String max_id, boolean fromCahe, OnRetrieveFeedsInterface onRetrieveFeedsInterface) {
+        this.contextReference = new WeakReference<>(context);
+        this.action = action;
+        this.max_id = max_id;
+        this.listener = onRetrieveFeedsInterface;
+        this.fromCahe = fromCahe;
+    }
+
+
 
     public RetrieveFeedsAsyncTask(Context context, Type action, String instanceName, String max_id, OnRetrieveFeedsInterface onRetrieveFeedsInterface) {
         this.contextReference = new WeakReference<>(context);
@@ -90,6 +102,7 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
         this.max_id = max_id;
         this.listener = onRetrieveFeedsInterface;
         this.instanceName = instanceName;
+        this.fromCahe = false;
     }
 
     public RetrieveFeedsAsyncTask(Context context, Type action, int timelineId, String max_id, OnRetrieveFeedsInterface onRetrieveFeedsInterface) {
@@ -98,6 +111,7 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
         this.max_id = max_id;
         this.listener = onRetrieveFeedsInterface;
         this.timelineId = timelineId;
+        this.fromCahe = false;
     }
 
     public RetrieveFeedsAsyncTask(Context context, Type action, String targetedID, String max_id, boolean showMediaOnly, boolean showPinned, OnRetrieveFeedsInterface onRetrieveFeedsInterface) {
@@ -108,6 +122,7 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
         this.targetedID = targetedID;
         this.showMediaOnly = showMediaOnly;
         this.showPinned = showPinned;
+        this.fromCahe = false;
     }
 
     public RetrieveFeedsAsyncTask(Context context, Type action, String targetedID, String max_id, boolean showMediaOnly, boolean showPinned, boolean showReply, OnRetrieveFeedsInterface onRetrieveFeedsInterface) {
@@ -119,6 +134,7 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
         this.showMediaOnly = showMediaOnly;
         this.showPinned = showPinned;
         this.showReply = showReply;
+        this.fromCahe = false;
     }
 
     public RetrieveFeedsAsyncTask(Context context, Type action, String tag, String targetedID, String max_id, OnRetrieveFeedsInterface onRetrieveFeedsInterface) {
@@ -128,6 +144,7 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
         this.listener = onRetrieveFeedsInterface;
         this.targetedID = targetedID;
         this.tag = tag;
+        this.fromCahe = false;
     }
 
     public RetrieveFeedsAsyncTask(Context context, String remoteInstance, String name, String max_id, OnRetrieveFeedsInterface onRetrieveFeedsInterface) {
@@ -137,6 +154,7 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
         this.listener = onRetrieveFeedsInterface;
         this.name = name;
         this.action = Type.REMOTE_INSTANCE;
+        this.fromCahe = false;
     }
 
     public RetrieveFeedsAsyncTask(Context context, RetrieveFeedsParam retrieveFeedsParam, OnRetrieveFeedsInterface onRetrieveFeedsInterface) {
@@ -154,8 +172,12 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
         this.social = retrieveFeedsParam.getSocial();
         this.instanceName = retrieveFeedsParam.getInstanceName();
         this.remoteInstance = retrieveFeedsParam.getRemoteInstance();
+        this.fromCahe = false;
     }
 
+
+
+
     @Override
     protected Void doInBackground(Void... params) {
         API api = new API(this.contextReference.get());
@@ -164,7 +186,11 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
             return null;
         switch (action) {
             case HOME:
-                apiResponse = api.getHomeTimelineCache(max_id);
+                if (this.fromCahe) {
+                    apiResponse = api.getHomeTimelineCache(max_id);
+                } else {
+                    apiResponse = api.getHomeTimeline(max_id);
+                }
                 break;
             case LOCAL:
                 apiResponse = api.getPublicTimeline(true, max_id);
@@ -223,7 +249,15 @@ public class RetrieveFeedsAsyncTask extends AsyncTask<Void, Void, Void> {
                                 status.setType(action);
                             }
                         }
-                    } else if (remoteInstanceObj != null && remoteInstanceObj.size() > 0 && remoteInstanceObj.get(0).getType().equals("PIXELFED")) {
+                    } else if (remoteInstanceObj != null && remoteInstanceObj.size() > 0 && remoteInstanceObj.get(0).getType().equals("NITTER")) {
+                        apiResponse = api.getNitter(this.instanceName, max_id);
+                        List<app.fedilab.android.client.Entities.Status> statusesTemp = apiResponse.getStatuses();
+                        if (statusesTemp != null) {
+                            for (app.fedilab.android.client.Entities.Status status : statusesTemp) {
+                                status.setType(action);
+                            }
+                        }
+                    }else if (remoteInstanceObj != null && remoteInstanceObj.size() > 0 && remoteInstanceObj.get(0).getType().equals("PIXELFED")) {
                         apiResponse = api.getPixelfedTimeline(instanceName, max_id);
                     } else if (remoteInstanceObj != null && remoteInstanceObj.size() > 0 && remoteInstanceObj.get(0).getType().equals("GNU")) {
                         apiResponse = api.getGNUTimeline(instanceName, max_id);
diff --git a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFollowRequestSentAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFollowRequestSentAsyncTask.java
index c6bbb3885..6f33be521 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFollowRequestSentAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveFollowRequestSentAsyncTask.java
@@ -45,7 +45,6 @@ public class RetrieveFollowRequestSentAsyncTask extends AsyncTask<Void, Void, Vo
 
     @Override
     protected Void doInBackground(Void... params) {
-
         apiResponse = new API(this.contextReference.get()).getFollowRequest(max_id);
         return null;
     }
diff --git a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveIdentityProofAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveIdentityProofAsyncTask.java
new file mode 100644
index 000000000..cacb7f568
--- /dev/null
+++ b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveIdentityProofAsyncTask.java
@@ -0,0 +1,60 @@
+/* Copyright 2019 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+package app.fedilab.android.asynctasks;
+
+import android.content.Context;
+import android.os.AsyncTask;
+
+import java.lang.ref.WeakReference;
+
+import app.fedilab.android.client.API;
+import app.fedilab.android.client.APIResponse;
+
+import app.fedilab.android.interfaces.OnRetrieveIdentityProofInterface;
+
+
+/**
+ * Created by Thomas on 17/12/2019.
+ * Retrieves identity
+ */
+
+public class RetrieveIdentityProofAsyncTask extends AsyncTask<Void, Void, Void> {
+
+
+    private APIResponse apiResponse;
+    private OnRetrieveIdentityProofInterface listener;
+    private WeakReference<Context> contextReference;
+    private String userId;
+
+
+    public RetrieveIdentityProofAsyncTask(Context context, String userId, OnRetrieveIdentityProofInterface onRetrieveHowToInterface) {
+        this.contextReference = new WeakReference<>(context);
+        this.listener = onRetrieveHowToInterface;
+        this.userId = userId;
+    }
+
+
+    @Override
+    protected Void doInBackground(Void... params) {
+        API api = new API(this.contextReference.get());
+        apiResponse = api.getIdentityProof(userId);
+        return null;
+    }
+
+    @Override
+    protected void onPostExecute(Void result) {
+        listener.onIdentityProof(apiResponse);
+    }
+}
diff --git a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveMetaDataAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveMetaDataAsyncTask.java
index 52f80af97..86f8c9240 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveMetaDataAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveMetaDataAsyncTask.java
@@ -91,6 +91,9 @@ public class RetrieveMetaDataAsyncTask extends AsyncTask<Void, Void, Void> {
                 Pattern descriptionPattern = Pattern.compile("meta[ a-zA-Z=\"'-]+property=[\"']og:description[\"']\\s+content=[\"']([^>]*)[\"']");
                 Pattern imagePattern = Pattern.compile("meta[ a-zA-Z=\"'-]+property=[\"']og:image[\"']\\s+content=[\"']([^>]*)[\"']");
                 try {
+                    if( !potentialUrl.startsWith("http")){
+                        potentialUrl = "http://" + potentialUrl;
+                    }
                     String response = new HttpsConnection(this.contextWeakReference.get(), null).get(potentialUrl);
                     Matcher matcherTitle = titlePattern.matcher(response);
                     Matcher matcherDescription = descriptionPattern.matcher(response);
diff --git a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveOpenCollectiveAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveOpenCollectiveAsyncTask.java
index 03c5ff49b..030b7b5d6 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveOpenCollectiveAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveOpenCollectiveAsyncTask.java
@@ -53,7 +53,7 @@ public class RetrieveOpenCollectiveAsyncTask extends AsyncTask<Void, Void, Void>
 
     @Override
     protected void onPostExecute(Void result) {
-        listener.onRetrieveRemoteAccount(results);
+        listener.onRetrieveRemoteAccount(results, false);
     }
 
     public enum Type {
diff --git a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveRemoteDataAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveRemoteDataAsyncTask.java
index cd763ae6e..834a42644 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveRemoteDataAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveRemoteDataAsyncTask.java
@@ -39,8 +39,16 @@ public class RetrieveRemoteDataAsyncTask extends AsyncTask<Void, Void, Void> {
     private String url;
     private Results results;
     private WeakReference<Context> contextReference;
+    private boolean developerAccount = false;
 
 
+
+    public RetrieveRemoteDataAsyncTask(Context context, OnRetrieveRemoteAccountInterface onRetrieveRemoteAccountInterface) {
+        this.url = "https://toot.fedilab.app/@fedilab";
+        developerAccount = true;
+        this.listener = onRetrieveRemoteAccountInterface;
+        this.contextReference = new WeakReference<>(context);
+    }
     public RetrieveRemoteDataAsyncTask(Context context, String username, String instance, OnRetrieveRemoteAccountInterface onRetrieveRemoteAccountInterface) {
         this.url = Helper.instanceWithProtocol(context, instance) + "/@" + username;
         this.listener = onRetrieveRemoteAccountInterface;
@@ -64,7 +72,7 @@ public class RetrieveRemoteDataAsyncTask extends AsyncTask<Void, Void, Void> {
 
     @Override
     protected void onPostExecute(Void result) {
-        listener.onRetrieveRemoteAccount(results);
+        listener.onRetrieveRemoteAccount(results, developerAccount);
     }
 
 }
diff --git a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveSearchAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveSearchAsyncTask.java
index 1bcccf52c..5e518490f 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/RetrieveSearchAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/RetrieveSearchAsyncTask.java
@@ -72,7 +72,9 @@ public class RetrieveSearchAsyncTask extends AsyncTask<Void, Void, Void> {
     @Override
     protected Void doInBackground(Void... params) {
 
-        if (this.type == null) {
+        if( query.compareTo("fedilab_trend") == 0 ) {
+            apiResponse = new API(this.contextReference.get()).getTrends();
+        }else if (this.type == null) {
             if (MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
                 API api = new API(this.contextReference.get());
                 String[] split = query.trim().split("@");
diff --git a/app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java
index 2f4cd89e7..e575fdf5b 100644
--- a/app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java
+++ b/app/src/main/java/app/fedilab/android/asynctasks/UpdateAccountInfoByIDAsyncTask.java
@@ -86,7 +86,9 @@ public class UpdateAccountInfoByIDAsyncTask extends AsyncTask<Void, Void, Void>
                 if (response != null && response.getEmojis() != null && response.getEmojis().size() > 0) {
                     new CustomEmojiDAO(contextReference.get(), db).removeAll();
                     for (Emojis emojis : response.getEmojis()) {
-                        new CustomEmojiDAO(contextReference.get(), db).insertEmoji(emojis);
+                        if( emojis.isVisible_in_picker()) {
+                            new CustomEmojiDAO(contextReference.get(), db).insertEmoji(emojis);
+                        }
                     }
                 }
             } catch (Exception ignored) {
diff --git a/app/src/main/java/app/fedilab/android/client/API.java b/app/src/main/java/app/fedilab/android/client/API.java
index ee37b15c7..e8027ffc4 100644
--- a/app/src/main/java/app/fedilab/android/client/API.java
+++ b/app/src/main/java/app/fedilab/android/client/API.java
@@ -20,6 +20,7 @@ import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 
+
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.google.gson.JsonArray;
@@ -28,14 +29,21 @@ import com.google.gson.JsonObject;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.net.UnknownHostException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
+import java.text.DateFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -44,6 +52,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import app.fedilab.android.R;
 import app.fedilab.android.activities.MainActivity;
@@ -61,6 +71,7 @@ import app.fedilab.android.client.Entities.Emojis;
 import app.fedilab.android.client.Entities.Error;
 import app.fedilab.android.client.Entities.Filters;
 import app.fedilab.android.client.Entities.HowToVideo;
+import app.fedilab.android.client.Entities.IdentityProof;
 import app.fedilab.android.client.Entities.Instance;
 import app.fedilab.android.client.Entities.InstanceNodeInfo;
 import app.fedilab.android.client.Entities.InstanceReg;
@@ -78,6 +89,8 @@ import app.fedilab.android.client.Entities.Schedule;
 import app.fedilab.android.client.Entities.Status;
 import app.fedilab.android.client.Entities.StoredStatus;
 import app.fedilab.android.client.Entities.Tag;
+import app.fedilab.android.client.Entities.Trends;
+import app.fedilab.android.client.Entities.TrendsHistory;
 import app.fedilab.android.fragments.DisplayNotificationsFragment;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.sqlite.AccountDAO;
@@ -377,7 +390,7 @@ public class API {
                 status.setUrl(comment.get("url").toString());
                 status.setSensitive(false);
                 status.setSpoiler_text("");
-                status.setContent(comment.get("text").toString());
+                status.setContent(context, comment.get("text").toString());
                 status.setIn_reply_to_id(comment.get("inReplyToCommentId").toString());
                 status.setAccount(parseAccountResponsePeertube(context, instance, comment.getJSONObject("account")));
                 status.setCreated_at(Helper.mstStringToDate(context, comment.get("createdAt").toString()));
@@ -510,7 +523,7 @@ public class API {
      * @param resobj
      * @return
      */
-    public static Poll parsePoll(Context context, JSONObject resobj) {
+    private static Poll parsePoll(Context context, JSONObject resobj) {
         Poll poll = new Poll();
         try {
             poll.setId(resobj.getString("id"));
@@ -518,6 +531,11 @@ public class API {
             poll.setExpired(resobj.getBoolean("expired"));
             poll.setMultiple(resobj.getBoolean("multiple"));
             poll.setVotes_count(resobj.getInt("votes_count"));
+            if( resobj.has("voters_count")){
+                poll.setVoters_count(resobj.getInt("voters_count"));
+            }else{
+                poll.setVoters_count(resobj.getInt("votes_count"));
+            }
             poll.setVoted(resobj.getBoolean("voted"));
             JSONArray options = resobj.getJSONArray("options");
             List<PollOptions> pollOptions = new ArrayList<>();
@@ -529,9 +547,7 @@ public class API {
                 pollOptions.add(pollOption);
             }
             poll.setOptionsList(pollOptions);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        } catch (ParseException e) {
+        } catch (JSONException | ParseException e) {
             e.printStackTrace();
         }
         return poll;
@@ -649,7 +665,7 @@ public class API {
             status.setApplication(application);
 
             status.setAccount(parseAccountResponse(context, resobj.getJSONObject("account")));
-            status.setContent(resobj.get("content").toString());
+            status.setContent(context, resobj.get("content").toString());
             if (!resobj.isNull("favourites_count")) {
                 status.setFavourites_count(Integer.valueOf(resobj.get("favourites_count").toString()));
             } else {
@@ -702,6 +718,11 @@ public class API {
                 poll.setExpired(resobj.getJSONObject("poll").getBoolean("expired"));
                 poll.setMultiple(resobj.getJSONObject("poll").getBoolean("multiple"));
                 poll.setVotes_count(resobj.getJSONObject("poll").getInt("votes_count"));
+                if( resobj.getJSONObject("poll").has("voters_count") && !resobj.getJSONObject("poll").isNull("voters_count")){
+                    poll.setVoters_count(resobj.getJSONObject("poll").getInt("voters_count"));
+                }else{
+                    poll.setVoters_count(resobj.getJSONObject("poll").getInt("votes_count"));
+                }
                 poll.setVoted(resobj.getJSONObject("poll").getBoolean("voted"));
                 JSONArray options = resobj.getJSONObject("poll").getJSONArray("options");
                 List<PollOptions> pollOptions = new ArrayList<>();
@@ -717,6 +738,7 @@ public class API {
             }
 
         } catch (JSONException ignored) {
+            ignored.printStackTrace();
         } catch (ParseException e) {
             e.printStackTrace();
         }
@@ -742,12 +764,165 @@ public class API {
             } catch (Exception e) {
                 status.setVisibility("public");
             }
-            status.setContent(resobj.get("text").toString());
+            status.setContent(context, resobj.get("text").toString());
         } catch (JSONException ignored) {
         }
         return status;
     }
 
+
+    /**
+     * Parse xml response for Nitter
+     *
+     * @param xml String
+     * @return List<Status>
+     */
+
+    private List<Status> parseNitter(String xml) {
+        final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        String nitterHost = sharedpreferences.getString(Helper.SET_NITTER_HOST, Helper.DEFAULT_NITTER_HOST).toLowerCase();
+
+        List<Status> statuses = new ArrayList<>();
+        try {
+            XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+            factory.setNamespaceAware(true);
+            XmlPullParser xpp = factory.newPullParser();
+
+            xpp.setInput( new StringReader( xml ) );
+            int eventType = xpp.getEventType();
+            Account account = null;
+            Status status = null;
+            HashMap<String, String> mappedProfile = new HashMap<>();
+            while (eventType != XmlPullParser.END_DOCUMENT) {
+
+                if(eventType == XmlPullParser.START_TAG) {
+                    if( xpp.getName().compareTo("item") == 0 ){
+                        status = new Status();
+                        status.setReplies_count(0);
+                        status.setFavourites_count(0);
+                        status.setReblogs_count(0);
+                        status.setFavourited(false);
+                        status.setReblogged(false);
+                        status.setEmojiFound(true);
+                        status.setPollEmojiFound(true);
+                        status.setEmojiTranslateFound(true);
+                        status.setMedia_attachments(new ArrayList<>());
+                        account = new Account();
+                    }else if( xpp.getName().compareTo("creator") == 0 ){
+                        eventType = xpp.next();
+                        if(eventType == XmlPullParser.TEXT) {
+                            if( account != null ){
+                                account.setAcct(xpp.getText().replace("@","")+"@" + nitterHost);
+                                account.setDisplay_name(xpp.getText().replace("@",""));
+                                account.setUsername(xpp.getText().replace("@",""));
+                                account.setId("https://" + nitterHost + "/" + xpp.getText());
+                                account.setUuid("https://" + nitterHost + "/" + xpp.getText());
+                                account.setUrl("https://" + nitterHost + "/" + xpp.getText());
+                                if( !mappedProfile.containsKey(xpp.getText()) ){
+                                    HttpsConnection httpsConnection = new HttpsConnection(context, nitterHost);
+                                    try {
+                                        String response = httpsConnection.get("https://" + nitterHost + "/" + xpp.getText() + "/rss", 10, null, null);
+                                        XmlPullParserFactory factory2 = XmlPullParserFactory.newInstance();
+                                        factory2.setNamespaceAware(true);
+                                        XmlPullParser xpp2 = factory2.newPullParser();
+
+                                        xpp2.setInput( new StringReader( response ) );
+                                        int eventType2 = xpp2.getEventType();
+                                        while (eventType2 != XmlPullParser.END_DOCUMENT) {
+                                            if (eventType2 == XmlPullParser.START_TAG) {
+                                                if (xpp2.getName().compareTo("url") == 0) {
+                                                    eventType2 = xpp2.next();
+                                                    if(eventType2 == XmlPullParser.TEXT ) {
+                                                        mappedProfile.put(xpp.getText(), xpp2.getText());
+                                                    }
+                                                    break;
+                                                }
+                                            }
+                                            eventType2 = xpp2.next();
+                                        }
+                                    } catch (NoSuchAlgorithmException | KeyManagementException | HttpsConnection.HttpsConnectionException e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                                account.setAvatar(mappedProfile.get(xpp.getText()));
+                            }
+                        }
+                    } else if( xpp.getName().compareTo("pubDate") == 0 ){
+                        eventType = xpp.next();
+                        if(eventType == XmlPullParser.TEXT && status != null) {
+                            if( xpp.getText() != null ) {
+                                try {
+                                    DateFormat formatter = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz");
+                                    Date date = formatter.parse(xpp.getText());
+                                    status.setCreated_at(date);
+                                } catch (ParseException e) {
+                                    status.setCreated_at(new Date());
+                                }
+                            }
+                        }
+                    }else if( xpp.getName().compareTo("description") == 0 ){
+                        eventType = xpp.next();
+                        if(eventType == XmlPullParser.TEXT && status != null) {
+                            if( xpp.getText() != null ) {
+                                String description = xpp.getText();
+                                Pattern imgPattern = Pattern.compile("<img [^>]*src=\"([^\"]+)\"[^>]*>");
+                                Matcher matcher = imgPattern.matcher(description);
+                                List<String> imgs = new ArrayList<>();
+                                int i = 1;
+                                ArrayList<Attachment> attachments = new ArrayList<>();
+                                while (matcher.find()) {
+                                    description = description.replaceAll(Pattern.quote(matcher.group()), "");
+                                    imgs.add("[media_" + i + "]|" + matcher.group(1));
+                                    Attachment attachment = new Attachment();
+                                    attachment.setType("image");
+                                    attachment.setDescription("");
+                                    attachment.setUrl(matcher.group(1));
+                                    attachment.setPreview_url(matcher.group(1));
+                                    attachment.setId(matcher.group(1));
+                                    attachments.add(attachment);
+                                }
+                                status.setMedia_attachments(attachments);
+                                status.setContent(context, description);
+                            }
+                        }
+                    }else if( xpp.getName().compareTo("guid") == 0 ){
+                        eventType = xpp.next();
+                        if(eventType == XmlPullParser.TEXT && status != null) {
+                            if( xpp.getText() != null ) {
+                                status.setUri(xpp.getText());
+                                Pattern idPattern = Pattern.compile("([0-9])+");
+                                Matcher matcher = idPattern.matcher(xpp.getText());
+                                while (matcher.find()) {
+                                    status.setId(matcher.group(0));
+                                }
+                            }
+                        }
+                    }else if( xpp.getName().compareTo("link") == 0 ){
+                        eventType = xpp.next();
+                        if(eventType == XmlPullParser.TEXT && status != null) {
+                            if( xpp.getText() != null ) {
+                                status.setUrl(xpp.getText());
+                            }
+                        }
+                    }
+                } else if(eventType == XmlPullParser.END_TAG) {
+                    if( xpp.getName().compareTo("item") == 0 ){
+                        if (status != null) {
+                            status.setAccount(account);
+                            statuses.add(status);
+                        }
+                        account = null;
+                        status = null;
+                    }
+                }
+                eventType = xpp.next();
+            }
+        } catch (XmlPullParserException | IOException e) {
+            e.printStackTrace();
+        }
+        return statuses;
+    }
+
     /**
      * Parse json response for several notes (Misskey)
      *
@@ -842,7 +1017,7 @@ public class API {
 
             status.setAccount(parseMisskeyAccountResponse(context, instance, resobj.getJSONObject("user")));
 
-            status.setContent(resobj.get("text").toString());
+            status.setContent(context, resobj.get("text").toString());
             try {
                 status.setReplies_count(Integer.valueOf(resobj.get("repliesCount").toString()));
             } catch (Exception e) {
@@ -1194,9 +1369,21 @@ public class API {
             } else {
                 account.setCreated_at(new Date());
             }
-            account.setFollowers_count(Integer.valueOf(resobj.get("followers_count").toString()));
-            account.setFollowing_count(Integer.valueOf(resobj.get("following_count").toString()));
-            account.setStatuses_count(Integer.valueOf(resobj.get("statuses_count").toString()));
+            if( !resobj.isNull("followers_count")) {
+                account.setFollowers_count(Integer.valueOf(resobj.get("followers_count").toString()));
+            }else{
+                account.setFollowers_count(0);
+            }
+            if( !resobj.isNull("following_count")) {
+                account.setFollowing_count(Integer.valueOf(resobj.get("following_count").toString()));
+            }else{
+                account.setFollowing_count(0);
+            }
+            if( !resobj.isNull("statuses_count")) {
+                account.setStatuses_count(Integer.valueOf(resobj.get("statuses_count").toString()));
+            }else{
+                account.setStatuses_count(0);
+            }
             account.setNote(resobj.get("note").toString());
             try {
                 account.setBot(Boolean.parseBoolean(resobj.get("bot").toString()));
@@ -1283,13 +1470,47 @@ public class API {
                     e.printStackTrace();
                 }
             }
-        } catch (JSONException ignored) {
-        } catch (ParseException e) {
+        } catch (JSONException | ParseException e) {
             e.printStackTrace();
         }
         return account;
     }
 
+    private List<IdentityProof> parseIdentityProof(Context context, JSONArray jsonArray) {
+        List<IdentityProof> identityProofs = new ArrayList<>();
+        try {
+            int i = 0;
+            while (i < jsonArray.length()) {
+
+                JSONObject resobj = jsonArray.getJSONObject(i);
+                IdentityProof identityProof = parseIdentityProof(context, resobj);
+                i++;
+                if (identityProof != null) {
+                    identityProofs.add(identityProof);
+                }
+            }
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return identityProofs;
+    }
+
+    private IdentityProof parseIdentityProof(Context context, JSONObject jsonObject) {
+        IdentityProof identityProof = new IdentityProof();
+        try {
+            identityProof.setProfile_url(jsonObject.getString("profile_url"));
+            identityProof.setProof_url(jsonObject.getString("proof_url"));
+            identityProof.setProvider(jsonObject.getString("provider"));
+            identityProof.setProvider_username(jsonObject.getString("provider_username"));
+            identityProof.setUpdated_at(Helper.mstStringToDate(context, jsonObject.getString("updated_at")));
+
+        } catch (JSONException | ParseException e) {
+            e.printStackTrace();
+        }
+        return identityProof;
+    }
+
     /**
      * Parse json response an unique account
      *
@@ -1454,6 +1675,7 @@ public class API {
      */
     public static Notification parseNotificationResponse(Context context, JSONObject resobj) {
 
+
         Notification notification = new Notification();
         try {
             notification.setId(resobj.get("id").toString());
@@ -1820,11 +2042,7 @@ public class API {
                     apiResponse.setAccountAdmins(accountAdmins);
                     break;
             }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
+        } catch (IOException | NoSuchAlgorithmException | KeyManagementException e) {
             e.printStackTrace();
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
@@ -1837,6 +2055,12 @@ public class API {
 
         String response;
         InstanceNodeInfo instanceNodeInfo = new InstanceNodeInfo();
+        if( domain.startsWith("http://")){
+            domain = domain.replace("http://","");
+        }
+        if( domain.startsWith("https://")){
+            domain = domain.replace("https://","");
+        }
         try {
             response = new HttpsConnection(context, domain).get("https://" + domain + "/.well-known/nodeinfo", 30, null, null);
             JSONArray jsonArray = new JSONObject(response).getJSONArray("links");
@@ -1864,10 +2088,33 @@ public class API {
                     instanceNodeInfo.setOpenRegistrations(resobj.getBoolean("openRegistrations"));
                 }
             } catch (JSONException e) {
-                setDefaultError(e);
+
             }
         } catch (IOException | JSONException | NoSuchAlgorithmException | KeyManagementException e) {
             e.printStackTrace();
+            try {
+                response = new HttpsConnection(context, this.instance).get("https://" + domain + "/api/v1/instance", 30, null, null);
+                JSONObject jsonObject = new JSONObject(response);
+                instanceNodeInfo.setName("MASTODON");
+                instanceNodeInfo.setVersion(jsonObject.getString("version"));
+                instanceNodeInfo.setOpenRegistrations(true);
+            } catch (IOException e1) {
+                instanceNodeInfo.setConnectionError(true);
+                e1.printStackTrace();
+            } catch (NoSuchAlgorithmException | JSONException | KeyManagementException e1) {
+                e1.printStackTrace();
+            } catch (HttpsConnection.HttpsConnectionException e1) {
+                if (e1.getStatusCode() == 404) {
+                    instanceNodeInfo.setName("GNU");
+                    instanceNodeInfo.setVersion("unknown");
+                    instanceNodeInfo.setOpenRegistrations(true);
+                    e1.printStackTrace();
+                } else {
+                    instanceNodeInfo.setName("MASTODON");
+                    instanceNodeInfo.setVersion("3.0");
+                    instanceNodeInfo.setOpenRegistrations(false);
+                }
+            }
         } catch (HttpsConnection.HttpsConnectionException e) {
             try {
                 response = new HttpsConnection(context, this.instance).get("https://" + domain + "/api/v1/instance", 30, null, null);
@@ -1897,6 +2144,115 @@ public class API {
         return instanceNodeInfo;
     }
 
+
+
+
+    public InstanceNodeInfo instanceInfo(String domain) {
+
+        String response;
+        InstanceNodeInfo instanceNodeInfo = null;
+        try {
+            response = new HttpsConnection(context, domain).get("https://" + domain + "/.well-known/nodeinfo", 30, null, null);
+            JSONArray jsonArray = new JSONObject(response).getJSONArray("links");
+            ArrayList<NodeInfo> nodeInfos = new ArrayList<>();
+            try {
+                instanceNodeInfo = new InstanceNodeInfo();
+                int i = 0;
+                while (i < jsonArray.length()) {
+
+                    JSONObject resobj = jsonArray.getJSONObject(i);
+                    NodeInfo nodeInfo = new NodeInfo();
+                    nodeInfo.setHref(resobj.getString("href"));
+                    nodeInfo.setRel(resobj.getString("rel"));
+                    i++;
+                    nodeInfos.add(nodeInfo);
+                }
+                if (nodeInfos.size() > 0) {
+                    NodeInfo nodeInfo = nodeInfos.get(nodeInfos.size() - 1);
+                    response = new HttpsConnection(context, this.instance).get(nodeInfo.getHref(), 30, null, null);
+                    JSONObject resobj = new JSONObject(response);
+                    JSONObject jsonObject = resobj.getJSONObject("software");
+                    String name;
+                    name = jsonObject.getString("name").toUpperCase();
+                    instanceNodeInfo.setName(name);
+                    instanceNodeInfo.setVersion(jsonObject.getString("version"));
+                    instanceNodeInfo.setOpenRegistrations(resobj.getBoolean("openRegistrations"));
+                    if (name.trim().toUpperCase().compareTo("MASTODON") == 0 || name.trim().toUpperCase().compareTo("PLEROMA") == 0 || name.trim().toUpperCase().compareTo("PIXELFED") == 0){
+                        APIResponse apiResponse = getInstance(domain);
+                        Instance instanceNode = apiResponse.getInstance();
+                        instanceNodeInfo.setNodeDescription(instanceNode.getDescription());
+                        instanceNodeInfo.setNumberOfUsers(instanceNode.getUserCount());
+                        instanceNodeInfo.setNumberOfPosts(instanceNode.getStatusCount());
+                        instanceNodeInfo.setNumberOfInstance(instanceNode.getDomainCount());
+                        instanceNodeInfo.setStaffAccount(instanceNode.getContactAccount());
+                        instanceNodeInfo.setNodeName(instanceNode.getTitle());
+                        instanceNodeInfo.setThumbnail(instanceNode.getThumbnail());
+                        instanceNodeInfo.setVersion(instanceNode.getVersion());
+                    }
+                    if( resobj.has("metadata")){
+                        JSONObject metadata = resobj.getJSONObject("metadata");
+                        if( metadata.has("staffAccounts")){
+                            instanceNodeInfo.setStaffAccountStr(metadata.getString("staffAccounts"));
+                        }
+                        if( metadata.has("nodeName")){
+                            instanceNodeInfo.setNodeName(metadata.getString("nodeName"));
+                        }
+                    }
+                    if( resobj.has("usage")){
+                        JSONObject usage = resobj.getJSONObject("usage");
+                        if( usage.has("users") &&  usage.getJSONObject("users").has("total")){
+                            instanceNodeInfo.setNumberOfUsers(usage.getJSONObject("users").getInt("total"));
+                        }
+                        if( usage.has("localPosts") ){
+                            instanceNodeInfo.setNumberOfPosts(usage.getInt("localPosts"));
+                        }
+                    }
+                    if( instanceNodeInfo.getStaffAccountStr() != null && instanceNodeInfo.getStaffAccount() == null){
+                        APIResponse search = searchAccounts(instanceNodeInfo.getStaffAccountStr(), 1);
+                        if( search != null && search.getAccounts() != null && search.getAccounts().size() > 0 ){
+                            instanceNodeInfo.setStaffAccount(search.getAccounts().get(0));
+                        }
+                    }
+                }
+            } catch (JSONException e) {
+                setDefaultError(e);
+            }
+        } catch (IOException | JSONException | NoSuchAlgorithmException | KeyManagementException e) {
+            e.printStackTrace();
+        } catch (HttpsConnection.HttpsConnectionException e){
+            APIResponse apiResponse = getInstance(domain);
+            instanceNodeInfo = new InstanceNodeInfo();
+            instanceNodeInfo.setName("MASTODON");
+            Instance instanceNode = apiResponse.getInstance();
+            instanceNodeInfo.setNodeDescription(instanceNode.getDescription());
+            instanceNodeInfo.setNumberOfUsers(instanceNode.getUserCount());
+            instanceNodeInfo.setNumberOfPosts(instanceNode.getStatusCount());
+            instanceNodeInfo.setNumberOfInstance(instanceNode.getDomainCount());
+            instanceNodeInfo.setStaffAccount(instanceNode.getContactAccount());
+            instanceNodeInfo.setNodeName(instanceNode.getTitle());
+            instanceNodeInfo.setThumbnail(instanceNode.getThumbnail());
+            instanceNodeInfo.setVersion(instanceNode.getVersion());
+        }
+        return instanceNodeInfo;
+    }
+
+    /***
+     * Get info on the current Instance *synchronously*
+     * @return APIResponse
+     */
+    public APIResponse getInstance(String instance) {
+        try {
+            String response = new HttpsConnection(context, this.instance).get("https://"+instance+"/api/v1/instance", 30, null, prefKeyOauthTokenT);
+            Instance instanceEntity = parseInstance(new JSONObject(response));
+            apiResponse.setInstance(instanceEntity);
+        } catch (HttpsConnection.HttpsConnectionException e) {
+            setError(e.getStatusCode(), e);
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
+            e.printStackTrace();
+        }
+        return apiResponse;
+    }
+
     /***
      * Get info on the current Instance *synchronously*
      * @return APIResponse
@@ -1908,13 +2264,7 @@ public class API {
             apiResponse.setInstance(instanceEntity);
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         return apiResponse;
@@ -1932,13 +2282,7 @@ public class API {
             apiResponse.setInstanceRegs(instanceRegs);
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         return apiResponse;
@@ -2786,15 +3130,13 @@ public class API {
             } else {
                 statuses = parseStatuses(context, new JSONArray(response));
             }
-        } catch (HttpsConnection.HttpsConnectionException e) {
+        } catch (UnknownHostException e){
+            if (since_id == null){
+                getHomeTimelineCache(max_id);
+            }
+        } catch(HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         if (apiResponse == null)
@@ -2803,6 +3145,33 @@ public class API {
         return apiResponse;
     }
 
+    /**
+     *Get identy proof for an account *synchronously*
+     *
+     * @param userId   user_id String
+     * @return APIResponse
+     */
+    public APIResponse getIdentityProof(String userId) {
+        List<IdentityProof> identityProofs = new ArrayList<>();
+        try {
+            HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
+            String response = httpsConnection.get(getAbsoluteUrl(String.format("/accounts/%s/identity_proofs", userId)), 10, null, prefKeyOauthTokenT);
+
+            identityProofs = parseIdentityProof(context, new JSONArray(response));
+        } catch (UnknownHostException e){
+        } catch(HttpsConnection.HttpsConnectionException e) {
+            setError(e.getStatusCode(), e);
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
+            e.printStackTrace();
+        }
+        if (apiResponse == null)
+            apiResponse = new APIResponse();
+        apiResponse.setIdentityProofs(identityProofs);
+        return apiResponse;
+    }
+
+
+
     /**
      * Retrieves public GNU timeline for the account *synchronously*
      *
@@ -2952,17 +3321,18 @@ public class API {
         try {
             HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
             String response = httpsConnection.get("https://" + instance + "/api/v1/videos", 10, params, null);
-            JSONArray jsonArray = new JSONObject(response).getJSONArray("data");
-            peertubes = parsePeertube(instance, jsonArray);
+            if( response == null) {
+                apiResponse.setPeertubes(peertubes);
+                return apiResponse;
+            }
+            JSONObject jsonObject = new JSONObject(response);
+            if( jsonObject.has("data")) {
+                JSONArray jsonArray = new JSONObject(response).getJSONArray("data");
+                peertubes = parsePeertube(instance, jsonArray);
+            }
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         apiResponse.setPeertubes(peertubes);
@@ -3094,8 +3464,51 @@ public class API {
         return apiResponse;
     }
 
+
     /**
-     * Retrieves Peertube videos from an instance *synchronously*
+     * Retrieves Nitter timeline from accounts *synchronously*
+     *
+     * @return APIResponse
+     */
+    public APIResponse getNitter(String instance, String max_id) {
+
+        final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        String nitterHost = sharedpreferences.getString(Helper.SET_NITTER_HOST, Helper.DEFAULT_NITTER_HOST).toLowerCase();
+        String[] usernames = instance.split(" ");
+        if( usernames.length == 0 ){
+            Error error = new Error();
+            error.setError(context.getString(R.string.toast_error));
+            error.setStatusCode(404);
+            apiResponse.setError(error);
+            return apiResponse;
+        }
+        StringBuilder urlparams = new StringBuilder();
+        for(String param: usernames){
+            urlparams.append(param.trim()).append(",");
+        }
+
+        String url = "https://" + nitterHost + "/" + urlparams + "/rss";
+        if( max_id != null ){
+            url += "?max_position=" + max_id;
+        }
+        try {
+            statuses = new ArrayList<>();
+            HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
+            String response = httpsConnection.get(url, 30, null, null);
+            apiResponse.setMax_id(httpsConnection.getMax_id());
+            statuses = parseNitter(response);
+
+        } catch (HttpsConnection.HttpsConnectionException e) {
+            setError(e.getStatusCode(), e);
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException e) {
+            e.printStackTrace();
+        }
+        apiResponse.setStatuses(statuses);
+        return apiResponse;
+    }
+
+    /**
+     * Retrieves Misskey timeline from an instance *synchronously*
      *
      * @return APIResponse
      */
@@ -3249,7 +3662,7 @@ public class API {
         apiResponse = new APIResponse();
         try {
             HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
-            String response = httpsConnection.get("https://framapiaf.org/api/v1/timelines/tag/fedilab", 10, params, prefKeyOauthTokenT);
+            String response = httpsConnection.get("https://toot.fedilab.app/api/v1/timelines/tag/fedilab", 10, params, prefKeyOauthTokenT);
             apiResponse.setSince_id(httpsConnection.getSince_id());
             apiResponse.setMax_id(httpsConnection.getMax_id());
             List<Status> tmp_status = parseStatuses(context, new JSONArray(response));
@@ -4062,11 +4475,8 @@ public class API {
                 }
             } catch (HttpsConnection.HttpsConnectionException e) {
                 setError(e.getStatusCode(), e);
-            } catch (NoSuchAlgorithmException e) {
                 e.printStackTrace();
-            } catch (IOException e) {
-                e.printStackTrace();
-            } catch (KeyManagementException e) {
+            } catch (NoSuchAlgorithmException | IOException | KeyManagementException e) {
                 e.printStackTrace();
             }
         } else {
@@ -4220,13 +4630,7 @@ public class API {
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
             e.printStackTrace();
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         return null;
@@ -4256,17 +4660,11 @@ public class API {
                 new TimelineCacheDAO(context, db).update(status.getId(), response, account.getId(), account.getInstance());
             }
             LocalBroadcastManager.getInstance(context).sendBroadcast(intentBC);
-            return parsePoll(context, new JSONObject(response));
+            return poll;
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
             e.printStackTrace();
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         return null;
@@ -4475,8 +4873,10 @@ public class API {
             }
 
 
-            if (!notif_follow)
+            if (!notif_follow) {
                 parameters.append("exclude_types[]=").append("follow").append("&");
+                parameters.append("exclude_types[]=").append("follow_request").append("&");
+            }
             if (!notif_add)
                 parameters.append("exclude_types[]=").append("favourite").append("&");
             if (!notif_share)
@@ -4491,6 +4891,7 @@ public class API {
             }
         } else if (type == DisplayNotificationsFragment.Type.MENTION) {
             parameters.append("exclude_types[]=").append("follow").append("&");
+            parameters.append("exclude_types[]=").append("follow_request").append("&");
             parameters.append("exclude_types[]=").append("favourite").append("&");
             parameters.append("exclude_types[]=").append("reblog").append("&");
             parameters.append("exclude_types[]=").append("poll").append("&");
@@ -4498,6 +4899,7 @@ public class API {
             params.put("exclude_types[]", parameters.toString());
         } else if (type == DisplayNotificationsFragment.Type.FAVORITE) {
             parameters.append("exclude_types[]=").append("follow").append("&");
+            parameters.append("exclude_types[]=").append("follow_request").append("&");
             parameters.append("exclude_types[]=").append("mention").append("&");
             parameters.append("exclude_types[]=").append("reblog").append("&");
             parameters.append("exclude_types[]=").append("poll").append("&");
@@ -4505,6 +4907,7 @@ public class API {
             params.put("exclude_types[]", parameters.toString());
         } else if (type == DisplayNotificationsFragment.Type.BOOST) {
             parameters.append("exclude_types[]=").append("follow").append("&");
+            parameters.append("exclude_types[]=").append("follow_request").append("&");
             parameters.append("exclude_types[]=").append("mention").append("&");
             parameters.append("exclude_types[]=").append("favourite").append("&");
             parameters.append("exclude_types[]=").append("poll").append("&");
@@ -4513,6 +4916,7 @@ public class API {
         } else if (type == DisplayNotificationsFragment.Type.POLL) {
             parameters.append("exclude_types[]=").append("reblog").append("&");
             parameters.append("exclude_types[]=").append("follow").append("&");
+            parameters.append("exclude_types[]=").append("follow_request").append("&");
             parameters.append("exclude_types[]=").append("mention").append("&");
             parameters.append("exclude_types[]=").append("favourite").append("&");
             parameters = new StringBuilder(parameters.substring(0, parameters.length() - 1).substring(16));
@@ -4605,13 +5009,31 @@ public class API {
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
             e.printStackTrace();
-        } catch (NoSuchAlgorithmException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
-        } catch (IOException e) {
+        }
+        return apiResponse;
+    }
+
+
+    /**
+     * Retrieves trends for Mastodon *synchronously*
+     *
+     * @return APIResponse
+     */
+    public APIResponse getTrends() {
+
+        List<Trends> trends;
+        apiResponse = new APIResponse();
+        try {
+            HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
+            String response = httpsConnection.get(getAbsoluteUrl("/trends"), 10, null, null);
+            trends = parseTrends(new JSONArray(response));
+            apiResponse.setTrends(trends);
+        } catch (HttpsConnection.HttpsConnectionException e) {
+            setError(e.getStatusCode(), e);
             e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         return apiResponse;
@@ -4736,28 +5158,20 @@ public class API {
         List<Emojis> emojis = new ArrayList<>();
         try {
             HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
-            String response = httpsConnection.get(getAbsoluteUrl("/custom_emojis"), 10, null, prefKeyOauthTokenT);
+            String response = httpsConnection.get(getAbsoluteUrl("/custom_emojis"), 30, null, prefKeyOauthTokenT);
             emojis = parseEmojis(new JSONArray(response));
-            apiResponse.setSince_id(httpsConnection.getSince_id());
-            apiResponse.setMax_id(httpsConnection.getMax_id());
 
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         //Add custom emoji for Pleroma
-        if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
+        /*if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
             APIResponse apiResponsePleroma = getCustomPleromaEmoji();
             if (apiResponsePleroma != null && apiResponsePleroma.getEmojis() != null && apiResponsePleroma.getEmojis().size() > 0)
                 emojis.addAll(apiResponsePleroma.getEmojis());
-        }
+        }*/
         apiResponse.setEmojis(emojis);
         return apiResponse;
     }
@@ -4786,7 +5200,7 @@ public class API {
      *
      * @return APIResponse
      */
-    public APIResponse getCustomPleromaEmoji() {
+    private APIResponse getCustomPleromaEmoji() {
         List<Emojis> emojis = new ArrayList<>();
         try {
             HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
@@ -4795,13 +5209,7 @@ public class API {
 
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         apiResponse.setEmojis(emojis);
@@ -4818,16 +5226,14 @@ public class API {
         List<Filters> filters = null;
         try {
             String response = new HttpsConnection(context, this.instance).get(getAbsoluteUrl("/filters"), 10, null, prefKeyOauthTokenT);
+            if (response == null) {
+                apiResponse.setFilters(new ArrayList<>());
+                return apiResponse;
+            }
             filters = parseFilters(new JSONArray(response));
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         apiResponse.setFilters(filters);
@@ -4850,13 +5256,7 @@ public class API {
             filters.add(filter);
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         apiResponse.setFilters(filters);
@@ -5366,6 +5766,7 @@ public class API {
         try {
             results.setAccounts(parseAccountResponse(resobj.getJSONArray("accounts")));
             results.setStatuses(parseStatuses(context, resobj.getJSONArray("statuses")));
+            results.setTrends(parseTrends(resobj.getJSONArray("hashtags")));
             results.setHashtags(parseTags(resobj.getJSONArray("hashtags")));
         } catch (JSONException e) {
             setDefaultError(e);
@@ -5461,6 +5862,63 @@ public class API {
         return peertubes;
     }
 
+
+    /**
+     * Parse json response for several trends
+     *
+     * @param jsonArray JSONArray
+     * @return List<Trends>
+     */
+    private List<Trends> parseTrends(JSONArray jsonArray) {
+
+        List<Trends> trends = new ArrayList<>();
+        try {
+            int i = 0;
+            while (i < jsonArray.length()) {
+
+                JSONObject resobj = jsonArray.getJSONObject(i);
+                Trends trend = parseTrends(resobj);
+                i++;
+                trends.add(trend);
+            }
+
+        } catch (JSONException e) {
+            setDefaultError(e);
+        }
+        return trends;
+    }
+
+    /**
+     * Parse json response for unique trend
+     *
+     * @param resobj JSONObject
+     * @return Trend
+     */
+    private Trends parseTrends(JSONObject resobj) {
+        Trends trend = new Trends();
+        try {
+           trend.setName(resobj.getString("name"));
+           trend.setUrl(resobj.getString("url"));
+           List<TrendsHistory> historyList = new ArrayList<>();
+           if( resobj.has("history")) {
+               JSONArray histories = resobj.getJSONArray("history");
+               for(int i = 0 ; i < histories.length() ; i++ ) {
+                   JSONObject hystory = histories.getJSONObject(i);
+                   TrendsHistory trendsHistory = new TrendsHistory();
+                   trendsHistory.setDays(hystory.getLong("day"));
+                   trendsHistory.setUses(hystory.getInt("uses"));
+                   trendsHistory.setAccounts(hystory.getInt("accounts"));
+                   historyList.add(trendsHistory);
+               }
+           }
+           trend.setTrendsHistory(historyList);
+        } catch (JSONException ignored) {
+        }
+        return trend;
+    }
+
+
+
     /**
      * Parse json response for several conversations
      *
@@ -5569,6 +6027,24 @@ public class API {
                 poll_limits.put("max_expiration", polllimits.getInt("max_expiration"));
                 instance.setPoll_limits(poll_limits);
             }
+            if( resobj.has("thumbnail")){
+                instance.setThumbnail(resobj.getString("thumbnail"));
+            }
+            if( resobj.has("stats")){
+                JSONObject stats = resobj.getJSONObject("stats");
+                if( stats.has("user_count")) {
+                    instance.setUserCount(stats.getInt("user_count"));
+                }
+                if( stats.has("status_count")) {
+                    instance.setStatusCount(stats.getInt("status_count"));
+                }
+                if( stats.has("domain_count")) {
+                    instance.setDomainCount(stats.getInt("domain_count"));
+                }
+            }
+            if( resobj.has("contact_account")){
+                instance.setContactAccount(parseAccountResponse(context, resobj.getJSONObject("contact_account")));
+            }
         } catch (JSONException e) {
             e.printStackTrace();
         }
diff --git a/app/src/main/java/app/fedilab/android/client/APIResponse.java b/app/src/main/java/app/fedilab/android/client/APIResponse.java
index b505d2b0d..a4cf48042 100644
--- a/app/src/main/java/app/fedilab/android/client/APIResponse.java
+++ b/app/src/main/java/app/fedilab/android/client/APIResponse.java
@@ -25,6 +25,7 @@ import app.fedilab.android.client.Entities.Emojis;
 import app.fedilab.android.client.Entities.Error;
 import app.fedilab.android.client.Entities.Filters;
 import app.fedilab.android.client.Entities.HowToVideo;
+import app.fedilab.android.client.Entities.IdentityProof;
 import app.fedilab.android.client.Entities.Instance;
 import app.fedilab.android.client.Entities.InstanceReg;
 import app.fedilab.android.client.Entities.Notification;
@@ -38,6 +39,7 @@ import app.fedilab.android.client.Entities.Report;
 import app.fedilab.android.client.Entities.Results;
 import app.fedilab.android.client.Entities.Status;
 import app.fedilab.android.client.Entities.StoredStatus;
+import app.fedilab.android.client.Entities.Trends;
 
 /**
  * Created by Thomas on 03/06/2017.
@@ -73,6 +75,9 @@ public class APIResponse {
     private Context context = null;
     private List<PixelFedStory> pixelFedStories = null;
     private List<PixelFedStoryItem> pixelFedStoryItems = null;
+    private PixelFedStory pixelFedStory = null;
+    private List<Trends> trends = null;
+    private List<IdentityProof> identityProofs = null;
 
     public List<Account> getAccounts() {
         return accounts;
@@ -298,4 +303,20 @@ public class APIResponse {
     public void setPixelFedStoryItems(List<PixelFedStoryItem> pixelFedStoryItems) {
         this.pixelFedStoryItems = pixelFedStoryItems;
     }
+
+    public List<Trends> getTrends() {
+        return trends;
+    }
+
+    public void setTrends(List<Trends> trends) {
+        this.trends = trends;
+    }
+
+    public List<IdentityProof> getIdentityProofs() {
+        return identityProofs;
+    }
+
+    public void setIdentityProofs(List<IdentityProof> identityProofs) {
+        this.identityProofs = identityProofs;
+    }
 }
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/IdentityProof.java b/app/src/main/java/app/fedilab/android/client/Entities/IdentityProof.java
new file mode 100644
index 000000000..b46219291
--- /dev/null
+++ b/app/src/main/java/app/fedilab/android/client/Entities/IdentityProof.java
@@ -0,0 +1,74 @@
+/* Copyright 2019 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+package app.fedilab.android.client.Entities;
+
+
+import java.util.Date;
+
+/**
+ * Created by Thomas on 17/12/2019.
+ * Manage identity proof
+ */
+
+public class IdentityProof {
+
+
+    private String provider;
+    private String provider_username;
+    private Date updated_at;
+    private String proof_url;
+    private String profile_url;
+
+
+    public String getProvider() {
+        return provider;
+    }
+
+    public void setProvider(String provider) {
+        this.provider = provider;
+    }
+
+    public String getProvider_username() {
+        return provider_username;
+    }
+
+    public void setProvider_username(String provider_username) {
+        this.provider_username = provider_username;
+    }
+
+    public Date getUpdated_at() {
+        return updated_at;
+    }
+
+    public void setUpdated_at(Date updated_at) {
+        this.updated_at = updated_at;
+    }
+
+    public String getProof_url() {
+        return proof_url;
+    }
+
+    public void setProof_url(String proof_url) {
+        this.proof_url = proof_url;
+    }
+
+    public String getProfile_url() {
+        return profile_url;
+    }
+
+    public void setProfile_url(String profile_url) {
+        this.profile_url = profile_url;
+    }
+}
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Instance.java b/app/src/main/java/app/fedilab/android/client/Entities/Instance.java
index f4b4f4cd7..9914aa863 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Instance.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Instance.java
@@ -30,6 +30,11 @@ public class Instance {
     private String version;
     private boolean registration;
     private boolean approval_required;
+    private Account contactAccount;
+    private int userCount;
+    private int statusCount;
+    private int domainCount;
+    private String thumbnail;
 
     private HashMap<String, Integer> poll_limits;
 
@@ -96,4 +101,44 @@ public class Instance {
     public void setApproval_required(boolean approval_required) {
         this.approval_required = approval_required;
     }
+
+    public Account getContactAccount() {
+        return contactAccount;
+    }
+
+    public void setContactAccount(Account contactAccount) {
+        this.contactAccount = contactAccount;
+    }
+
+    public int getUserCount() {
+        return userCount;
+    }
+
+    public void setUserCount(int userCount) {
+        this.userCount = userCount;
+    }
+
+    public int getStatusCount() {
+        return statusCount;
+    }
+
+    public void setStatusCount(int statusCount) {
+        this.statusCount = statusCount;
+    }
+
+    public int getDomainCount() {
+        return domainCount;
+    }
+
+    public void setDomainCount(int domainCount) {
+        this.domainCount = domainCount;
+    }
+
+    public String getThumbnail() {
+        return thumbnail;
+    }
+
+    public void setThumbnail(String thumbnail) {
+        this.thumbnail = thumbnail;
+    }
 }
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/InstanceNodeInfo.java b/app/src/main/java/app/fedilab/android/client/Entities/InstanceNodeInfo.java
index a04928286..2c963f18c 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/InstanceNodeInfo.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/InstanceNodeInfo.java
@@ -17,9 +17,18 @@ package app.fedilab.android.client.Entities;
 public class InstanceNodeInfo {
 
     private String name;
+    private String title;
     private String version;
     private boolean openRegistrations;
     private boolean connectionError;
+    private int numberOfUsers = 0;
+    private int numberOfPosts = 0;
+    private int numberOfInstance = 0;
+    private String staffAccountStr;
+    private Account staffAccount;
+    private String nodeName;
+    private String nodeDescription;
+    private String thumbnail;
 
     public String getName() {
         return name;
@@ -52,4 +61,76 @@ public class InstanceNodeInfo {
     public void setConnectionError(boolean connectionError) {
         this.connectionError = connectionError;
     }
+
+    public int getNumberOfUsers() {
+        return numberOfUsers;
+    }
+
+    public void setNumberOfUsers(int numberOfUsers) {
+        this.numberOfUsers = numberOfUsers;
+    }
+
+    public int getNumberOfPosts() {
+        return numberOfPosts;
+    }
+
+    public void setNumberOfPosts(int numberOfPosts) {
+        this.numberOfPosts = numberOfPosts;
+    }
+
+    public String getStaffAccountStr() {
+        return staffAccountStr;
+    }
+
+    public void setStaffAccountStr(String staffAccountStr) {
+        this.staffAccountStr = staffAccountStr;
+    }
+
+    public Account getStaffAccount() {
+        return staffAccount;
+    }
+
+    public void setStaffAccount(Account staffAccount) {
+        this.staffAccount = staffAccount;
+    }
+
+    public String getNodeName() {
+        return nodeName;
+    }
+
+    public void setNodeName(String nodeName) {
+        this.nodeName = nodeName;
+    }
+
+    public String getNodeDescription() {
+        return nodeDescription;
+    }
+
+    public void setNodeDescription(String nodeDescription) {
+        this.nodeDescription = nodeDescription;
+    }
+
+    public String getThumbnail() {
+        return thumbnail;
+    }
+
+    public void setThumbnail(String thumbnail) {
+        this.thumbnail = thumbnail;
+    }
+
+    public int getNumberOfInstance() {
+        return numberOfInstance;
+    }
+
+    public void setNumberOfInstance(int numberOfInstance) {
+        this.numberOfInstance = numberOfInstance;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
 }
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/MainMenuItem.java b/app/src/main/java/app/fedilab/android/client/Entities/MainMenuItem.java
index 6fcad20fc..65f8a292c 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/MainMenuItem.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/MainMenuItem.java
@@ -18,6 +18,7 @@ public class MainMenuItem {
 
     private boolean
             nav_news = true,
+            nav_trends = true,
             nav_list = true,
             nav_scheduled = true,
             nav_archive = true,
@@ -125,4 +126,12 @@ public class MainMenuItem {
     public void setNav_howto(boolean nav_howto) {
         this.nav_howto = nav_howto;
     }
+
+    public boolean isNav_trends() {
+        return nav_trends;
+    }
+
+    public void setNav_trends(boolean nav_trends) {
+        this.nav_trends = nav_trends;
+    }
 }
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java b/app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java
index 4ac13fdb7..2518d265b 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/ManageTimelines.java
@@ -270,7 +270,6 @@ public class ManageTimelines {
     public TabLayout createTabs(Context context, TabLayout tabLayout, java.util.List<ManageTimelines> manageTimelines) {
 
         SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-        int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
         tabLayout.removeAllTabs();
         int position = 0;
         for (ManageTimelines tl : manageTimelines) {
@@ -281,6 +280,14 @@ public class ManageTimelines {
                 if (tb.getCustomView() != null)
                     icon = tb.getCustomView().findViewById(R.id.tab_icon);
             }
+
+            Helper.changeDrawableColor(context,R.drawable.ic_home, R.attr.iconColorMenu);
+            Helper.changeDrawableColor(context,R.drawable.ic_notifications, R.attr.iconColorMenu);
+            Helper.changeDrawableColor(context,R.drawable.ic_direct_messages, R.attr.iconColorMenu);
+            Helper.changeDrawableColor(context,R.drawable.ic_people, R.attr.iconColorMenu);
+            Helper.changeDrawableColor(context,R.drawable.ic_public, R.attr.iconColorMenu);
+            Helper.changeDrawableColor(context,R.drawable.ic_color_lens, R.attr.iconColorMenu);
+            Helper.changeDrawableColor(context,R.drawable.ic_video_peertube, R.attr.iconColorMenu);
             if (icon != null) {
                 switch (tl.getType()) {
                     case HOME:
@@ -427,8 +434,9 @@ public class ManageTimelines {
                             public void onDismiss(PopupMenu menu) {
                                 if (mPageReferenceMap != null) {
                                     TabLayoutNotificationsFragment tabLayoutNotificationsFragment = (TabLayoutNotificationsFragment) mPageReferenceMap.get(tl.getPosition());
-                                    assert tabLayoutNotificationsFragment != null;
-                                    tabLayoutNotificationsFragment.refreshAll();
+                                    if (tabLayoutNotificationsFragment != null) {
+                                        tabLayoutNotificationsFragment.refreshAll();
+                                    }
                                 }
                             }
                         });
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Notification.java b/app/src/main/java/app/fedilab/android/client/Entities/Notification.java
index 1461717d3..1dfb62ac0 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Notification.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Notification.java
@@ -127,6 +127,12 @@ public class Notification implements Parcelable {
                 else
                     typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_follow));
                 break;
+            case "follow_request":
+                if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0)
+                    typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name(), true), context.getString(R.string.notif_follow_request));
+                else
+                    typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_follow_request));
+                break;
         }
         SpannableString displayNameSpan = new SpannableString(typeString);
         SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Poll.java b/app/src/main/java/app/fedilab/android/client/Entities/Poll.java
index 52e9554f3..54969e893 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Poll.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Poll.java
@@ -40,6 +40,7 @@ public class Poll implements Parcelable {
     private boolean expired;
     private boolean multiple;
     private int votes_count;
+    private int voters_count;
     private boolean voted;
     private List<PollOptions> optionsList;
 
@@ -54,6 +55,7 @@ public class Poll implements Parcelable {
         this.expired = in.readByte() != 0;
         this.multiple = in.readByte() != 0;
         this.votes_count = in.readInt();
+        this.voters_count = in.readInt();
         this.voted = in.readByte() != 0;
         this.optionsList = in.createTypedArrayList(PollOptions.CREATOR);
     }
@@ -135,7 +137,16 @@ public class Poll implements Parcelable {
         dest.writeByte(this.expired ? (byte) 1 : (byte) 0);
         dest.writeByte(this.multiple ? (byte) 1 : (byte) 0);
         dest.writeInt(this.votes_count);
+        dest.writeInt(this.voters_count);
         dest.writeByte(this.voted ? (byte) 1 : (byte) 0);
         dest.writeTypedList(this.optionsList);
     }
+
+    public int getVoters_count() {
+        return voters_count;
+    }
+
+    public void setVoters_count(int voters_count) {
+        this.voters_count = voters_count;
+    }
 }
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Results.java b/app/src/main/java/app/fedilab/android/client/Entities/Results.java
index 90d219883..d6e06ed12 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Results.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Results.java
@@ -12,6 +12,7 @@ public class Results {
     private List<Account> accounts;
     private List<Status> statuses;
     private List<String> hashtags;
+    private List<Trends> trends;
 
     public List<Account> getAccounts() {
         return accounts;
@@ -36,4 +37,12 @@ public class Results {
     public void setHashtags(List<String> hashtags) {
         this.hashtags = hashtags;
     }
+
+    public List<Trends> getTrends() {
+        return trends;
+    }
+
+    public void setTrends(List<Trends> trends) {
+        this.trends = trends;
+    }
 }
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Status.java b/app/src/main/java/app/fedilab/android/client/Entities/Status.java
index 8ea2e7c81..350a48397 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Status.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Status.java
@@ -16,7 +16,10 @@ package app.fedilab.android.client.Entities;
 
 
 import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
@@ -24,6 +27,7 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.Html;
@@ -38,10 +42,14 @@ import android.text.style.ImageSpan;
 import android.text.style.QuoteSpan;
 import android.text.style.URLSpan;
 import android.util.Patterns;
+import android.view.MenuItem;
 import android.view.View;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.PopupMenu;
 import androidx.core.content.ContextCompat;
 import androidx.preference.PreferenceManager;
 
@@ -57,6 +65,8 @@ import com.github.penfeizhou.animation.apng.decode.APNGParser;
 import com.github.penfeizhou.animation.gif.GifDrawable;
 import com.github.penfeizhou.animation.gif.decode.GifParser;
 
+import net.gotev.uploadservice.http.HttpConnection;
+
 import java.io.File;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -70,6 +80,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import app.fedilab.android.R;
+import app.fedilab.android.activities.BaseActivity;
+import app.fedilab.android.activities.BaseMainActivity;
 import app.fedilab.android.activities.GroupActivity;
 import app.fedilab.android.activities.HashTagActivity;
 import app.fedilab.android.activities.MainActivity;
@@ -77,14 +89,21 @@ import app.fedilab.android.activities.PeertubeActivity;
 import app.fedilab.android.activities.ShowAccountActivity;
 import app.fedilab.android.asynctasks.RetrieveFeedsAsyncTask;
 import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
+import app.fedilab.android.client.HttpsConnection;
+import app.fedilab.android.fragments.TabLayoutNotificationsFragment;
 import app.fedilab.android.helper.CrossActions;
 import app.fedilab.android.helper.CustomQuoteSpan;
 import app.fedilab.android.helper.Helper;
+import app.fedilab.android.helper.LongClickLinkMovementMethod;
+import app.fedilab.android.helper.LongClickableSpan;
 import app.fedilab.android.helper.ThemeHelper;
 import app.fedilab.android.interfaces.OnRetrieveEmojiInterface;
 import app.fedilab.android.interfaces.OnRetrieveImageInterface;
+import app.fedilab.android.sqlite.StatusStoredDAO;
+import es.dmoral.toasty.Toasty;
 
 import static android.content.Context.MODE_PRIVATE;
+import static app.fedilab.android.activities.BaseMainActivity.mPageReferenceMap;
 import static app.fedilab.android.drawers.StatusListAdapter.COMPACT_STATUS;
 import static app.fedilab.android.drawers.StatusListAdapter.CONSOLE_STATUS;
 import static app.fedilab.android.drawers.StatusListAdapter.DISPLAYED_STATUS;
@@ -455,18 +474,20 @@ public class Status implements Parcelable {
                 account.setInstance(instance);
                 account.setUrl(url);
                 String accountId = null;
-                for (Mention mention : mentions) {
-                    String[] accountMentionAcct = mention.getAcct().split("@");
-                    //Different isntance
-                    if (accountMentionAcct.length > 1) {
-                        if (mention.getAcct().equals(account.getAcct() + "@" + account.getInstance())) {
-                            accountId = mention.getId();
-                            break;
-                        }
-                    } else {
-                        if (mention.getAcct().equals(account.getAcct())) {
-                            accountId = mention.getId();
-                            break;
+                if( mentions != null) {
+                    for (Mention mention : mentions) {
+                        String[] accountMentionAcct = mention.getAcct().split("@");
+                        //Different isntance
+                        if (accountMentionAcct.length > 1) {
+                            if (mention.getAcct().equals(account.getAcct() + "@" + account.getInstance())) {
+                                accountId = mention.getId();
+                                break;
+                            }
+                        } else {
+                            if (mention.getAcct().equals(account.getAcct())) {
+                                accountId = mention.getId();
+                                break;
+                            }
                         }
                     }
                 }
@@ -601,58 +622,191 @@ public class Status implements Parcelable {
                         endPosition = startPosition + key.length();
                     }
                     if (endPosition <= spannableStringT.toString().length() && endPosition >= startPosition) {
-                        spannableStringT.setSpan(new ClickableSpan() {
-                                                     @Override
-                                                     public void onClick(@NonNull View textView) {
-                                                         String finalUrl = url;
-                                                         Pattern link = Pattern.compile("https?:\\/\\/([\\da-z\\.-]+\\.[a-z\\.]{2,10})\\/(@[\\w._-]*[0-9]*)(\\/[0-9]{1,})?$");
-                                                         Matcher matcherLink = link.matcher(url);
-                                                         if (matcherLink.find() && !url.contains("medium.com")) {
-                                                             if (matcherLink.group(3) != null && matcherLink.group(3).length() > 0) { //It's a toot
-                                                                 CrossActions.doCrossConversation(context, finalUrl);
-                                                             } else {//It's an account
-                                                                 Account account = new Account();
-                                                                 String acct = matcherLink.group(2);
-                                                                 if (acct != null) {
-                                                                     if (acct.startsWith("@"))
-                                                                         acct = acct.substring(1);
-                                                                     account.setAcct(acct);
-                                                                     account.setInstance(matcherLink.group(1));
-                                                                     CrossActions.doCrossProfile(context, account);
-                                                                 }
 
-                                                             }
 
-                                                         } else {
-                                                             link = Pattern.compile("(https?:\\/\\/[\\da-z\\.-]+\\.[a-z\\.]{2,10})\\/videos\\/watch\\/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})$");
-                                                             matcherLink = link.matcher(url);
-                                                             if (matcherLink.find()) { //Peertubee video
-                                                                 Intent intent = new Intent(context, PeertubeActivity.class);
-                                                                 Bundle b = new Bundle();
-                                                                 String url = matcherLink.group(1) + "/videos/watch/" + matcherLink.group(2);
-                                                                 b.putString("peertubeLinkToFetch", url);
-                                                                 b.putString("peertube_instance", matcherLink.group(1).replace("https://", "").replace("http://", ""));
-                                                                 b.putString("video_id", matcherLink.group(2));
-                                                                 intent.putExtras(b);
-                                                                 context.startActivity(intent);
-                                                             } else {
-                                                                 if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://"))
-                                                                     finalUrl = "http://" + url;
-                                                                 Helper.openBrowser(context, finalUrl);
-                                                             }
 
+                        spannableStringT.setSpan(new LongClickableSpan() {
+                                             @Override
+                                             public void onClick(@NonNull View textView) {
+                                                 String finalUrl = url;
+                                                 Pattern link = Pattern.compile("https?:\\/\\/([\\da-z\\.-]+\\.[a-z\\.]{2,10})\\/(@[\\w._-]*[0-9]*)(\\/[0-9]{1,})?$");
+                                                 Matcher matcherLink = link.matcher(url);
+                                                 if (matcherLink.find() && !url.contains("medium.com")) {
+                                                     if (matcherLink.group(3) != null && matcherLink.group(3).length() > 0) { //It's a toot
+                                                         CrossActions.doCrossConversation(context, finalUrl);
+                                                     } else {//It's an account
+                                                         Account account = new Account();
+                                                         String acct = matcherLink.group(2);
+                                                         if (acct != null) {
+                                                             if (acct.startsWith("@"))
+                                                                 acct = acct.substring(1);
+                                                             account.setAcct(acct);
+                                                             account.setInstance(matcherLink.group(1));
+                                                             CrossActions.doCrossProfile(context, account);
                                                          }
+
                                                      }
 
-                                                     @Override
-                                                     public void updateDrawState(@NonNull TextPaint ds) {
-                                                         super.updateDrawState(ds);
-                                                         ds.setUnderlineText(false);
-                                                         ds.setColor(link_color);
+                                                 } else {
+                                                     link = Pattern.compile("(https?:\\/\\/[\\da-z\\.-]+\\.[a-z\\.]{2,10})\\/videos\\/watch\\/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})$");
+                                                     matcherLink = link.matcher(url);
+                                                     if (matcherLink.find()) { //Peertubee video
+                                                         Intent intent = new Intent(context, PeertubeActivity.class);
+                                                         Bundle b = new Bundle();
+                                                         String url = matcherLink.group(1) + "/videos/watch/" + matcherLink.group(2);
+                                                         b.putString("peertubeLinkToFetch", url);
+                                                         b.putString("peertube_instance", matcherLink.group(1).replace("https://", "").replace("http://", ""));
+                                                         b.putString("video_id", matcherLink.group(2));
+                                                         intent.putExtras(b);
+                                                         context.startActivity(intent);
+                                                     } else {
+                                                         if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://"))
+                                                             finalUrl = "http://" + url;
+                                                         Helper.openBrowser(context, finalUrl);
                                                      }
-                                                 },
-                                startPosition, endPosition,
-                                Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+
+                                                 }
+                                             }
+
+                                            @Override
+                                            public void onLongClick(@NonNull View textView) {
+                                                PopupMenu popup = new PopupMenu(context, textView);
+                                                popup.getMenuInflater()
+                                                        .inflate(R.menu.links_popup, popup.getMenu());
+                                                int style;
+                                                if (theme == Helper.THEME_DARK) {
+                                                    style = R.style.DialogDark;
+                                                } else if (theme == Helper.THEME_BLACK) {
+                                                    style = R.style.DialogBlack;
+                                                } else {
+                                                    style = R.style.Dialog;
+                                                }
+                                                popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                                                    public boolean onMenuItemClick(MenuItem item) {
+                                                        switch (item.getItemId()) {
+                                                            case R.id.action_show_link:
+                                                                int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
+
+                                                                AlertDialog.Builder builder = new AlertDialog.Builder(context, style);
+                                                                builder.setMessage(url);
+                                                                builder.setTitle(context.getString(R.string.display_full_link));
+                                                                builder.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() {
+                                                                            @Override
+                                                                            public void onClick(DialogInterface dialog, int which) {
+                                                                                dialog.dismiss();
+                                                                            }
+                                                                        })
+                                                                        .show();
+                                                                break;
+                                                            case R.id.action_share_link:
+                                                                Intent sendIntent = new Intent(Intent.ACTION_SEND);
+                                                                sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
+                                                                sendIntent.putExtra(Intent.EXTRA_TEXT, url);
+                                                                sendIntent.setType("text/plain");
+                                                                context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
+                                                                break;
+
+                                                            case R.id.action_open_other_app:
+                                                                Intent intent = new Intent(Intent.ACTION_VIEW);
+                                                                intent.setData(Uri.parse(url));
+                                                                try {
+                                                                    context.startActivity(intent);
+                                                                } catch (Exception e) {
+                                                                    Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
+                                                                }
+                                                                break;
+                                                            case R.id.action_copy_link:
+                                                                ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+                                                                ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, url);
+                                                                if (clipboard != null) {
+                                                                    clipboard.setPrimaryClip(clip);
+                                                                    Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
+                                                                }
+                                                                break;
+                                                            case R.id.action_unshorten:
+                                                                Thread thread = new Thread() {
+                                                                    @Override
+                                                                    public void run() {
+                                                                        String response = new HttpsConnection(context, null).checkUrl(url);
+
+                                                                        Handler mainHandler = new Handler(context.getMainLooper());
+
+                                                                        Runnable myRunnable = new Runnable() {
+                                                                            @Override
+                                                                            public void run() {
+                                                                                AlertDialog.Builder builder = new AlertDialog.Builder(context, style);
+                                                                                if( response != null ) {
+                                                                                    builder.setMessage(context.getString(R.string.redirect_detected,url,response));
+                                                                                    builder.setNegativeButton(R.string.copy_link, new DialogInterface.OnClickListener() {
+                                                                                        @Override
+                                                                                        public void onClick(DialogInterface dialog, int which) {
+                                                                                            ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+                                                                                            ClipData clip = ClipData.newPlainText(Helper.CLIP_BOARD, response);
+                                                                                            if (clipboard != null) {
+                                                                                                clipboard.setPrimaryClip(clip);
+                                                                                                Toasty.info(context, context.getString(R.string.clipboard_url), Toast.LENGTH_LONG).show();
+                                                                                            }
+                                                                                            dialog.dismiss();
+                                                                                        }
+                                                                                    });
+                                                                                    builder.setNeutralButton(R.string.share_link, new DialogInterface.OnClickListener() {
+                                                                                        @Override
+                                                                                        public void onClick(DialogInterface dialog, int which) {
+                                                                                            Intent sendIntent = new Intent(Intent.ACTION_SEND);
+                                                                                            sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
+                                                                                            sendIntent.putExtra(Intent.EXTRA_TEXT, url);
+                                                                                            sendIntent.setType("text/plain");
+                                                                                            context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
+                                                                                            dialog.dismiss();
+                                                                                        }
+                                                                                    });
+                                                                                }else{
+                                                                                    builder.setMessage(R.string.no_redirect);
+                                                                                }
+                                                                                builder.setTitle(context.getString(R.string.check_redirect));
+                                                                                builder.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() {
+                                                                                    @Override
+                                                                                    public void onClick(DialogInterface dialog, int which) {
+                                                                                        dialog.dismiss();
+                                                                                    }
+                                                                                })
+                                                                                .show();
+
+                                                                            }
+                                                                        };
+                                                                        mainHandler.post(myRunnable);
+
+                                                                    }
+                                                                };
+                                                                thread.start();
+                                                                break;
+                                                        }
+                                                        return true;
+                                                    }
+                                                });
+                                                popup.setOnDismissListener(new PopupMenu.OnDismissListener() {
+                                                    @Override
+                                                    public void onDismiss(PopupMenu menu) {
+                                                        BaseActivity.canShowActionMode = true;
+                                                    }
+                                                });
+                                                popup.show();
+                                                textView.clearFocus();
+                                                BaseActivity.canShowActionMode = false;
+                                            }
+
+
+                                             @Override
+                                             public void updateDrawState(@NonNull TextPaint ds) {
+                                                 super.updateDrawState(ds);
+                                                 ds.setUnderlineText(false);
+                                                 ds.setColor(link_color);
+                                             }
+                                         },
+                        startPosition, endPosition,
+                        Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+
+
                     }
                 }
                 it.remove();
@@ -903,9 +1057,16 @@ public class Status implements Parcelable {
                                         if (endPosition <= contentSpan.toString().length() && endPosition >= startPosition) {
                                             ImageSpan imageSpan;
                                             if (!disableAnimatedEmoji) {
-                                                resource.setBounds(0, 0, (int) Helper.convertDpToPixel(20, context), (int) Helper.convertDpToPixel(20, context));
-                                                resource.setVisible(true, true);
-                                                imageSpan = new ImageSpan(resource);
+                                                try {
+                                                    resource.setBounds(0, 0, (int) Helper.convertDpToPixel(20, context), (int) Helper.convertDpToPixel(20, context));
+                                                    resource.setVisible(true, true);
+                                                    imageSpan = new ImageSpan(resource);
+                                                }catch (Exception e) {
+                                                    Bitmap bitmap = drawableToBitmap(resource.getCurrent());
+                                                    imageSpan = new ImageSpan(context,
+                                                            Bitmap.createScaledBitmap(bitmap, (int) Helper.convertDpToPixel(20, context),
+                                                                    (int) Helper.convertDpToPixel(20, context), false));
+                                                }
 
                                             } else {
                                                 Bitmap bitmap = drawableToBitmap(resource.getCurrent());
@@ -972,7 +1133,7 @@ public class Status implements Parcelable {
         SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
         boolean disableAnimatedEmoji = sharedpreferences.getBoolean(Helper.SET_DISABLE_ANIMATED_EMOJI, false);
         Poll poll = status.getReblog() == null ? status.getPoll() : status.getReblog().getPoll();
-        if (poll == null) {
+        if (poll == null || poll.getOptionsList() == null) {
             status.setPollEmojiFound(true);
             return;
         }
@@ -1202,11 +1363,7 @@ public class Status implements Parcelable {
             spannable.removeSpan(quoteSpan);
             SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
             int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
-            int colord;
-            if (theme == THEME_BLACK)
-                colord = ContextCompat.getColor(context, R.color.dark_blockquote);
-            else
-                colord = ContextCompat.getColor(context, R.color.mastodonC4);
+            int colord = ContextCompat.getColor(context, R.color.cyanea_accent_reference);
             spannable.setSpan(new CustomQuoteSpan(
                             ContextCompat.getColor(context, R.color.transparent),
                             colord,
@@ -1342,9 +1499,9 @@ public class Status implements Parcelable {
         return content;
     }
 
-    public void setContent(String content) {
+    public void setContent(Context context, String content) {
         //Remove UTM by default
-        this.content = Helper.remove_tracking_param(content);
+        this.content = Helper.remove_tracking_param(context, content);
     }
 
     public boolean isShortReply() {
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Tag.java b/app/src/main/java/app/fedilab/android/client/Entities/Tag.java
index 03c5efe0d..69d34e4ff 100644
--- a/app/src/main/java/app/fedilab/android/client/Entities/Tag.java
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Tag.java
@@ -17,6 +17,9 @@ package app.fedilab.android.client.Entities;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Created by Thomas on 23/04/2017.
  * Manage Tags
@@ -24,26 +27,18 @@ import android.os.Parcelable;
 
 public class Tag implements Parcelable {
 
-    public static final Creator<Tag> CREATOR = new Creator<Tag>() {
-        @Override
-        public Tag createFromParcel(Parcel in) {
-            return new Tag(in);
-        }
-
-        @Override
-        public Tag[] newArray(int size) {
-            return new Tag[size];
-        }
-    };
     private String name;
     private String url;
-
+    private List<TrendsHistory> trendsHistory;
     public Tag() {
     }
 
-    protected Tag(Parcel in) {
-        name = in.readString();
-        url = in.readString();
+    public List<TrendsHistory> getTrendsHistory() {
+        return trendsHistory;
+    }
+
+    public void setTrendsHistory(List<TrendsHistory> trendsHistory) {
+        this.trendsHistory = trendsHistory;
     }
 
     public String getName() {
@@ -69,7 +64,27 @@ public class Tag implements Parcelable {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-        dest.writeString(name);
-        dest.writeString(url);
+        dest.writeString(this.name);
+        dest.writeString(this.url);
+        dest.writeList(this.trendsHistory);
     }
+
+    protected Tag(Parcel in) {
+        this.name = in.readString();
+        this.url = in.readString();
+        this.trendsHistory = new ArrayList<TrendsHistory>();
+        in.readList(this.trendsHistory, TrendsHistory.class.getClassLoader());
+    }
+
+    public static final Creator<Tag> CREATOR = new Creator<Tag>() {
+        @Override
+        public Tag createFromParcel(Parcel source) {
+            return new Tag(source);
+        }
+
+        @Override
+        public Tag[] newArray(int size) {
+            return new Tag[size];
+        }
+    };
 }
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/Trends.java b/app/src/main/java/app/fedilab/android/client/Entities/Trends.java
new file mode 100644
index 000000000..2ec9baec0
--- /dev/null
+++ b/app/src/main/java/app/fedilab/android/client/Entities/Trends.java
@@ -0,0 +1,55 @@
+package app.fedilab.android.client.Entities;
+/* Copyright 2019 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+import java.util.List;
+
+/**
+ * Created by Thomas on 30/11/2019.
+ * Manage Tag trends
+ */
+
+public class Trends {
+
+    private String name;
+    private String url;
+    private List<TrendsHistory> trendsHistory;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+
+    public List<TrendsHistory> getTrendsHistory() {
+        return trendsHistory;
+    }
+
+    public void setTrendsHistory(List<TrendsHistory> trendsHistory) {
+        this.trendsHistory = trendsHistory;
+    }
+}
diff --git a/app/src/main/java/app/fedilab/android/client/Entities/TrendsHistory.java b/app/src/main/java/app/fedilab/android/client/Entities/TrendsHistory.java
new file mode 100644
index 000000000..f6d63131e
--- /dev/null
+++ b/app/src/main/java/app/fedilab/android/client/Entities/TrendsHistory.java
@@ -0,0 +1,88 @@
+package app.fedilab.android.client.Entities;
+/* Copyright 2019 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Created by Thomas on 30/11/2019.
+ * Manage Tag trends history
+ */
+
+public class TrendsHistory implements Parcelable {
+
+    private long days;
+    private int uses;
+    private int accounts;
+
+    public long getDays() {
+        return days;
+    }
+
+    public void setDays(long days) {
+        this.days = days;
+    }
+
+    public int getUses() {
+        return uses;
+    }
+
+    public void setUses(int uses) {
+        this.uses = uses;
+    }
+
+    public int getAccounts() {
+        return accounts;
+    }
+
+    public void setAccounts(int accounts) {
+        this.accounts = accounts;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeLong(this.days);
+        dest.writeInt(this.uses);
+        dest.writeInt(this.accounts);
+    }
+
+    public TrendsHistory() {
+    }
+
+    protected TrendsHistory(Parcel in) {
+        this.days = in.readLong();
+        this.uses = in.readInt();
+        this.accounts = in.readInt();
+    }
+
+    public static final Parcelable.Creator<TrendsHistory> CREATOR = new Parcelable.Creator<TrendsHistory>() {
+        @Override
+        public TrendsHistory createFromParcel(Parcel source) {
+            return new TrendsHistory(source);
+        }
+
+        @Override
+        public TrendsHistory[] newArray(int size) {
+            return new TrendsHistory[size];
+        }
+    };
+}
diff --git a/app/src/main/java/app/fedilab/android/client/GNUAPI.java b/app/src/main/java/app/fedilab/android/client/GNUAPI.java
index eb3388059..a7847d636 100644
--- a/app/src/main/java/app/fedilab/android/client/GNUAPI.java
+++ b/app/src/main/java/app/fedilab/android/client/GNUAPI.java
@@ -268,6 +268,7 @@ public class GNUAPI {
             }
             //Retrieves mentions
             List<Mention> mentions = new ArrayList<>();
+            Helper.largeLog( resobj.toString());
             if (resobj.has("attentions")) {
                 JSONArray arrayMention = resobj.getJSONArray("attentions");
                 if (arrayMention != null) {
@@ -306,9 +307,9 @@ public class GNUAPI {
             else if (resobj.has("sender"))
                 status.setAccount(parseAccountResponse(context, resobj.getJSONObject("sender")));
             if (resobj.has("statusnet_html"))
-                status.setContent(resobj.get("statusnet_html").toString());
+                status.setContent(context, resobj.get("statusnet_html").toString());
             else if (resobj.has("text"))
-                status.setContent(resobj.get("text").toString());
+                status.setContent(context, resobj.get("text").toString());
             if (resobj.has("fave_num"))
                 status.setFavourites_count(Integer.valueOf(resobj.get("fave_num").toString()));
             else
@@ -379,7 +380,7 @@ public class GNUAPI {
             } catch (Exception e) {
                 status.setVisibility("public");
             }
-            status.setContent(resobj.get("text").toString());
+            status.setContent(context, resobj.get("text").toString());
         } catch (JSONException ignored) {
         }
         return status;
@@ -396,16 +397,24 @@ public class GNUAPI {
 
         Account account = new Account();
         try {
-            account.setId(resobj.get("id").toString());
-            if (resobj.has("ostatus_uri"))
+            if( resobj.has("id_str")){
+                account.setId(resobj.getString("id_str"));
+            }else{
+                account.setId(resobj.get("id").toString());
+            }
+            if (resobj.has("ostatus_uri")) {
                 account.setUuid(resobj.get("ostatus_uri").toString());
-            else
-                account.setUuid(resobj.get("id").toString());
-            account.setUsername(resobj.get("screen_name").toString());
-            account.setAcct(resobj.get("screen_name").toString());
-            account.setDisplay_name(resobj.get("name").toString());
+            }else {
+                if( resobj.has("id_str")){
+                    account.setUuid(resobj.getString("id_str"));
+                }else{
+                    account.setUuid(resobj.get("id").toString());
+                }
+            }
+            account.setUsername(resobj.getString("screen_name"));
+            account.setAcct(resobj.getString("screen_name"));
+            account.setDisplay_name(resobj.getString("name"));
             account.setLocked(Boolean.parseBoolean(resobj.get("protected").toString()));
-            account.setCreated_at(Helper.mstStringToDate(context, resobj.get("created_at").toString()));
             account.setFollowers_count(Integer.valueOf(resobj.get("followers_count").toString()));
             account.setFollowing_count(Integer.valueOf(resobj.get("friends_count").toString()));
             account.setStatuses_count(Integer.valueOf(resobj.get("statuses_count").toString()));
@@ -428,8 +437,8 @@ public class GNUAPI {
             else
                 account.setSocial("GNU");
             account.setEmojis(new ArrayList<>());
-        } catch (JSONException ignored) {
-        } catch (ParseException e) {
+            account.setCreated_at(Helper.mstStringToDate(context, resobj.get("created_at").toString()));
+        } catch (JSONException | ParseException e) {
             e.printStackTrace();
         }
         return account;
@@ -1386,13 +1395,7 @@ public class GNUAPI {
             }
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         apiResponse.setStatuses(statuses);
@@ -1632,64 +1635,7 @@ public class GNUAPI {
             }
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        apiResponse.setAccounts(accounts);
-        return apiResponse;
-    }
-
-    /**
-     * Retrieves follow requests for the authenticated account *synchronously*
-     *
-     * @param max_id String id max
-     * @return APIResponse
-     */
-    public APIResponse getFollowRequest(String max_id) {
-        return getFollowRequest(max_id, null, accountPerPage);
-    }
-
-    /**
-     * Retrieves follow requests for the authenticated account *synchronously*
-     *
-     * @param max_id   String id max
-     * @param since_id String since the id
-     * @param limit    int limit  - max value 40
-     * @return APIResponse
-     */
-    @SuppressWarnings("SameParameterValue")
-    private APIResponse getFollowRequest(String max_id, String since_id, int limit) {
-
-        HashMap<String, String> params = new HashMap<>();
-        if (max_id != null)
-            params.put("max_id", max_id);
-        if (since_id != null)
-            params.put("since_id", since_id);
-        if (0 > limit || limit > 40)
-            limit = 40;
-        params.put("limit", String.valueOf(limit));
-        accounts = new ArrayList<>();
-        try {
-            HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
-            String response = httpsConnection.get(getAbsoluteUrl("/follow_requests"), 60, params, prefKeyOauthTokenT);
-            apiResponse.setSince_id(httpsConnection.getSince_id());
-            apiResponse.setMax_id(httpsConnection.getMax_id());
-            accounts = parseAccountResponse(new JSONArray(response));
-        } catch (HttpsConnection.HttpsConnectionException e) {
-            setError(e.getStatusCode(), e);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         apiResponse.setAccounts(accounts);
@@ -1954,11 +1900,7 @@ public class GNUAPI {
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
             e.printStackTrace();
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException e) {
             e.printStackTrace();
         }
         return actionCode;
@@ -2025,13 +1967,7 @@ public class GNUAPI {
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
             e.printStackTrace();
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         apiResponse.setStatuses(statuses);
@@ -2121,15 +2057,16 @@ public class GNUAPI {
             apiResponse.setMax_id(httpsConnection.getMax_id());
             if (type == DisplayNotificationsFragment.Type.FOLLOW) {
                 List<Account> accounts = parseAccountResponse(new JSONArray(response));
-                if (accounts != null)
+                if (accounts != null) {
                     for (Account st : accounts) {
                         Notification notification = new Notification();
                         notification.setType(stringType);
                         notification.setId(st.getId());
                         notification.setStatus(null);
-                        notification.setAccount(account);
+                        notification.setAccount(st);
                         notifications.add(notification);
                     }
+                }
             } else {
                 List<Status> statuses = parseStatuses(context, new JSONArray(response));
                 if (statuses != null)
@@ -2146,13 +2083,7 @@ public class GNUAPI {
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
             e.printStackTrace();
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         apiResponse.setNotifications(notifications);
@@ -2257,13 +2188,40 @@ public class GNUAPI {
         } catch (HttpsConnection.HttpsConnectionException e) {
             setError(e.getStatusCode(), e);
             e.printStackTrace();
-        } catch (NoSuchAlgorithmException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
-        } catch (IOException e) {
+        }
+        return apiResponse;
+    }
+
+    /**
+     * Retrieves Accounts and feeds when searching *synchronously*
+     *
+     * @param query String search
+     * @return Results
+     */
+    public APIResponse search2(String query) {
+        Results results = new Results();
+        HashMap<String, String> params = new HashMap<>();
+        apiResponse = new APIResponse();
+        if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE)
+            params.put("q", query);
+        else
+            try {
+                params.put("q", URLEncoder.encode(query, "UTF-8"));
+            } catch (UnsupportedEncodingException e) {
+                params.put("q", query);
+            }
+        try {
+            HttpsConnection httpsConnection = new HttpsConnection(context, this.instance);
+            String response = httpsConnection.get(getAbsoluteUrl("/search.json"), 60, params, prefKeyOauthTokenT);
+            List<Status> statuses = parseStatuses(context, new JSONArray(response));
+            results.setStatuses(statuses);
+            apiResponse.setResults(results);
+        } catch (HttpsConnection.HttpsConnectionException e) {
+            setError(e.getStatusCode(), e);
             e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         return apiResponse;
@@ -2598,6 +2556,11 @@ public class GNUAPI {
         return Helper.instanceWithProtocol(this.context, this.instance) + "/api" + action;
     }
 
+    private String getAbsoluteMastodonUrl(String action) {
+        return Helper.instanceWithProtocol(this.context, this.instance) + "/api/v1" + action;
+    }
+
+
     private String getAbsoluteRemoteUrl(String instance, String action) {
         return Helper.instanceWithProtocol(this.context, instance) + "/api" + action;
     }
diff --git a/app/src/main/java/app/fedilab/android/client/HttpsConnection.java b/app/src/main/java/app/fedilab/android/client/HttpsConnection.java
index 826b862d1..43a10aea3 100644
--- a/app/src/main/java/app/fedilab/android/client/HttpsConnection.java
+++ b/app/src/main/java/app/fedilab/android/client/HttpsConnection.java
@@ -53,7 +53,9 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Scanner;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -68,6 +70,13 @@ import app.fedilab.android.client.Entities.Error;
 import app.fedilab.android.helper.FileNameCleaner;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.interfaces.OnDownloadInterface;
+import okhttp3.Cache;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+import static app.fedilab.android.helper.Helper.urlPattern;
 
 
 /**
@@ -86,6 +95,8 @@ public class HttpsConnection {
     private SharedPreferences sharedpreferences;
     private Proxy proxy;
     private String instance;
+    private String USER_AGENT;
+    private int cacheSize = 30*1024*1024;
 
     public HttpsConnection(Context context, String instance) {
         this.instance = instance;
@@ -94,6 +105,8 @@ public class HttpsConnection {
         boolean proxyEnabled = sharedpreferences.getBoolean(Helper.SET_PROXY_ENABLED, false);
         int type = sharedpreferences.getInt(Helper.SET_PROXY_TYPE, 0);
         proxy = null;
+
+        USER_AGENT = sharedpreferences.getString(Helper.SET_CUSTOM_USER_AGENT, Helper.USER_AGENT);
         if (proxyEnabled) {
             try {
                 String host = sharedpreferences.getString(Helper.SET_PROXY_HOST, "127.0.0.1");
@@ -132,35 +145,102 @@ public class HttpsConnection {
     }
 
 
-    @SuppressWarnings("ConstantConditions")
+    /**
+     * Get calls
+     * @param urlConnection String url
+     * @param timeout int timeout
+     * @param paramaters HashMap<String, String> paramaters
+     * @param token String token
+     * @return String
+     * @throws IOException
+     * @throws NoSuchAlgorithmException
+     * @throws KeyManagementException
+     * @throws HttpsConnectionException
+     */
     public String get(String urlConnection, int timeout, HashMap<String, String> paramaters, String token) throws IOException, NoSuchAlgorithmException, KeyManagementException, HttpsConnectionException {
 
 
-        if (urlConnection.startsWith("https://")) {
-            Map<String, Object> params = new LinkedHashMap<>();
-            if (paramaters != null) {
-                Iterator it = paramaters.entrySet().iterator();
-                while (it.hasNext()) {
-                    Map.Entry pair = (Map.Entry) it.next();
-                    params.put(pair.getKey().toString(), pair.getValue());
-                    it.remove();
-                }
+        Map<String, Object> params = new LinkedHashMap<>();
+        if (paramaters != null) {
+            Iterator it = paramaters.entrySet().iterator();
+            while (it.hasNext()) {
+                Map.Entry pair = (Map.Entry) it.next();
+                params.put(pair.getKey().toString(), pair.getValue());
+                it.remove();
             }
-            StringBuilder postData = new StringBuilder();
+        }
+        StringBuilder postData = new StringBuilder();
+        URL url;
+        if( params.size() > 0 ) {
             for (Map.Entry<String, Object> param : params.entrySet()) {
                 if (postData.length() != 0) postData.append('&');
                 postData.append(param.getKey());
                 postData.append('=');
                 postData.append(param.getValue());
             }
-            URL url = new URL(urlConnection + "?" + postData);
+            url = new URL(urlConnection + "?" + postData);
+        }else{
+            url = new URL(urlConnection);
+        }
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            Cache cache = new Cache(context.getCacheDir(), cacheSize);
+            OkHttpClient.Builder builder = new OkHttpClient.Builder().connectTimeout(timeout, TimeUnit.SECONDS).cache(cache);
+            if (proxy != null) {
+                builder.proxy(proxy);
+            }
+            OkHttpClient client = builder.build();
+            Request.Builder requestBuilder = new Request.Builder()
+                    .url(urlConnection);
+            HttpUrl.Builder httpBuider = Objects.requireNonNull(HttpUrl.parse(url.toString())).newBuilder();
+            if (token != null && !token.startsWith("Basic ")) {
+                requestBuilder.addHeader("Authorization", "Bearer " + token);
+            } else if (token != null && token.startsWith("Basic ")) {
+                requestBuilder.addHeader("Authorization", token);
+            }
+            Request requesthttp = requestBuilder
+
+                    .url(httpBuider.build())
+                    .build();
+            try {
+                Response httpresponse = client.newCall(requesthttp).execute();
+                assert httpresponse.body() != null;
+                String response = httpresponse.body().string();
+                int code = httpresponse.code();
+                String error = httpresponse.message();
+                if (code >= 200 && code < 400) {
+                    if (!cache.isClosed()) {
+                        try {
+                            cache.close();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    getOKHttpHeader(httpresponse.headers().toMultimap());
+                    return response;
+                } else {
+                    throw new HttpsConnectionException(code, error);
+                }
+            } catch (Exception ignored){}
+            finally {
+                if (!cache.isClosed()) {
+                    try {
+                        cache.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            throw new HttpsConnectionException(500, context.getString(R.string.toast_error));
+        }else{
+
             if (proxy != null)
                 httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
             else
                 httpsURLConnection = (HttpsURLConnection) url.openConnection();
             httpsURLConnection.setConnectTimeout(timeout * 1000);
             httpsURLConnection.setRequestProperty("http.keepAlive", "false");
-            httpsURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+            httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT);
             httpsURLConnection.setRequestProperty("Content-Type", "application/json");
             httpsURLConnection.setRequestProperty("Accept", "application/json");
             httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory(this.instance));
@@ -198,71 +278,97 @@ public class HttpsConnection {
             getSinceMaxId();
             httpsURLConnection.getInputStream().close();
             return response;
-        } else {
-            Map<String, Object> params = new LinkedHashMap<>();
-            if (paramaters != null) {
-                Iterator it = paramaters.entrySet().iterator();
-                while (it.hasNext()) {
-                    Map.Entry pair = (Map.Entry) it.next();
-                    params.put(pair.getKey().toString(), pair.getValue());
-                    it.remove();
-                }
-            }
-            StringBuilder postData = new StringBuilder();
-            for (Map.Entry<String, Object> param : params.entrySet()) {
-                if (postData.length() != 0) postData.append('&');
-                postData.append(param.getKey());
-                postData.append('=');
-                postData.append(param.getValue());
-            }
-            URL url = new URL(urlConnection + "?" + postData);
-            if (proxy != null)
-                httpURLConnection = (HttpURLConnection) url.openConnection(proxy);
-            else
-                httpURLConnection = (HttpURLConnection) url.openConnection();
-            httpURLConnection.setConnectTimeout(timeout * 1000);
-            httpURLConnection.setRequestProperty("http.keepAlive", "false");
-            httpURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
-            if (token != null && !token.startsWith("Basic "))
-                httpsURLConnection.setRequestProperty("Authorization", "Bearer " + token);
-            else if (token != null && token.startsWith("Basic "))
-                httpsURLConnection.setRequestProperty("Authorization", token);
-            httpURLConnection.setRequestMethod("GET");
-            String response;
-            if (httpURLConnection.getResponseCode() >= 200 && httpURLConnection.getResponseCode() < 400) {
-                response = converToString(httpURLConnection.getInputStream());
-            } else {
-                String error = null;
-                if (httpURLConnection.getErrorStream() != null) {
-                    InputStream stream = httpURLConnection.getErrorStream();
-                    if (stream == null) {
-                        stream = httpURLConnection.getInputStream();
-                    }
-                    try (Scanner scanner = new Scanner(stream)) {
-                        scanner.useDelimiter("\\Z");
-                        if (scanner.hasNext()) {
-                            error = scanner.next();
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-                int responseCode = httpURLConnection.getResponseCode();
-                try {
-                    httpURLConnection.getInputStream().close();
-                } catch (Exception ignored) {
-                }
-                throw new HttpsConnectionException(responseCode, error);
-            }
-            getSinceMaxId();
-            httpURLConnection.getInputStream().close();
-            return response;
         }
     }
 
 
+    /**
+     * Will check if the current url is redirecting
+     * @param urlConnection String the url to check
+     * @return String null|string url redirection
+     */
+    public String checkUrl(String urlConnection){
+        URL url;
+        String redirect = null;
+        try {
+            url = new URL(urlConnection);
+            if (proxy != null)
+                httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
+            else
+                httpsURLConnection = (HttpsURLConnection) url.openConnection();
+            httpsURLConnection.setRequestProperty("http.keepAlive", "false");
+            httpsURLConnection.setInstanceFollowRedirects(false);
+            httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory(this.instance));
+            httpsURLConnection.setRequestMethod("HEAD");
+            if( httpsURLConnection.getResponseCode() == 301) {
+                Map<String, List<String>> map = httpsURLConnection.getHeaderFields();
+                for (Map.Entry<String, List<String>> entry : map.entrySet()) {
+                    if (entry.toString().toLowerCase().startsWith("location")) {
+                        Matcher matcher = urlPattern.matcher(entry.toString());
+                        if (matcher.find()) {
+                            redirect = matcher.group(1);
+                        }
+                    }
+                }
+            }
+            httpsURLConnection.getInputStream().close();
+            if (redirect != null && redirect.compareTo(urlConnection)!=0){
+                URL redirectURL = new URL(redirect);
+                String host = redirectURL.getHost();
+                String protocol = redirectURL.getProtocol();
+                if( protocol == null || host == null){
+                    redirect = null;
+                }
+            }
+            return redirect;
+        } catch (IOException | NoSuchAlgorithmException | KeyManagementException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
     public String get(String urlConnection) throws IOException, NoSuchAlgorithmException, KeyManagementException, HttpsConnectionException {
-        if (urlConnection.startsWith("https://")) {
+
+        if (Build.VERSION.SDK_INT >= 21) {
+            Cache cache = new Cache(context.getCacheDir(), cacheSize);
+            OkHttpClient.Builder builder = new OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS).cache(cache);
+            if (proxy != null) {
+                builder.proxy(proxy);
+            }
+            if( !urlConnection.startsWith("http")){
+                urlConnection = "http://" + urlConnection;
+            }
+            OkHttpClient client = builder.build();
+            Request.Builder requestBuilder = new Request.Builder()
+                    .url(urlConnection);
+            HttpUrl.Builder httpBuider = Objects.requireNonNull(HttpUrl.parse(urlConnection)).newBuilder();
+            Request requesthttp = requestBuilder
+
+                    .url(httpBuider.build())
+                    .build();
+            try (Response httpresponse = client.newCall(requesthttp).execute()) {
+                assert httpresponse.body() != null;
+                String response = httpresponse.body().string();
+                int code = httpresponse.code();
+                String error = httpresponse.message();
+                if (code >= 200 && code < 400) {
+                    getOKHttpHeader(httpresponse.headers().toMultimap());
+                    return response;
+                } else {
+                    throw new HttpsConnectionException(code, error);
+                }
+            }finally {
+                if (!cache.isClosed()) {
+                    try {
+                        cache.close();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+
+        } else {
             URL url = new URL(urlConnection);
             if (proxy != null)
                 httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
@@ -305,46 +411,6 @@ public class HttpsConnection {
             getSinceMaxId();
             httpsURLConnection.getInputStream().close();
             return response;
-        } else {
-            URL url = new URL(urlConnection);
-            if (proxy != null)
-                httpURLConnection = (HttpURLConnection) url.openConnection(proxy);
-            else
-                httpURLConnection = (HttpURLConnection) url.openConnection();
-            httpURLConnection.setConnectTimeout(30 * 1000);
-            httpURLConnection.setRequestProperty("http.keepAlive", "false");
-            httpURLConnection.setRequestProperty("User-Agent", "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1667.0 Safari/537.36");
-            httpURLConnection.setRequestMethod("GET");
-            String response;
-            if (httpURLConnection.getResponseCode() >= 200 && httpURLConnection.getResponseCode() < 400) {
-                getSinceMaxId();
-                response = converToString(httpURLConnection.getInputStream());
-            } else {
-                String error = null;
-                if (httpURLConnection.getErrorStream() != null) {
-                    InputStream stream = httpURLConnection.getErrorStream();
-                    if (stream == null) {
-                        stream = httpURLConnection.getInputStream();
-                    }
-                    try (Scanner scanner = new Scanner(stream)) {
-                        scanner.useDelimiter("\\Z");
-                        if (scanner.hasNext()) {
-                            error = scanner.next();
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-                int responseCode = httpURLConnection.getResponseCode();
-                try {
-                    httpURLConnection.getInputStream().close();
-                } catch (Exception ignored) {
-                }
-                throw new HttpsConnectionException(responseCode, error);
-            }
-            getSinceMaxId();
-            httpURLConnection.getInputStream().close();
-            return response;
         }
     }
 
@@ -373,7 +439,7 @@ public class HttpsConnection {
                 httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
             else
                 httpsURLConnection = (HttpsURLConnection) url.openConnection();
-            httpsURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+            httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT);
             httpsURLConnection.setConnectTimeout(timeout * 1000);
             httpsURLConnection.setDoOutput(true);
             httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory(this.instance));
@@ -440,7 +506,7 @@ public class HttpsConnection {
                 httpURLConnection = (HttpURLConnection) url.openConnection(proxy);
             else
                 httpURLConnection = (HttpURLConnection) url.openConnection();
-            httpURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+            httpURLConnection.setRequestProperty("User-Agent", USER_AGENT);
             httpURLConnection.setConnectTimeout(timeout * 1000);
             httpURLConnection.setDoOutput(true);
             httpURLConnection.setRequestMethod("POST");
@@ -495,7 +561,7 @@ public class HttpsConnection {
                 httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
             else
                 httpsURLConnection = (HttpsURLConnection) url.openConnection();
-            httpsURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+            httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT);
             httpsURLConnection.setConnectTimeout(timeout * 1000);
             httpsURLConnection.setDoOutput(true);
             httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory(this.instance));
@@ -548,7 +614,7 @@ public class HttpsConnection {
                 httpURLConnection = (HttpURLConnection) url.openConnection(proxy);
             else
                 httpURLConnection = (HttpURLConnection) url.openConnection();
-            httpURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+            httpURLConnection.setRequestProperty("User-Agent", USER_AGENT);
             httpURLConnection.setConnectTimeout(timeout * 1000);
             httpURLConnection.setDoOutput(true);
             httpURLConnection.setRequestMethod("POST");
@@ -601,7 +667,7 @@ public class HttpsConnection {
             httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
         else
             httpsURLConnection = (HttpsURLConnection) url.openConnection();
-        httpsURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+        httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT);
         httpsURLConnection.setConnectTimeout(timeout * 1000);
         httpsURLConnection.setDoOutput(true);
         httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory(this.instance));
@@ -666,7 +732,7 @@ public class HttpsConnection {
                             httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
                         else
                             httpsURLConnection = (HttpsURLConnection) url.openConnection();
-                        httpsURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+                        httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT);
                         int responseCode = httpsURLConnection.getResponseCode();
 
                         // always check HTTP response code first
@@ -754,7 +820,7 @@ public class HttpsConnection {
                             httpURLConnection = (HttpURLConnection) url.openConnection(proxy);
                         else
                             httpURLConnection = (HttpURLConnection) url.openConnection();
-                        httpURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+                        httpURLConnection.setRequestProperty("User-Agent", USER_AGENT);
                         int responseCode = httpURLConnection.getResponseCode();
 
                         // always check HTTP response code first
@@ -850,7 +916,7 @@ public class HttpsConnection {
                 else
                     httpsURLConnection = (HttpsURLConnection) url.openConnection();
                 httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory(this.instance));
-                httpsURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+                httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT);
                 int responseCode = httpsURLConnection.getResponseCode();
                 // always check HTTP response code first
                 if (responseCode == HttpURLConnection.HTTP_OK) {
@@ -858,8 +924,7 @@ public class HttpsConnection {
                     return httpsURLConnection.getInputStream();
                 }
                 httpsURLConnection.getInputStream().close();
-            } catch (IOException | NoSuchAlgorithmException | KeyManagementException ignored) {
-            }
+            } catch (IOException | NoSuchAlgorithmException | KeyManagementException ignored) {}
             if (httpsURLConnection != null)
                 try {
                     httpsURLConnection.getInputStream().close();
@@ -873,7 +938,7 @@ public class HttpsConnection {
                     httpURLConnection = (HttpURLConnection) url.openConnection(proxy);
                 else
                     httpURLConnection = (HttpURLConnection) url.openConnection();
-                httpURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+                httpURLConnection.setRequestProperty("User-Agent", USER_AGENT);
                 int responseCode = httpURLConnection.getResponseCode();
                 // always check HTTP response code first
                 if (responseCode == HttpURLConnection.HTTP_OK) {
@@ -980,7 +1045,7 @@ public class HttpsConnection {
                 httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
             else
                 httpsURLConnection = (HttpsURLConnection) url.openConnection();
-            httpsURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+            httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT);
             httpsURLConnection.setConnectTimeout(timeout * 1000);
             httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory(this.instance));
             if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
@@ -1061,7 +1126,7 @@ public class HttpsConnection {
                 httpURLConnection = (HttpsURLConnection) url.openConnection(proxy);
             else
                 httpURLConnection = (HttpsURLConnection) url.openConnection();
-            httpURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+            httpURLConnection.setRequestProperty("User-Agent", USER_AGENT);
             httpURLConnection.setConnectTimeout(timeout * 1000);
             if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) {
                 httpURLConnection.setRequestMethod("PATCH");
@@ -1144,7 +1209,7 @@ public class HttpsConnection {
                 httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
             else
                 httpsURLConnection = (HttpsURLConnection) url.openConnection();
-            httpsURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+            httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT);
             httpsURLConnection.setConnectTimeout(timeout * 1000);
             httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory(this.instance));
             if (token != null && !token.startsWith("Basic "))
@@ -1212,7 +1277,7 @@ public class HttpsConnection {
                 httpURLConnection = (HttpURLConnection) url.openConnection(proxy);
             else
                 httpURLConnection = (HttpURLConnection) url.openConnection();
-            httpURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+            httpURLConnection.setRequestProperty("User-Agent", USER_AGENT);
             httpURLConnection.setConnectTimeout(timeout * 1000);
             if (token != null && !token.startsWith("Basic "))
                 httpURLConnection.setRequestProperty("Authorization", "Bearer " + token);
@@ -1284,7 +1349,7 @@ public class HttpsConnection {
                 httpsURLConnection = (HttpsURLConnection) url.openConnection(proxy);
             else
                 httpsURLConnection = (HttpsURLConnection) url.openConnection();
-            httpsURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+            httpsURLConnection.setRequestProperty("User-Agent", USER_AGENT);
             httpsURLConnection.setSSLSocketFactory(new TLSSocketFactory(this.instance));
             if (token != null && !token.startsWith("Basic "))
                 httpsURLConnection.setRequestProperty("Authorization", "Bearer " + token);
@@ -1347,7 +1412,7 @@ public class HttpsConnection {
                 httpURLConnection = (HttpURLConnection) url.openConnection(proxy);
             else
                 httpURLConnection = (HttpURLConnection) url.openConnection();
-            httpURLConnection.setRequestProperty("User-Agent", Helper.USER_AGENT);
+            httpURLConnection.setRequestProperty("User-Agent", USER_AGENT);
             if (token != null && !token.startsWith("Basic "))
                 httpsURLConnection.setRequestProperty("Authorization", "Bearer " + token);
             else if (token != null && token.startsWith("Basic "))
@@ -1398,6 +1463,32 @@ public class HttpsConnection {
         return max_id;
     }
 
+    private void getOKHttpHeader(Map<String, List<String>> headers){
+        for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+            if (entry.toString().startsWith("Link") || entry.toString().startsWith("link")) {
+                Pattern patternMaxId = Pattern.compile("max_id=([0-9a-zA-Z]{1,}).*");
+                Matcher matcherMaxId = patternMaxId.matcher(entry.toString());
+                if (matcherMaxId.find()) {
+                    max_id = matcherMaxId.group(1);
+                }
+                if (entry.toString().startsWith("Link")) {
+                    Pattern patternSinceId = Pattern.compile("since_id=([0-9a-zA-Z]{1,}).*");
+                    Matcher matcherSinceId = patternSinceId.matcher(entry.toString());
+                    if (matcherSinceId.find()) {
+                        since_id = matcherSinceId.group(1);
+                    }
+
+                }
+            }else  if (entry.toString().startsWith("Min-Id") || entry.toString().startsWith("min-id")) {
+                Pattern patternMaxId = Pattern.compile("min-id=\\[([0-9a-zA-Z]{1,}).*\\]");
+                Matcher matcherMaxId = patternMaxId.matcher(entry.toString());
+                if (matcherMaxId.find()) {
+                    max_id = matcherMaxId.group(1);
+                }
+            }
+        }
+    }
+
     private void getSinceMaxId() {
         if (Helper.getLiveInstanceWithProtocol(context) == null)
             return;
@@ -1405,6 +1496,7 @@ public class HttpsConnection {
             if (httpsURLConnection == null)
                 return;
             Map<String, List<String>> map = httpsURLConnection.getHeaderFields();
+
             for (Map.Entry<String, List<String>> entry : map.entrySet()) {
                 if (entry.toString().startsWith("Link") || entry.toString().startsWith("link")) {
                     Pattern patternMaxId = Pattern.compile("max_id=([0-9a-zA-Z]{1,}).*");
@@ -1420,6 +1512,12 @@ public class HttpsConnection {
                         }
 
                     }
+                }else  if (entry.toString().startsWith("Min-Id") || entry.toString().startsWith("min-id")) {
+                    Pattern patternMaxId = Pattern.compile("min-id=\\[([0-9a-zA-Z]{1,}).*\\]");
+                    Matcher matcherMaxId = patternMaxId.matcher(entry.toString());
+                    if (matcherMaxId.find()) {
+                        max_id = matcherMaxId.group(1);
+                    }
                 }
             }
         } else {
diff --git a/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java b/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java
index 117977fc3..38e446ed9 100644
--- a/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java
+++ b/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java
@@ -413,7 +413,7 @@ public class PeertubeAPI {
                 status.setUrl(comment.get("url").toString());
                 status.setSensitive(false);
                 status.setSpoiler_text("");
-                status.setContent(comment.get("text").toString());
+                status.setContent(context, comment.get("text").toString());
                 status.setIn_reply_to_id(comment.get("inReplyToCommentId").toString());
                 status.setAccount(parseAccountResponsePeertube(context, comment.getJSONObject("account")));
                 status.setCreated_at(Helper.mstStringToDate(context, comment.get("createdAt").toString()));
@@ -713,7 +713,7 @@ public class PeertubeAPI {
     }
 
     /***
-     * Verifiy credential of the authenticated user *synchronously*
+     * Verifiy PeertubeInformation of the authenticated user *synchronously*
      * @return Account
      */
     public PeertubeInformation getPeertubeInformation() throws HttpsConnection.HttpsConnectionException {
@@ -791,13 +791,7 @@ public class PeertubeAPI {
                 peertubeInformation.setTranslations(_translations);
             }
 
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException e) {
             e.printStackTrace();
         }
         return peertubeInformation;
@@ -827,34 +821,38 @@ public class PeertubeAPI {
             if (e.getStatusCode() == 401 || e.getStatusCode() == 403) {
                 SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
                 Account targetedAccount = new AccountDAO(context, db).getAccountByToken(prefKeyOauthTokenT);
-                HashMap<String, String> values = refreshToken(targetedAccount.getClient_id(), targetedAccount.getClient_secret(), targetedAccount.getRefresh_token());
-                if (values.containsKey("access_token") && values.get("access_token") != null) {
-                    targetedAccount.setToken(values.get("access_token"));
-                    SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-                    String token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
-                    //This account is currently logged in, the token is updated
-                    if (prefKeyOauthTokenT.equals(token)) {
-                        SharedPreferences.Editor editor = sharedpreferences.edit();
-                        editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, targetedAccount.getToken());
-                        editor.apply();
+                if (targetedAccount != null) {
+                    HashMap<String, String> values = refreshToken(targetedAccount.getClient_id(), targetedAccount.getClient_secret(), targetedAccount.getRefresh_token());
+                    if (values.containsKey("access_token") && values.get("access_token") != null) {
+                        targetedAccount.setToken(values.get("access_token"));
+                        SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+                        String token = sharedpreferences.getString(Helper.PREF_KEY_OAUTH_TOKEN, null);
+                        //This account is currently logged in, the token is updated
+                        if (prefKeyOauthTokenT != null && prefKeyOauthTokenT.equals(token)) {
+                            SharedPreferences.Editor editor = sharedpreferences.edit();
+                            editor.putString(Helper.PREF_KEY_OAUTH_TOKEN, targetedAccount.getToken());
+                            editor.apply();
+                        }
                     }
-                }
-                if (values.containsKey("refresh_token") && values.get("refresh_token") != null)
-                    targetedAccount.setRefresh_token(values.get("refresh_token"));
-                new AccountDAO(context, db).updateAccount(targetedAccount);
+                    if (values.containsKey("refresh_token") && values.get("refresh_token") != null)
+                        targetedAccount.setRefresh_token(values.get("refresh_token"));
+                    new AccountDAO(context, db).updateAccount(targetedAccount);
 
-                String response;
-                try {
-                    response = new HttpsConnection(context, this.instance).get(getAbsoluteUrl("/users/me"), 60, null, targetedAccount.getToken());
-                    JSONObject accountObject = new JSONObject(response).getJSONObject("account");
-                    account = parseAccountResponsePeertube(context, accountObject);
-                    if (social != null) {
-                        account.setSocial(social.toUpperCase());
+                    String response;
+                    try {
+                        response = new HttpsConnection(context, this.instance).get(getAbsoluteUrl("/users/me"), 60, null, targetedAccount.getToken());
+                        JSONObject accountObject = new JSONObject(response).getJSONObject("account");
+                        account = parseAccountResponsePeertube(context, accountObject);
+                        if (social != null) {
+                            account.setSocial(social.toUpperCase());
+                        }
+                    } catch (IOException | NoSuchAlgorithmException | KeyManagementException | JSONException e1) {
+                        e1.printStackTrace();
+                    } catch (HttpsConnection.HttpsConnectionException e1) {
+                        e1.printStackTrace();
+                        setError(e.getStatusCode(), e);
                     }
-                } catch (IOException | NoSuchAlgorithmException | KeyManagementException | JSONException e1) {
-                    e1.printStackTrace();
-                } catch (HttpsConnection.HttpsConnectionException e1) {
-                    e1.printStackTrace();
+                }else{
                     setError(e.getStatusCode(), e);
                 }
                 e.printStackTrace();
@@ -921,15 +919,7 @@ public class PeertubeAPI {
                 refresh_token = resobj.get("refresh_token").toString();
             newValues.put("access_token", token);
             newValues.put("refresh_token", refresh_token);
-        } catch (NoSuchAlgorithmException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } catch (KeyManagementException e) {
-            e.printStackTrace();
-        } catch (JSONException e) {
-            e.printStackTrace();
-        } catch (HttpsConnection.HttpsConnectionException e) {
+        } catch (NoSuchAlgorithmException | IOException | KeyManagementException | JSONException | HttpsConnection.HttpsConnectionException e) {
             e.printStackTrace();
         }
         return newValues;
diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java
index 38d2a979e..df0142c97 100644
--- a/app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/AccountSearchDevAdapter.java
@@ -14,6 +14,7 @@ package app.fedilab.android.drawers;
  * You should have received a copy of the GNU General Public License along with Fedilab; if not,
  * see <http://www.gnu.org/licenses>. */
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
@@ -54,7 +55,6 @@ import es.dmoral.toasty.Toasty;
 public class AccountSearchDevAdapter extends BaseAdapter implements OnPostActionInterface {
 
     private List<Account> accounts;
-    private LayoutInflater layoutInflater;
     private Context context;
     private ViewHolder holder;
 
@@ -83,7 +83,7 @@ public class AccountSearchDevAdapter extends BaseAdapter implements OnPostAction
     public View getView(final int position, View convertView, ViewGroup parent) {
 
         context = parent.getContext();
-        layoutInflater = LayoutInflater.from(context);
+        LayoutInflater layoutInflater = LayoutInflater.from(context);
         final Account account = accounts.get(position);
 
         if (convertView == null) {
@@ -132,13 +132,17 @@ public class AccountSearchDevAdapter extends BaseAdapter implements OnPostAction
         //Profile picture
 
         if (account.getAvatar().startsWith("http")) {
-            Glide.with(holder.account_pp.getContext())
-                    .load(account.getAvatar())
-                    .into(holder.account_pp);
+            if( !((Activity)context).isFinishing() && !((Activity)context).isDestroyed()) {
+                Glide.with(context)
+                        .load(account.getAvatar())
+                        .into(holder.account_pp);
+            }
         } else if (account.getSocial() != null && account.getSocial().contains("OPENCOLLECTIVE")) {
-            Glide.with(holder.account_pp.getContext())
-                    .load(R.drawable.missing)
-                    .into(holder.account_pp);
+            if( !((Activity)context).isFinishing() && !((Activity)context).isDestroyed()) {
+                Glide.with(context)
+                        .load(R.drawable.missing)
+                        .into(holder.account_pp);
+            }
         }
 
 
diff --git a/app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java b/app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java
index b55742702..6a6fef436 100644
--- a/app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/AccountsFollowRequestAdapter.java
@@ -39,8 +39,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import app.fedilab.android.R;
+import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.activities.ShowAccountActivity;
 import app.fedilab.android.asynctasks.PostActionAsyncTask;
+import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
 import app.fedilab.android.client.API;
 import app.fedilab.android.client.Entities.Account;
 import app.fedilab.android.client.Entities.Error;
@@ -80,6 +82,11 @@ public class AccountsFollowRequestAdapter extends RecyclerView.Adapter implement
         final Account account = accounts.get(position);
         holder.btn_authorize.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.green_1), PorterDuff.Mode.MULTIPLY);
         holder.btn_reject.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.red_1), PorterDuff.Mode.MULTIPLY);
+        //TODO: check if Friendica has a way to accept/deny follow requests
+        if(MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
+            holder.btn_authorize.setVisibility(View.GONE);
+            holder.btn_reject.setVisibility(View.GONE);
+        }
         holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name(), true));
         holder.account_un.setText(account.getAcct());
         //Profile picture
diff --git a/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java
index 386467bd2..7e4d57a14 100644
--- a/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java
@@ -280,19 +280,6 @@ public class ArtListAdapter extends RecyclerView.Adapter implements OnPostAction
         }
     }
 
-    public void notifyStatusWithActionChanged(Status status) {
-        for (int i = 0; i < statusListAdapter.getItemCount(); i++) {
-            //noinspection ConstantConditions
-            if (statusListAdapter.getItemAt(i) != null && statusListAdapter.getItemAt(i).getId().equals(status.getId())) {
-                try {
-                    statuses.set(i, status);
-                    statusListAdapter.notifyItemChanged(i);
-                } catch (Exception ignored) {
-                }
-            }
-        }
-    }
-
     @Override
     public void onRetrieveEmoji(Status status, boolean fromTranslation) {
         if (status != null) {
diff --git a/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java b/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java
index 5276ced06..eaa9814cb 100644
--- a/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/CustomEmojiAdapter.java
@@ -84,7 +84,7 @@ public class CustomEmojiAdapter extends BaseAdapter {
         }
 
 
-        if (!emoji.isDrawableFound()) {
+        //if (!emoji.isDrawableFound()) {
             emoji.setDrawableFound(true);
             Glide.with(parent.getContext())
                     .asFile()
@@ -116,7 +116,7 @@ public class CustomEmojiAdapter extends BaseAdapter {
                             imageView.setImageDrawable(emoji.getDrawable());
                         }
                     });
-        }
+       // }
         return convertView;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/android/drawers/FilterAdapter.java b/app/src/main/java/app/fedilab/android/drawers/FilterAdapter.java
index e3b22e3d3..3e75bb812 100644
--- a/app/src/main/java/app/fedilab/android/drawers/FilterAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/FilterAdapter.java
@@ -41,6 +41,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import app.fedilab.android.R;
 import app.fedilab.android.activities.BaseMainActivity;
@@ -134,8 +135,8 @@ public class FilterAdapter extends BaseAdapter implements OnFilterActionInterfac
                 CheckBox context_whole_word = dialogView.findViewById(R.id.context_whole_word);
                 CheckBox context_drop = dialogView.findViewById(R.id.context_drop);
                 Spinner filter_expire = dialogView.findViewById(R.id.filter_expire);
-                ArrayAdapter<CharSequence> adapterResize = ArrayAdapter.createFromResource(context,
-                        R.array.filter_expire, android.R.layout.simple_spinner_item);
+                ArrayAdapter<CharSequence> adapterResize = ArrayAdapter.createFromResource(Objects.requireNonNull(context),
+                        R.array.filter_expire, android.R.layout.simple_spinner_dropdown_item);
                 filter_expire.setAdapter(adapterResize);
                 final int[] expire = {-1};
                 filter_expire.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
diff --git a/app/src/main/java/app/fedilab/android/drawers/IdentityProofsAdapter.java b/app/src/main/java/app/fedilab/android/drawers/IdentityProofsAdapter.java
new file mode 100644
index 000000000..ee3b6b3a1
--- /dev/null
+++ b/app/src/main/java/app/fedilab/android/drawers/IdentityProofsAdapter.java
@@ -0,0 +1,96 @@
+package app.fedilab.android.drawers;
+/* Copyright 2019 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import java.util.List;
+import app.fedilab.android.R;
+import app.fedilab.android.client.Entities.IdentityProof;
+import app.fedilab.android.helper.Helper;
+
+
+/**
+ * Created by Thomas on 19/12/2019.
+ * Adapter for identity proofs
+ */
+public class IdentityProofsAdapter extends RecyclerView.Adapter {
+
+    private Context context;
+    private List<IdentityProof> identityProofs;
+
+    public IdentityProofsAdapter(List<IdentityProof> identityProofs) {
+        this.identityProofs = identityProofs;
+    }
+
+    public IdentityProof getItem(int position) {
+        return identityProofs.get(position);
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int i) {
+        context = parent.getContext();
+        LayoutInflater layoutInflater = LayoutInflater.from(context);
+        return new ViewHolder(layoutInflater.inflate(R.layout.drawer_identity_proofs, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
+        final ViewHolder holder = (ViewHolder) viewHolder;
+        final IdentityProof identityProof = getItem(i);
+        holder.proof_name.setText(String.format("@%s", identityProof.getProvider_username()));
+        holder.proof_name.setOnClickListener(v -> {
+            Helper.openBrowser(context, identityProof.getProfile_url());
+        });
+        holder.proof_name_network.setText(context.getString(R.string.verified_by, identityProof.getProvider(),Helper.shortDateToString(identityProof.getUpdated_at())));
+        holder.proof_container.setOnClickListener(v -> {
+            Helper.openBrowser(context, identityProof.getProfile_url());
+        });
+        holder.proof_name_network.setOnClickListener(v -> {
+            Helper.openBrowser(context, identityProof.getProof_url());
+        });
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public int getItemCount() {
+        return identityProofs.size();
+    }
+
+    class ViewHolder extends RecyclerView.ViewHolder {
+        private TextView proof_name, proof_name_network;
+        private ConstraintLayout proof_container;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            proof_name = itemView.findViewById(R.id.proof_name);
+            proof_name_network = itemView.findViewById(R.id.proof_name_network);
+            proof_container = itemView.findViewById(R.id.proof_container);
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
index a4b5cb365..521bdcc29 100644
--- a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java
@@ -70,6 +70,7 @@ import java.util.TimerTask;
 
 import app.fedilab.android.R;
 import app.fedilab.android.activities.AccountReportActivity;
+import app.fedilab.android.activities.BaseActivity;
 import app.fedilab.android.activities.BaseMainActivity;
 import app.fedilab.android.activities.CustomSharingActivity;
 import app.fedilab.android.activities.MainActivity;
@@ -247,6 +248,11 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
             style = R.style.Dialog;
         }
 
+        int theme_text_color = prefs.getInt("theme_text_color", -1);
+        if (holder.notification_status_content != null && theme_text_color != -1) {
+            holder.notification_status_content.setTextColor(theme_text_color);
+            holder.status_spoiler.setTextColor(theme_text_color);
+        }
 
         int reblogColor = prefs.getInt("theme_statuses_color", -1);
         if (holder.main_linear_container != null && reblogColor != -1) {
@@ -301,6 +307,16 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
                 holder.main_container_trans.setVisibility(View.VISIBLE);
                 holder.status_more.setVisibility(View.GONE);
                 break;
+            case "follow_request":
+                holder.status_action_container.setVisibility(View.GONE);
+                holder.status_date.setVisibility(View.GONE);
+                if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0)
+                    typeString = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name(), true), context.getString(R.string.notif_follow_request));
+                else
+                    typeString = String.format("@%s %s", notification.getAccount().getUsername(), context.getString(R.string.notif_follow_request));
+                imgH = ContextCompat.getDrawable(context, R.drawable.ic_follow_notif_header);
+                holder.main_container_trans.setVisibility(View.GONE);
+                break;
             case "follow":
                 holder.status_action_container.setVisibility(View.GONE);
                 holder.status_date.setVisibility(View.GONE);
@@ -336,7 +352,11 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
         holder.notification_status_content.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14 * textSizePercent / 100);
         holder.notification_type.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14 * textSizePercent / 100);
         holder.status_date.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12 * textSizePercent / 100);
-
+        int theme_text_header_1_line = prefs.getInt("theme_text_header_1_line", -1);
+        if (theme_text_header_1_line == -1) {
+            theme_text_header_1_line = ThemeHelper.getAttColor(context, R.attr.textColor);
+        }
+        holder.notification_type.setTextColor(theme_text_header_1_line);
 
         holder.spark_button_fav.pressOnTouch(false);
         holder.spark_button_reblog.pressOnTouch(false);
@@ -534,7 +554,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
                                 greaterValue = pollOption.getVotes_count();
                         }
                         for (PollOptions pollOption : status.getPoll().getOptionsList()) {
-                            double value = ((double) (pollOption.getVotes_count() * 100) / (double) poll.getVotes_count());
+                            double value = ((double) (pollOption.getVotes_count() * 100) / (double) poll.getVoters_count());
                             if (pollOption.getVotes_count() == greaterValue) {
                                 BarItem bar = new BarItem(pollOption.getTitle(), value, "%", ContextCompat.getColor(context, R.color.mastodonC4), Color.WHITE);
                                 bar.setRounded(true);
@@ -623,8 +643,12 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
                         }
                     });
                     holder.poll_container.setVisibility(View.VISIBLE);
-                    holder.number_votes.setText(context.getResources().getQuantityString(R.plurals.number_of_vote, status.getPoll().getVotes_count(), status.getPoll().getVotes_count()));
-                    holder.remaining_time.setText(context.getString(R.string.poll_finish_at, Helper.dateToStringPoll(poll.getExpires_at())));
+                    holder.number_votes.setText(context.getResources().getQuantityString(R.plurals.number_of_voters, status.getPoll().getVoters_count(), status.getPoll().getVoters_count()));
+                    if( poll.isExpired()){
+                        holder.remaining_time.setText(context.getString(R.string.poll_finish_at, Helper.dateToStringPoll(poll.getExpires_at())));
+                    }else{
+                        holder.remaining_time.setText(context.getString(R.string.poll_finish_in, Helper.dateDiffPoll(context, poll.getExpires_at())));
+                    }
                 } else {
                     holder.poll_container.setVisibility(View.GONE);
                 }
@@ -1282,6 +1306,7 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
                 if (!url.trim().contains("missing.png"))
                     Glide.with(imageView.getContext())
                             .load(url)
+                            .override(640, 480)
                             .into(imageView);
                 final int finalPosition = position;
                 imageView.setOnClickListener(new View.OnClickListener() {
@@ -1468,10 +1493,10 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
             final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
             boolean disableAnimatedEmoji = sharedpreferences.getBoolean(Helper.SET_DISABLE_ANIMATED_EMOJI, false);
             if (!disableAnimatedEmoji) {
-                if (BaseMainActivity.timer == null) {
-                    BaseMainActivity.timer = new Timer();
+                if (BaseActivity.timer == null) {
+                    BaseActivity.timer = new Timer();
                 }
-                BaseMainActivity.timer.schedule(new TimerTask() {
+                BaseActivity.timer.schedule(new TimerTask() {
                     @Override
                     public void run() {
                         mHandler.post(updateAnimatedEmoji);
diff --git a/app/src/main/java/app/fedilab/android/drawers/PeertubeAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PeertubeAdapter.java
index 48ccc2660..bdf66a907 100644
--- a/app/src/main/java/app/fedilab/android/drawers/PeertubeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/PeertubeAdapter.java
@@ -172,7 +172,7 @@ public class PeertubeAdapter extends RecyclerView.Adapter implements OnListActio
                 }
             });
         } else {
-            holder.main_container.setOnClickListener(new View.OnClickListener() {
+            holder.bottom_container.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     Intent intent = new Intent(context, PeertubeEditUploadActivity.class);
@@ -182,6 +182,26 @@ public class PeertubeAdapter extends RecyclerView.Adapter implements OnListActio
                     context.startActivity(intent);
                 }
             });
+            holder.peertube_video_image.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Intent intent = new Intent(context, PeertubeActivity.class);
+                    Bundle b = new Bundle();
+                    if ((instance == null || instance.trim().length() == 0) && MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE)
+                        instance = Helper.getLiveInstance(context);
+                    String finalUrl = "https://" + instance + peertube.getEmbedPath();
+                    Pattern link = Pattern.compile("(https?:\\/\\/[\\da-z\\.-]+\\.[a-z\\.]{2,10})\\/videos\\/embed\\/(\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12})$");
+                    Matcher matcherLink = link.matcher(finalUrl);
+                    if (matcherLink.find()) {
+                        String url = matcherLink.group(1) + "/videos/watch/" + matcherLink.group(2);
+                        b.putString("peertubeLinkToFetch", url);
+                        b.putString("peertube_instance", matcherLink.group(1).replace("https://", "").replace("http://", ""));
+                        b.putString("video_id", matcherLink.group(2));
+                    }
+                    intent.putExtras(b);
+                    context.startActivity(intent);
+                }
+            });
         }
 
     }
@@ -203,7 +223,7 @@ public class PeertubeAdapter extends RecyclerView.Adapter implements OnListActio
     }
 
     class ViewHolder extends RecyclerView.ViewHolder {
-        LinearLayout main_container;
+        LinearLayout main_container, bottom_container;
         ImageView peertube_profile, peertube_video_image;
         TextView peertube_account_name, peertube_views, peertube_duration;
         TextView peertube_title, peertube_date, header_title;
@@ -219,6 +239,7 @@ public class PeertubeAdapter extends RecyclerView.Adapter implements OnListActio
             peertube_duration = itemView.findViewById(R.id.peertube_duration);
             main_container = itemView.findViewById(R.id.main_container);
             header_title = itemView.findViewById(R.id.header_title);
+            bottom_container = itemView.findViewById(R.id.bottom_container);
         }
     }
 
diff --git a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java
index dd2ec57ce..f697b3dca 100644
--- a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java
@@ -133,9 +133,6 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
     private MastalabAutoCompleteTextView comment_content;
     private String in_reply_to_status;
     private String visibility;
-    private int theme;
-    private long currentToId = -1;
-    private Status tootReply;
     private boolean redraft = false;
     private Status toot;
 
@@ -204,8 +201,7 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
         final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
 
         comment_content = null;
-        tootReply = null;
-        currentToId = -1;
+        long currentToId = -1;
         if (apiResponse.getError() == null) {
             boolean display_confirm = sharedpreferences.getBoolean(Helper.SET_DISPLAY_CONFIRM, true);
             if (display_confirm) {
@@ -434,14 +430,32 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
                 iconColor = ThemeHelper.getAttColor(context, R.attr.iconColor);
             }
             int reblogColor = prefs.getInt("theme_boost_header_color", -1);
+
+            holder.pf_likes.setTextColor(iconColor);
             int statusColor = prefs.getInt("theme_statuses_color", -1);
             if (holder.pf_cardview != null && statusColor != -1) {
                 holder.pf_cardview.setCardBackgroundColor(statusColor);
             } else if (holder.pf_cardview != null) {
                 holder.pf_cardview.setCardBackgroundColor(ThemeHelper.getAttColor(context, R.attr.cardviewColor));
             }
+            int theme_text_color = prefs.getInt("theme_text_color", -1);
+            if (holder.pf_description != null && theme_text_color != -1) {
+                holder.pf_description.setTextColor(theme_text_color);
+            }
+
+            int theme_text_header_2_line = prefs.getInt("theme_text_header_2_line", -1);
+            if (theme_text_header_2_line == -1) {
+                theme_text_header_2_line = ThemeHelper.getAttColor(context, R.attr.textHeader);
+            }
+
+            holder.pf_username.setTextColor(theme_text_header_2_line);
+            holder.pf_date.setTextColor(theme_text_header_2_line);
+            if (statusColor != -1) {
+                holder.quick_reply_container.setBackgroundColor(statusColor);
+            }
 
             holder.quick_reply_switch_to_full.setVisibility(View.GONE);
+            int theme;
             if (status.isShortReply()) {
                 holder.quick_reply_container.setVisibility(View.VISIBLE);
                 holder.pixelfed_comments.setVisibility(View.VISIBLE);
@@ -457,7 +471,11 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
                     status.setCommentsFetched(true);
                     new RetrieveContextAsyncTask(context, false, false, status.getId(), PixelfedListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
                 }
-
+                InputMethodManager inputMethodManager =
+                        (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+                inputMethodManager.toggleSoftInputFromWindow(
+                        holder.quick_reply_text.getApplicationWindowToken(),
+                        InputMethodManager.SHOW_FORCED, 0);
                 EditText content_cw = new EditText(context);
                 content_cw.setText(status.getReblog() != null ? status.getReblog().getSpoiler_text() : status.getSpoiler_text());
                 String content = TootActivity.manageMentions(context, userId, status.getReblog() != null ? status.getReblog() : status);
@@ -471,7 +489,6 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
                 int newInputType = comment_content.getInputType() & (comment_content.getInputType() ^ InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);
                 comment_content.setInputType(newInputType);
                 in_reply_to_status = status.getReblog() != null ? status.getReblog().getId() : status.getId();
-                tootReply = status;
                 theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
 
                 final SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
@@ -596,12 +613,12 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
             holder.quick_reply_privacy.setVisibility(View.GONE);
 
             holder.quick_reply_button.setOnClickListener(view -> {
-                sendToot();
-                //status.setShortReply(false);
+                sendToot(status);
+                status.setShortReply(false);
+                holder.quick_reply_container.setVisibility(View.GONE);
                 InputMethodManager imm = (InputMethodManager) context.getSystemService(Activity.INPUT_METHOD_SERVICE);
                 assert imm != null;
                 imm.hideSoftInputFromWindow(holder.quick_reply_button.getWindowToken(), 0);
-                notifyStatusChanged(status);
             });
 
             holder.pf_description.setText(status.getContentSpan(), TextView.BufferType.SPANNABLE);
@@ -900,7 +917,7 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
                                                 toot.setMedia_attachments(status.getMedia_attachments());
                                                 if (status.getSpoiler_text() != null && status.getSpoiler_text().length() > 0)
                                                     toot.setSpoiler_text(status.getSpoiler_text().trim());
-                                                toot.setContent(status.getContent());
+                                                toot.setContent(context, status.getContent());
                                                 toot.setVisibility(status.getVisibility());
                                                 if (status.getPoll() != null) {
                                                     toot.setPoll(status.getPoll());
@@ -915,7 +932,7 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
                                                 if (status.getSpoiler_text() != null && status.getSpoiler_text().length() > 0)
                                                     toot.setSpoiler_text(status.getSpoiler_text().trim());
                                                 toot.setVisibility(status.getVisibility());
-                                                toot.setContent(status.getContent());
+                                                toot.setContent(context, status.getContent());
                                                 if (status.getPoll() != null) {
                                                     toot.setPoll(status.getPoll());
                                                 } else if (status.getReblog() != null && status.getReblog().getPoll() != null) {
@@ -1065,6 +1082,8 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
             et = MyTransL.translatorEngine.YANDEX;
         } else if (trans == Helper.TRANS_DEEPL) {
             et = MyTransL.translatorEngine.DEEPL;
+        }else if (trans == Helper.TRANS_SYSTRAN) {
+            et = MyTransL.translatorEngine.SYSTRAN;
         }
         final MyTransL myTransL = MyTransL.getInstance(et);
         myTransL.setObfuscation(true);
@@ -1074,6 +1093,9 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
         } else if (trans == Helper.TRANS_DEEPL) {
             api_key = sharedpreferences.getString(Helper.SET_DEEPL_API_KEY, "");
             myTransL.setDeeplAPIKey(api_key);
+        } else if (trans == Helper.TRANS_SYSTRAN) {
+            api_key = sharedpreferences.getString(Helper.SET_SYSTRAN_API_KEY, "");
+            myTransL.setSystranAPIKey(api_key);
         }
 
 
@@ -1127,7 +1149,7 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
         context.startActivity(intent);
     }
 
-    private void sendToot() {
+    private void sendToot(Status status) {
 
         if (comment_content.getText() == null) {
             Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show();
@@ -1148,8 +1170,10 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
         Account account = new AccountDAO(context, db).getUniqAccount(userId, instance);
         toot.setVisibility(visibility);
         toot.setIn_reply_to_id(in_reply_to_status);
-        toot.setContent(tootContent);
+        toot.setContent(context, tootContent);
         new PostStatusAsyncTask(context, social, account, toot, PixelfedListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        status.setQuickReplyPrivacy(null);
+        status.setQuickReplyContent(null);
 
     }
 
@@ -1411,18 +1435,6 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA
         }
     }
 
-    public void notifyStatusWithActionChanged(Status status) {
-        for (int i = 0; i < pixelfedListAdapter.getItemCount(); i++) {
-            //noinspection ConstantConditions
-            if (pixelfedListAdapter.getItemAt(i) != null && pixelfedListAdapter.getItemAt(i).getId().equals(status.getId())) {
-                try {
-                    statuses.set(i, status);
-                    pixelfedListAdapter.notifyItemChanged(i);
-                } catch (Exception ignored) {
-                }
-            }
-        }
-    }
 
     @Override
     public void onRetrieveEmoji(Status status, boolean fromTranslation) {
diff --git a/app/src/main/java/app/fedilab/android/drawers/ReorderTabAdapter.java b/app/src/main/java/app/fedilab/android/drawers/ReorderTabAdapter.java
index 37beb46c4..145e0aad6 100644
--- a/app/src/main/java/app/fedilab/android/drawers/ReorderTabAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/ReorderTabAdapter.java
@@ -129,6 +129,9 @@ public class ReorderTabAdapter extends RecyclerView.Adapter<ReorderTabAdapter.It
                     case "GNU":
                         holder.iconView.setImageResource(R.drawable.ic_gnu_social);
                         break;
+                    case "NITTER":
+                        holder.iconView.setImageResource(R.drawable.nitter);
+                        break;
                 }
                 holder.textView.setText(tl.getRemoteInstance().getHost());
                 break;
diff --git a/app/src/main/java/app/fedilab/android/drawers/SearchListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/SearchListAdapter.java
index 0dd38c406..349717cdf 100644
--- a/app/src/main/java/app/fedilab/android/drawers/SearchListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/SearchListAdapter.java
@@ -63,9 +63,9 @@ public class SearchListAdapter extends BaseAdapter {
 
     public SearchListAdapter(Context context, List<Status> statuses, List<Account> accounts, List<String> tags) {
         this.context = context;
-        this.statuses = (statuses != null) ? statuses : new ArrayList<Status>();
-        this.accounts = (accounts != null) ? accounts : new ArrayList<Account>();
-        this.tags = (tags != null) ? tags : new ArrayList<String>();
+        this.statuses = (statuses != null) ? statuses : new ArrayList<>();
+        this.accounts = (accounts != null) ? accounts : new ArrayList<>();
+        this.tags = (tags != null) ? tags : new ArrayList<>();
         layoutInflater = LayoutInflater.from(context);
     }
 
@@ -180,7 +180,6 @@ public class SearchListAdapter extends BaseAdapter {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
                 holder.status_content.setText(Html.fromHtml(content, Html.FROM_HTML_MODE_LEGACY));
             else
-                //noinspection deprecation
                 holder.status_content.setText(Html.fromHtml(content));
             holder.status_content.setAutoLinkMask(Linkify.WEB_URLS);
             holder.status_toot_date.setText(Helper.dateDiff(context, status.getCreated_at()));
diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
index d5d327829..550320c4d 100644
--- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
+++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java
@@ -33,6 +33,7 @@ import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Environment;
 import android.os.Handler;
+import android.os.Looper;
 import android.text.Html;
 import android.text.InputType;
 import android.text.Spannable;
@@ -110,11 +111,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.ExecutionException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import app.fedilab.android.R;
 import app.fedilab.android.activities.AccountReportActivity;
+import app.fedilab.android.activities.BaseActivity;
 import app.fedilab.android.activities.BaseMainActivity;
 import app.fedilab.android.activities.CustomSharingActivity;
 import app.fedilab.android.activities.MainActivity;
@@ -148,10 +151,12 @@ import app.fedilab.android.client.Entities.Relationship;
 import app.fedilab.android.client.Entities.Status;
 import app.fedilab.android.client.Entities.StoredStatus;
 import app.fedilab.android.client.Entities.TagTimeline;
+import app.fedilab.android.client.Glide.GlideApp;
 import app.fedilab.android.fragments.DisplayStatusFragment;
 import app.fedilab.android.helper.CrossActions;
 import app.fedilab.android.helper.CustomTextView;
 import app.fedilab.android.helper.Helper;
+import app.fedilab.android.helper.LongClickLinkMovementMethod;
 import app.fedilab.android.helper.MastalabAutoCompleteTextView;
 import app.fedilab.android.helper.ThemeHelper;
 import app.fedilab.android.interfaces.OnPollInterface;
@@ -224,6 +229,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
     private List<ViewHolder> lstHolders;
     private List<Emojis> emojisPicker;
     private Status statusForQuickReply;
+    private String instanceType;
 
     private Runnable updateAnimatedEmoji = new Runnable() {
         @Override
@@ -263,6 +269,21 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         currentToId = -1;
     }
 
+    public StatusListAdapter(String instanceType, RetrieveFeedsAsyncTask.Type type, String targetedId, boolean isOnWifi, List<Status> statuses) {
+        super();
+        this.statuses = statuses;
+        this.isOnWifi = isOnWifi;
+        statusListAdapter = this;
+        this.type = type;
+        this.targetedId = targetedId;
+        redraft = false;
+        lstHolders = new ArrayList<>();
+        toot_content = null;
+        toot_cw_content = null;
+        tootReply = null;
+        currentToId = -1;
+        this.instanceType = instanceType;
+    }
 
     public StatusListAdapter(TagTimeline tagTimeline, String targetedId, boolean isOnWifi, List<Status> statuses) {
         super();
@@ -280,6 +301,23 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         currentToId = -1;
     }
 
+    public StatusListAdapter(String instanceType, TagTimeline tagTimeline, String targetedId, boolean isOnWifi, List<Status> statuses) {
+        super();
+        this.statuses = statuses;
+        this.isOnWifi = isOnWifi;
+        statusListAdapter = this;
+        this.type = RetrieveFeedsAsyncTask.Type.TAG;
+        this.targetedId = targetedId;
+        redraft = false;
+        this.tagTimeline = tagTimeline;
+        this.instanceType = instanceType;
+        lstHolders = new ArrayList<>();
+        toot_content = null;
+        toot_cw_content = null;
+        tootReply = null;
+        currentToId = -1;
+    }
+
     public StatusListAdapter(int position, String targetedId, boolean isOnWifi, List<Status> statuses) {
         this.statuses = statuses;
         this.isOnWifi = isOnWifi;
@@ -352,7 +390,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             new TimelineCacheDAO(context, db).remove(refreshedStatus.getId());
             new PostActionAsyncTask(context, API.StatusAction.UNSTATUS, refreshedStatus.getId(), StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         }
-        statusListAdapter.notifyStatusWithActionChanged(refreshedStatus);
+        statusListAdapter.notifyStatusChanged(refreshedStatus);
     }
 
     @Override
@@ -361,7 +399,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             return;
 
         final List<Account> accounts = apiResponse.getAccounts();
-        if (accounts != null && accounts.size() > 0) {
+        if (accounts != null && accounts.size() > 0 && toot_content != null) {
             int currentCursorPosition = toot_content.getSelectionStart();
             AccountsSearchAdapter accountsListAdapter = new AccountsSearchAdapter(context, accounts);
             toot_content.setThreshold(1);
@@ -415,9 +453,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
 
     @Override
     public void onRetrieveSearchEmoji(List<Emojis> emojis) {
-        int currentCursorPosition = toot_content.getSelectionStart();
 
-        if (emojis != null && emojis.size() > 0) {
+        if (emojis != null && emojis.size() > 0 && toot_content != null) {
+            int currentCursorPosition = toot_content.getSelectionStart();
             EmojisSearchAdapter emojisSearchAdapter = new EmojisSearchAdapter(context, emojis);
             toot_content.setThreshold(1);
             toot_content.setAdapter(emojisSearchAdapter);
@@ -543,7 +581,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             toot.setVisibility(apiResponse.getStatuses().get(0).getVisibility());
             if (apiResponse.getStatuses() != null && apiResponse.getStatuses().size() > 0)
                 toot.setIn_reply_to_id(apiResponse.getStatuses().get(0).getId());
-            toot.setContent(tootContent);
+            toot.setContent(context, tootContent);
             final SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
             Account account = new AccountDAO(context, db).getUniqAccount(userId, instance);
             new PostStatusAsyncTask(context, social, account, toot, StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -613,15 +651,20 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             show_boosts = ((ShowAccountActivity) context).showBoosts();
             show_replies = ((ShowAccountActivity) context).showReplies();
         }
-        if (type != RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE && type != RetrieveFeedsAsyncTask.Type.NEWS && !Helper.filterToots(statuses.get(position), type, context instanceof ShowAccountActivity, show_boosts, show_replies))
+        if (type != RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE && type != RetrieveFeedsAsyncTask.Type.NEWS && !Helper.filterToots(statuses.get(position), type, context instanceof ShowAccountActivity, show_boosts, show_replies)) {
             return HIDDEN_STATUS;
+        }
         if (statuses.get(position).isFocused() && type == RetrieveFeedsAsyncTask.Type.CONTEXT && statuses.get(position).getViewType() != CONSOLE_STATUS)
             return FOCUSED_STATUS;
         else {
             if (social == UpdateAccountInfoAsyncTask.SOCIAL.PIXELFED && type == RetrieveFeedsAsyncTask.Type.CONTEXT) {
                 return COMPACT_STATUS;
             } else {
-                return statuses.get(position).getViewType();
+                if( instanceType == null || instanceType.compareTo("NITTER") != 0 ) {
+                    return statuses.get(position).getViewType();
+                }else{
+                    return COMPACT_STATUS;
+                }
             }
         }
     }
@@ -650,6 +693,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
         final String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
         context = viewHolder.itemView.getContext();
+
         if (viewHolder.getItemViewType() != HIDDEN_STATUS) {
             final ViewHolder holder = (ViewHolder) viewHolder;
             synchronized (lock) {
@@ -659,9 +703,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
 
             holder.startUpdateTimer();
             final Status status = statuses.get(i);
+
+
             if (status == null)
                 return;
-
             //TODO:It sounds that sometimes this value is null - need deeper investigation
             if (status.getVisibility() == null) {
                 status.setVisibility("public");
@@ -688,11 +733,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                     holder.status_reply_indicator_top.setVisibility(View.VISIBLE);
                     holder.reply_indicator_dot.setVisibility(View.VISIBLE);
                     if (holder.status_reply_indicator_diag_top != null) {
-                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-                            holder.status_reply_indicator_diag_top.setBackgroundResource(R.drawable.diag_top_android4);
-                        } else {
-                            holder.status_reply_indicator_diag_top.setBackgroundResource(R.drawable.diag_top);
-                        }
+                        holder.status_reply_indicator_diag_top.setBackgroundResource(R.drawable.diag_top);
                         holder.status_reply_indicator_diag_top.setVisibility(View.VISIBLE);
                     }
                 }
@@ -700,12 +741,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                     holder.reply_indicator_dot.setVisibility(View.VISIBLE);
                     holder.status_reply_indicator_bottom.setVisibility(View.VISIBLE);
                     if (holder.status_reply_indicator_diag_bottom != null) {
-                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-                            holder.status_reply_indicator_diag_bottom.setBackgroundResource(R.drawable.diag_bottom_android4);
-                        } else {
-                            holder.status_reply_indicator_diag_bottom.setBackgroundResource(R.drawable.diag_bottom);
-                        }
-
+                        holder.status_reply_indicator_diag_bottom.setBackgroundResource(R.drawable.diag_bottom);
                         holder.status_reply_indicator_diag_bottom.setVisibility(View.VISIBLE);
                     }
                 }
@@ -792,7 +828,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                 greaterValue = pollOption.getVotes_count();
                         }
                         for (PollOptions pollOption : poll.getOptionsList()) {
-                            double value = ((double) (pollOption.getVotes_count() * 100) / (double) poll.getVotes_count());
+                            double value = ((double) (pollOption.getVotes_count() * 100) / (double) poll.getVoters_count());
                             if (pollOption.getVotes_count() == greaterValue) {
                                 BarItem bar = new BarItem(pollOption.getTitle(), value, "%", ContextCompat.getColor(context, R.color.mastodonC4), Color.WHITE);
                                 bar.setDescriptionSpan(pollOption.getTitleSpan());
@@ -894,8 +930,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                         }
                     });
                     holder.poll_container.setVisibility(View.VISIBLE);
-                    holder.number_votes.setText(context.getResources().getQuantityString(R.plurals.number_of_vote, poll.getVotes_count(), poll.getVotes_count()));
-                    holder.remaining_time.setText(context.getString(R.string.poll_finish_at, Helper.dateToStringPoll(poll.getExpires_at())));
+                    holder.number_votes.setText(context.getResources().getQuantityString(R.plurals.number_of_voters, poll.getVoters_count(), poll.getVoters_count()));
+                    if( poll.isExpired()){
+                        holder.remaining_time.setText(context.getString(R.string.poll_finish_at, Helper.dateToStringPoll(poll.getExpires_at())));
+                    }else{
+                        holder.remaining_time.setText(context.getString(R.string.poll_finish_in, Helper.dateDiffPoll(context, poll.getExpires_at())));
+                    }
                 } else {
                     holder.poll_container.setVisibility(View.GONE);
                 }
@@ -1113,9 +1153,25 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             holder.status_reblog_count.setTextColor(iconColor);
 
 
-            holder.status_account_displayname.setTextColor(ThemeHelper.getAttColor(context, R.attr.textHeader));
-            holder.status_toot_date.setTextColor(ThemeHelper.getAttColor(context, R.attr.textHeader));
-            Helper.changeDrawableColor(context, R.drawable.ic_repeat_head_toot, R.attr.textHeader);
+            int theme_text_header_2_line = prefs.getInt("theme_text_header_2_line", -1);
+            if (theme_text_header_2_line == -1) {
+                theme_text_header_2_line = ThemeHelper.getAttColor(context, R.attr.textHeader);
+            }
+
+            holder.status_account_displayname.setTextColor(theme_text_header_2_line);
+            holder.status_toot_date.setTextColor(theme_text_header_2_line);
+            if( holder.status_boosted_date != null ) {
+                holder.status_boosted_date.setTextColor(theme_text_header_2_line);
+            }
+            Helper.changeDrawableColor(context, R.drawable.ic_repeat_head_toot, theme_text_header_2_line);
+
+            int theme_text_header_1_line = prefs.getInt("theme_text_header_1_line", -1);
+            if (theme_text_header_1_line == -1) {
+                theme_text_header_1_line = ThemeHelper.getAttColor(context, R.attr.textColor);
+            }
+            holder.status_account_displayname_owner.setTextColor(theme_text_header_1_line);
+            Helper.changeDrawableColor(context, holder.cached_status, theme_text_header_1_line);
+
 
 
             if (holder.cached_status != null && holder.getItemViewType() == DISPLAYED_STATUS) {
@@ -1250,10 +1306,17 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             holder.spark_button_reblog.setMinimumWidth((int) Helper.convertDpToPixel((20 * iconSizePercent / 100 * scale + 0.5f), context));
 
             Drawable imgConversation = null;
-            if (type != RetrieveFeedsAsyncTask.Type.CONTEXT && ((status.getIn_reply_to_account_id() != null && status.getIn_reply_to_account_id().equals(status.getAccount().getId()))
-                    || (status.getReblog() != null && status.getReblog().getIn_reply_to_account_id() != null && status.getReblog().getIn_reply_to_account_id().equals(status.getReblog().getAccount().getId())))) {
-                imgConversation = ContextCompat.getDrawable(context, R.drawable.ic_conversation);
-                imgConversation.setBounds(0, 0, (int) (15 * iconSizePercent / 100 * scale + 0.5f), (int) (15 * iconSizePercent / 100 * scale + 0.5f));
+            if( social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA || social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) {
+                if (type != RetrieveFeedsAsyncTask.Type.CONTEXT && ((status.getIn_reply_to_account_id() != null && status.getIn_reply_to_account_id().equals(status.getAccount().getId()))
+                        || (status.getReblog() != null && status.getReblog().getIn_reply_to_account_id() != null && status.getReblog().getIn_reply_to_account_id().equals(status.getReblog().getAccount().getId())))) {
+                    imgConversation = ContextCompat.getDrawable(context, R.drawable.ic_conversation);
+                    imgConversation.setBounds(0, 0, (int) (15 * iconSizePercent / 100 * scale + 0.5f), (int) (15 * iconSizePercent / 100 * scale + 0.5f));
+                }
+            }else {
+                if (type != RetrieveFeedsAsyncTask.Type.CONTEXT && status.getIn_reply_to_id() != null) {
+                    imgConversation = ContextCompat.getDrawable(context, R.drawable.ic_conversation);
+                    imgConversation.setBounds(0, 0, (int) (15 * iconSizePercent / 100 * scale + 0.5f), (int) (15 * iconSizePercent / 100 * scale + 0.5f));
+                }
             }
             if (status.getReblog() != null) {
                 Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_repeat_head_toot);
@@ -1290,6 +1353,38 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 status.setImageFound(true);
                 Status.makeImage(context, this, status);
             }
+            if (instanceType != null && instanceType.compareTo("NITTER") == 0) {
+                holder.status_action_container.setVisibility(View.GONE);
+                if( holder.status_action_container_twitter != null){
+                    holder.status_action_container_twitter.setVisibility(View.VISIBLE);
+                    holder.status_action_container_twitter.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Intent sendIntent = new Intent(Intent.ACTION_SEND);
+                            sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
+                            String  url = status.getUrl();
+                            String extra_text;
+
+                            extra_text = (status.getReblog() != null) ? status.getReblog().getAccount().getAcct() : status.getAccount().getAcct();
+                            if (extra_text.split("@").length == 1)
+                                extra_text = "@" + extra_text + "@" + Helper.getLiveInstance(context);
+                            else
+                                extra_text = "@" + extra_text;
+                            extra_text += " " + Helper.shortnameToUnicode(":link:", true) + " " + url + "\r\n-\n";
+                            final String contentToot;
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                                contentToot = Html.fromHtml((status.getReblog() != null) ? status.getReblog().getContent() : status.getContent(), Html.FROM_HTML_MODE_LEGACY).toString();
+                            else
+                                //noinspection deprecation
+                                contentToot = Html.fromHtml((status.getReblog() != null) ? status.getReblog().getContent() : status.getContent()).toString();
+                            extra_text += contentToot;
+                            sendIntent.putExtra(Intent.EXTRA_TEXT, extra_text);
+                            sendIntent.setType("text/plain");
+                            context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
+                        }
+                    });
+                }
+            }
 
             holder.status_content.setOnTouchListener(new View.OnTouchListener() {
                 @Override
@@ -1317,7 +1412,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             });
             //Click on a conversation
 
-            if ((getItemViewType(viewHolder.getAdapterPosition()) == DISPLAYED_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == COMPACT_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == CONSOLE_STATUS)) {
+            if (( instanceType == null || instanceType.compareTo("NITTER") != 0) && (getItemViewType(viewHolder.getAdapterPosition()) == DISPLAYED_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == COMPACT_STATUS || getItemViewType(viewHolder.getAdapterPosition()) == CONSOLE_STATUS)) {
 
                 holder.status_spoiler.setOnClickListener(new View.OnClickListener() {
                     @Override
@@ -1513,7 +1608,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             }
 
 
-            holder.status_content.setMovementMethod(LinkMovementMethod.getInstance());
+            holder.status_content.setMovementMethod(LongClickLinkMovementMethod.getInstance());
             holder.status_spoiler.setMovementMethod(LinkMovementMethod.getInstance());
             if (truncate_toots_size > 0) {
                 holder.status_content.setMaxLines(truncate_toots_size);
@@ -1581,7 +1676,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 else
                     holder.status_account_displayname_owner.setText(status.getReblog().getAccount().getAcct().replace("@", ""));
                 holder.status_account_displayname_owner.setVisibility(View.VISIBLE);
-
+                if (holder.status_boosted_date != null) {
+                    holder.status_boosted_date.setText(Helper.dateDiff(context, status.getCreated_at()));
+                }
             } else {
                 accountForUrl = status.getAccount();
                 holder.status_account_displayname.setVisibility(View.GONE);
@@ -1608,7 +1705,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                     int matchStart = matcherAcct.start(1);
                     int matchEnd = matcherAcct.end();
                     if (wordtoSpan.length() >= matchEnd && matchStart < matchEnd) {
-                        wordtoSpan.setSpan(new ForegroundColorSpan(ThemeHelper.getAttColor(context, R.attr.textHeader)), matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+                        wordtoSpan.setSpan(new ForegroundColorSpan(theme_text_header_2_line), matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
                     }
 
                 }
@@ -1730,7 +1827,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                     fullDate = fullDate_tmp.substring(0, 1).toUpperCase() + fullDate_tmp.substring(1);
                 holder.status_toot_date.setText(fullDate);
             } else {
-                holder.status_toot_date.setText(Helper.dateDiff(context, status.getCreated_at()));
+                if (status.getReblog() != null)
+                    holder.status_toot_date.setText(Helper.dateDiff(context, status.getReblog().getCreated_at()));
+                else
+                    holder.status_toot_date.setText(Helper.dateDiff(context, status.getCreated_at()));
                 Helper.absoluteDateTimeReveal(context, holder.status_toot_date, status.getCreated_at());
             }
 
@@ -2029,11 +2129,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             if (status.isTranslationShown() && status.getContentSpanTranslated() != null) {
                 holder.status_content_translated.setText(status.getContentSpanTranslated(), TextView.BufferType.SPANNABLE);
                 holder.status_content_translated_container.setVisibility(View.VISIBLE);
-                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-                    holder.translation_border_view.setBackgroundResource(R.drawable.translation_border_android4);
-                } else {
-                    holder.translation_border_view.setBackgroundResource(R.drawable.translation_border);
-                }
+                holder.translation_border_view.setBackgroundResource(R.drawable.translation_border);
 
             } else { //Toot is not translated
                 holder.status_content_translated_container.setVisibility(View.GONE);
@@ -2055,11 +2151,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                             holder.spark_button_reblog.setVisibility(View.GONE);
                         }
                         break;
-                    case "public":
-                    case "unlisted":
-                        holder.status_reblog_count.setVisibility(View.VISIBLE);
-                        holder.spark_button_reblog.setVisibility(View.VISIBLE);
-                        break;
                     default:
                         holder.status_reblog_count.setVisibility(View.VISIBLE);
                         holder.spark_button_reblog.setVisibility(View.VISIBLE);
@@ -2303,6 +2394,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                 .into(holder.webview_preview_card);
                         holder.status_cardview.setVisibility(View.GONE);
                         holder.status_cardview_video.setVisibility(View.VISIBLE);
+                        String user_agent = sharedpreferences.getString(Helper.SET_CUSTOM_USER_AGENT, null);
+                        if( user_agent != null) {
+                            holder.status_cardview_webview.getSettings().setUserAgentString(user_agent);
+                        }
                         holder.status_cardview_webview.getSettings().setJavaScriptEnabled(true);
                         String html = card.getHtml();
                         String src = card.getUrl();
@@ -2508,8 +2603,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                         break;
                                 }
                             }
-                            if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA)
-                                holder.quick_reply_text.addTextChangedListener(textWatcher);
+                            holder.quick_reply_text.addTextChangedListener(textWatcher);
+
 
                         } else {
                             status.setShortReply(false);
@@ -2664,7 +2759,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                     toot.setMedia_attachments(status.getMedia_attachments());
                                     if (status.getSpoiler_text() != null && status.getSpoiler_text().length() > 0)
                                         toot.setSpoiler_text(status.getSpoiler_text().trim());
-                                    toot.setContent(status.getContent());
+                                    toot.setContent(context, status.getContent());
                                     toot.setVisibility(status.getVisibility());
                                     new RetrieveFeedsAsyncTask(context, RetrieveFeedsAsyncTask.Type.ONESTATUS, status.getIn_reply_to_id(), null, false, false, StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
                                 } else {
@@ -2674,7 +2769,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                     if (status.getSpoiler_text() != null && status.getSpoiler_text().length() > 0)
                                         toot.setSpoiler_text(status.getSpoiler_text().trim());
                                     toot.setVisibility(status.getVisibility());
-                                    toot.setContent(status.getContent());
+                                    toot.setContent(context, status.getContent());
                                     final SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
                                     long id = new StatusStoredDAO(context, db).insertStatus(toot, null);
                                     Intent intentToot = new Intent(context, TootActivity.class);
@@ -3065,7 +3160,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                                 toot.setMedia_attachments(status.getMedia_attachments());
                                                 if (status.getSpoiler_text() != null && status.getSpoiler_text().length() > 0)
                                                     toot.setSpoiler_text(status.getSpoiler_text().trim());
-                                                toot.setContent(status.getContent());
+                                                toot.setContent(context, status.getContent());
                                                 toot.setVisibility(status.getVisibility());
                                                 if (status.getPoll() != null) {
                                                     toot.setPoll(status.getPoll());
@@ -3080,7 +3175,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                                 if (status.getSpoiler_text() != null && status.getSpoiler_text().length() > 0)
                                                     toot.setSpoiler_text(status.getSpoiler_text().trim());
                                                 toot.setVisibility(status.getVisibility());
-                                                toot.setContent(status.getContent());
+                                                toot.setContent(context, status.getContent());
                                                 if (status.getPoll() != null) {
                                                     toot.setPoll(status.getPoll());
                                                 } else if (status.getReblog() != null && status.getReblog().getPoll() != null) {
@@ -3146,7 +3241,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                     }
                 });
 
-            } else {
+            } else if( instanceType == null || instanceType.compareTo("NITTER") != 0){
                 holder.status_account_profile.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -3219,6 +3314,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             }
         }
 
+
     }
 
     private void loadAttachments(final Status status, final ViewHolder holder, boolean blur) {
@@ -3240,21 +3336,29 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 holder.status_horizontal_document_container.setVisibility(View.VISIBLE);
             else
                 holder.status_document_container.setVisibility(View.VISIBLE);
-            if (attachments.size() == 1) {
-                if (!fullAttachement)
-                    holder.status_container2.setVisibility(View.GONE);
-                else {
-                    holder.status_prev1_h.setVisibility(View.VISIBLE);
-                    holder.status_prev2_h.setVisibility(View.GONE);
-                    holder.status_prev3_h.setVisibility(View.GONE);
-                    holder.status_prev4_h.setVisibility(View.GONE);
-                    holder.horizontal_second_image.setVisibility(View.GONE);
-                }
-                if (attachments.get(0).getUrl().trim().contains("missing.png"))
+            if (attachments.size() == 1 ) {
+                if ((status.getCard() == null || status.getCard().getType().compareTo("video") != 0|| status.getCard().getImage() == null)) {
+                    if (!fullAttachement)
+                        holder.status_container2.setVisibility(View.GONE);
+                    else {
+                        holder.status_prev1_h.setVisibility(View.VISIBLE);
+                        holder.status_prev2_h.setVisibility(View.GONE);
+                        holder.status_prev3_h.setVisibility(View.GONE);
+                        holder.status_prev4_h.setVisibility(View.GONE);
+                        holder.horizontal_second_image.setVisibility(View.GONE);
+                    }
+                    if (attachments.get(0).getUrl().trim().contains("missing.png")) {
+                        if (fullAttachement)
+                            holder.status_horizontal_document_container.setVisibility(View.GONE);
+                        else
+                            holder.status_document_container.setVisibility(View.GONE);
+                    }
+                }else {
                     if (fullAttachement)
                         holder.status_horizontal_document_container.setVisibility(View.GONE);
                     else
                         holder.status_document_container.setVisibility(View.GONE);
+                }
             } else if (attachments.size() == 2) {
                 if (!fullAttachement) {
                     holder.status_container2.setVisibility(View.VISIBLE);
@@ -3409,6 +3513,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                     .asBitmap()
                                     .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave)
                                     .thumbnail(0.1f)
+                                    //.override(640, 480)
                                     .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10)))
                                     .into(new SimpleTarget<Bitmap>() {
                                         @Override
@@ -3432,6 +3537,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                                     .asBitmap()
                                     .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave)
                                     .thumbnail(0.1f)
+                                   // .override(640, 480)
                                     .apply(new RequestOptions().transforms(new BlurTransformation(50, 3), new RoundedCorners(10)))
                                     .into(new SimpleTarget<Bitmap>() {
                                         @Override
@@ -3457,6 +3563,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                             Glide.with(imageView.getContext())
                                     .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave)
                                     .thumbnail(0.1f)
+                                    .override(640, 480)
                                     .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10)))
                                     .transition(DrawableTransitionOptions.withCrossFade())
                                     .into(imageView);
@@ -3464,6 +3571,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                             Glide.with(imageView.getContext())
                                     .load(!attachment.getType().toLowerCase().equals("audio") ? url : R.drawable.ic_audio_wave)
                                     .thumbnail(0.1f)
+                                    .override(640, 480)
                                     .apply(new RequestOptions().transforms(new BlurTransformation(50, 3), new RoundedCorners(10)))
                                     .transition(DrawableTransitionOptions.withCrossFade())
                                     .into(imageView);
@@ -3520,12 +3628,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 });
                 boolean long_press_media = sharedpreferences.getBoolean(Helper.SET_LONG_PRESS_MEDIA, true);
                 if (long_press_media) {
+                    String finalUrl = url;
                     imageView.setOnLongClickListener(new View.OnLongClickListener() {
                         @Override
                         public boolean onLongClick(View v) {
-                            String myDir = sharedpreferences.getString(Helper.SET_FOLDER_RECORD, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath());
-                            String fileName = URLUtil.guessFileName(attachment.getUrl(), null, null);
-                            Helper.download(context, myDir + "/" + fileName, attachment.getUrl());
+                            Helper.manageMove(context, finalUrl, false);
                             return true;
                         }
                     });
@@ -3819,19 +3926,17 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
 
         final String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
         String instance = Helper.getLiveInstance(context);
+
         int split_toot_size = sharedpreferences.getInt(Helper.SET_AUTOMATICALLY_SPLIT_TOOTS_SIZE + userId + instance, Helper.SPLIT_TOOT_SIZE);
         boolean split_toot = sharedpreferences.getBoolean(Helper.SET_AUTOMATICALLY_SPLIT_TOOTS + userId + instance, false);
-        String tootContent;
         if (toot_cw_content.getText() != null && toot_cw_content.getText().toString().trim().length() > 0)
             split_toot_size -= toot_cw_content.getText().toString().trim().length();
 
         if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA || !split_toot || (TootActivity.countLength(social, toot_content, toot_cw_content) < split_toot_size)) {
-            tootContent = toot_content.getText().toString().trim();
-            createAndSendToot(status, content_type, userId, instance);
+            createAndSendToot(status, null, content_type, userId, instance);
         } else {
             splitToot = Helper.splitToots(toot_content.getText().toString().trim(), split_toot_size, true);
             int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
-            tootContent = splitToot.get(0);
             stepSpliToot = 1;
             int style;
             if (theme == Helper.THEME_DARK) {
@@ -3881,7 +3986,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             builderInner.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
-                    createAndSendToot(status, content_type, userId, instance);
+                    createAndSendToot(status, splitToot.get(0), content_type, userId, instance);
                     dialog.dismiss();
                 }
             });
@@ -3891,7 +3996,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
 
     }
 
-    private void createAndSendToot(Status status, String content_type, String userId, String instance) {
+    private void createAndSendToot(Status status, String content, String content_type, String userId, String instance) {
         Status toot = new Status();
         if (content_type != null)
             toot.setContentType(content_type);
@@ -3902,7 +4007,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             toot.setSpoiler_text(toot_cw_content.getText().toString().trim());
         toot.setVisibility(status.getQuickReplyPrivacy());
         toot.setIn_reply_to_id(in_reply_to_status);
-        toot.setContent(status.getQuickReplyContent());
+        if( content == null) {
+            content = status.getQuickReplyContent();
+        }
+        toot.setContent(context, content);
         new PostStatusAsyncTask(context, social, account, toot, StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         status.setQuickReplyPrivacy(null);
         status.setQuickReplyContent(null);
@@ -4015,38 +4123,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             //noinspection ConstantConditions
             if (statusListAdapter.getItemAt(i) != null && statusListAdapter.getItemAt(i).getId().equals(status.getId())) {
                 try {
-                    if (statuses.get(i).isFocused()) {
-                        status.setFocused(true);
-                    }
-                    if (statuses.get(i).isFetchMore()) {
-                        status.setFetchMore(true);
-                    }
-                    if (statuses.get(i).isShortReply()) {
-                        status.setShortReply(true);
-                    }
-                    if (statuses.get(i).getQuickReplyContent() != null) {
-                        status.setQuickReplyContent(statuses.get(i).getQuickReplyContent());
-                    }
-                    if (statuses.get(i).getQuickReplyPrivacy() != null) {
-                        status.setQuickReplyPrivacy(statuses.get(i).getQuickReplyPrivacy());
-                    }
-                    if (statuses.get(i).isShowTopLine()) {
-                        status.setShowTopLine(true);
-                    }
-                    if (statuses.get(i).isShowBottomLine()) {
-                        status.setShowBottomLine(true);
-                    }
-                    statuses.set(i, status);
+                    statuses.get(i).setFavourites_count(status.getFavourites_count());
+                    statuses.get(i).setReblogs_count(status.getReblogs_count());
+                    statuses.get(i).setFavourited(status.isFavourited());
+                    statuses.get(i).setReblogged(status.isReblogged());
+                    statuses.get(i).setReplies_count(status.getReplies_count());
                     statusListAdapter.notifyItemChanged(i);
-                    /*if( mRecyclerView != null) {
-                        int finalI = i;
-                        mRecyclerView.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                statusListAdapter.notifyItemChanged(finalI);
-                            }
-                        });
-                    }*/
                 } catch (Exception ignored) {
                 }
                 break;
@@ -4054,51 +4136,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         }
     }
 
-    public void notifyStatusWithActionChanged(Status status) {
-        if (status == null)
-            return;
-        for (int i = 0; i < statusListAdapter.getItemCount(); i++) {
-            //noinspection ConstantConditions
-            if (statusListAdapter.getItemAt(i) != null && statusListAdapter.getItemAt(i).getId().equals(status.getId())) {
-                try {
-                    if (statuses.get(i).isFocused()) {
-                        status.setFocused(true);
-                    }
-                    if (statuses.get(i).isFetchMore()) {
-                        status.setFetchMore(true);
-                    }
-                    if (statuses.get(i).isShortReply()) {
-                        status.setShortReply(true);
-                    }
-                    if (statuses.get(i).getQuickReplyContent() != null) {
-                        status.setQuickReplyContent(statuses.get(i).getQuickReplyContent());
-                    }
-                    if (statuses.get(i).getQuickReplyPrivacy() != null) {
-                        status.setQuickReplyPrivacy(statuses.get(i).getQuickReplyPrivacy());
-                    }
-                    if (statuses.get(i).isShowTopLine()) {
-                        status.setShowTopLine(true);
-                    }
-                    if (statuses.get(i).isShowBottomLine()) {
-                        status.setShowBottomLine(true);
-                    }
-                    statuses.set(i, status);
-                    statusListAdapter.notifyItemChanged(i);
-                    /*if( mRecyclerView != null) {
-                        int finalI = i;
-                        mRecyclerView.post(new Runnable() {
-                            @Override
-                            public void run() {
-                                statusListAdapter.notifyItemChanged(finalI);
-                            }
-                        });
-                    }*/
-                } catch (Exception ignored) {
-                }
-                break;
-            }
-        }
-    }
 
     @Override
     public void onRetrieveImage(Status status, boolean fromTranslation) {
@@ -4134,13 +4171,15 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
         int trans = sharedpreferences.getInt(Helper.SET_TRANSLATOR, Helper.TRANS_YANDEX);
         MyTransL.translatorEngine et = MyTransL.translatorEngine.YANDEX;
-        String api_key = null;
+        String api_key;
 
 
         if (trans == Helper.TRANS_YANDEX) {
             et = MyTransL.translatorEngine.YANDEX;
         } else if (trans == Helper.TRANS_DEEPL) {
             et = MyTransL.translatorEngine.DEEPL;
+        } else if (trans == Helper.TRANS_SYSTRAN) {
+            et = MyTransL.translatorEngine.SYSTRAN;
         }
         final MyTransL myTransL = MyTransL.getInstance(et);
         myTransL.setObfuscation(true);
@@ -4150,6 +4189,9 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         } else if (trans == Helper.TRANS_DEEPL) {
             api_key = sharedpreferences.getString(Helper.SET_DEEPL_API_KEY, "");
             myTransL.setDeeplAPIKey(api_key);
+        } else if (trans == Helper.TRANS_SYSTRAN) {
+            api_key = sharedpreferences.getString(Helper.SET_SYSTRAN_API_KEY, "");
+            myTransL.setSystranAPIKey(api_key);
         }
 
 
@@ -4158,7 +4200,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
                 statusToTranslate = Html.fromHtml(status.getReblog() != null ? status.getReblog().getContent() : status.getContent(), Html.FROM_HTML_MODE_LEGACY).toString();
             else
-                //noinspection deprecation
                 statusToTranslate = Html.fromHtml(status.getReblog() != null ? status.getReblog().getContent() : status.getContent()).toString();
             //TODO: removes the replaceAll once fixed with the lib
             myTransL.translate(statusToTranslate, myTransL.getLocale(), new Results() {
@@ -4203,7 +4244,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             toot.setVisibility(statusForQuickReply.getQuickReplyPrivacy());
         }
         if (statusForQuickReply.getQuickReplyContent() != null) {
-            toot.setContent(statusForQuickReply.getQuickReplyContent().trim());
+            toot.setContent(context, statusForQuickReply.getQuickReplyContent().trim());
         }
 
         toot.setIn_reply_to_id(tootReply.getId());
@@ -4238,7 +4279,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         TextView status_content_translated;
         ConstraintLayout status_content_translated_container;
         TextView status_account_username;
-        TextView status_account_displayname, status_account_displayname_owner;
+        TextView status_account_displayname, status_account_displayname_owner, status_boosted_date;
         ImageView status_account_profile;
         ImageView status_account_profile_boost_by;
         ConstraintLayout status_boosted_by_info;
@@ -4281,6 +4322,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         ConstraintLayout main_container;
         TextView yandex_translate;
         ConstraintLayout status_action_container;
+        ConstraintLayout status_action_container_twitter;
         Button fetch_more;
         ImageView new_element;
         LinearLayout status_spoiler_mention_container;
@@ -4342,6 +4384,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             status_content_translated = itemView.findViewById(R.id.status_content_translated);
             status_account_username = itemView.findViewById(R.id.status_account_username);
             status_account_displayname = itemView.findViewById(R.id.status_account_displayname);
+            status_boosted_date = itemView.findViewById(R.id.status_boosted_date);
             status_account_displayname_owner = itemView.findViewById(R.id.status_account_displayname_owner);
             status_account_profile = itemView.findViewById(R.id.status_account_profile);
             status_account_profile_boost_by = itemView.findViewById(R.id.status_account_profile_boost_by);
@@ -4386,6 +4429,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             yandex_translate = itemView.findViewById(R.id.yandex_translate);
             new_element = itemView.findViewById(R.id.new_element);
             status_action_container = itemView.findViewById(R.id.status_action_container);
+            status_action_container_twitter = itemView.findViewById(R.id.status_action_container_twitter);
             status_spoiler_mention_container = itemView.findViewById(R.id.status_spoiler_mention_container);
             status_mention_spoiler = itemView.findViewById(R.id.status_mention_spoiler);
             status_cardview = itemView.findViewById(R.id.status_cardview);
@@ -4474,10 +4518,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE);
             boolean disableAnimatedEmoji = sharedpreferences.getBoolean(Helper.SET_DISABLE_ANIMATED_EMOJI, false);
             if (!disableAnimatedEmoji) {
-                if (BaseMainActivity.timer == null) {
-                    BaseMainActivity.timer = new Timer();
+                if (BaseActivity.timer == null) {
+                    BaseActivity.timer = new Timer();
                 }
-                BaseMainActivity.timer.schedule(new TimerTask() {
+                BaseActivity.timer.schedule(new TimerTask() {
                     @Override
                     public void run() {
                         mHandler.post(updateAnimatedEmoji);
diff --git a/app/src/main/java/app/fedilab/android/drawers/TrendsAdapter.java b/app/src/main/java/app/fedilab/android/drawers/TrendsAdapter.java
new file mode 100644
index 000000000..85701eac9
--- /dev/null
+++ b/app/src/main/java/app/fedilab/android/drawers/TrendsAdapter.java
@@ -0,0 +1,176 @@
+package app.fedilab.android.drawers;
+/* Copyright 2019 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.core.content.ContextCompat;
+
+import com.github.mikephil.charting.charts.LineChart;
+import com.github.mikephil.charting.components.Description;
+import com.github.mikephil.charting.components.XAxis;
+import com.github.mikephil.charting.components.YAxis;
+import com.github.mikephil.charting.data.Entry;
+import com.github.mikephil.charting.data.LineData;
+import com.github.mikephil.charting.data.LineDataSet;
+import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import app.fedilab.android.R;
+import app.fedilab.android.activities.HashTagActivity;
+import app.fedilab.android.client.Entities.Trends;
+import app.fedilab.android.client.Entities.TrendsHistory;
+import app.fedilab.android.helper.Helper;
+
+
+/**
+ * Created by Thomas on 30/11/2019.
+ * Adapter for Trends results
+ */
+public class TrendsAdapter extends BaseAdapter {
+
+    private List<Trends> trends;
+    private Context context;
+    private LayoutInflater layoutInflater;
+
+    public TrendsAdapter(Context context, List<Trends> trends) {
+        this.context = context;
+        this.trends = (trends != null) ? trends : new ArrayList<>();
+        layoutInflater = LayoutInflater.from(context);
+    }
+
+
+    @Override
+    public int getCount() {
+        return trends.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return trends.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+
+    @Override
+    public View getView(final int position, View convertView, ViewGroup parent) {
+
+
+        final Trends trend = (Trends) getItem(position);
+        final ViewHolderTag holder;
+        View v = convertView;
+        if (v == null) {
+            v = layoutInflater.inflate(R.layout.drawer_tag_trends, parent, false);
+            holder = new ViewHolderTag();
+            holder.trends_container = v.findViewById(R.id.trends_container);
+            holder.tag_name = v.findViewById(R.id.tag_name);
+            holder.tag_stats = v.findViewById(R.id.tag_stats);
+            holder.count = v.findViewById(R.id.count);
+            holder.chart = v.findViewById(R.id.chart);
+            v.setTag(holder);
+        } else {
+            holder = (ViewHolderTag) v.getTag();
+        }
+        List<TrendsHistory> trendsHistory = trend.getTrendsHistory();
+        int people = 0;
+        int days = 0;
+        int uses = 0;
+
+        LinkedHashMap<Long, Integer> tendency = new LinkedHashMap<>();
+        for(TrendsHistory _th : trendsHistory) {
+            people += _th.getAccounts();
+            days ++;
+            uses += _th.getUses();
+            tendency.put(_th.getDays(), _th.getUses());
+        }
+        people = people / days;
+        uses = uses / days;
+        holder.count.setText(String.valueOf(uses));
+        holder.tag_stats.setText(context.getString(R.string.talking_about, people));
+        holder.tag_name.setText(String.format("#%s", trend.getName()));
+        holder.trends_container.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(context, HashTagActivity.class);
+                Bundle b = new Bundle();
+                b.putString("tag", trend.getName().trim());
+                intent.putExtras(b);
+                context.startActivity(intent);
+            }
+        });
+
+
+        List<Entry> trendsEntry = new ArrayList<>();
+
+        Iterator it = tendency.entrySet().iterator();
+        while (it.hasNext()) {
+            Map.Entry pair = (Map.Entry) it.next();
+            trendsEntry.add(0, new Entry((long) pair.getKey(), (int) pair.getValue()));
+            it.remove();
+        }
+        LineDataSet dataTrending = new LineDataSet(trendsEntry,context.getString(R.string.trending));
+        dataTrending.setColor(ContextCompat.getColor(context, R.color.cyanea_accent_reference));
+        dataTrending.setValueTextColor(ContextCompat.getColor(context, R.color.cyanea_accent_reference));
+        dataTrending.setFillColor(ContextCompat.getColor(context, R.color.cyanea_accent_reference));
+        dataTrending.setDrawValues(false);
+        dataTrending.setDrawFilled(true);
+        dataTrending.setDrawCircles(false);
+        dataTrending.setDrawCircleHole(false);
+        holder.chart.getAxis(YAxis.AxisDependency.LEFT).setEnabled(false);
+        holder.chart.getAxis(YAxis.AxisDependency.RIGHT).setEnabled(false);
+        holder.chart.getXAxis().setEnabled(false);
+        holder.chart.getLegend().setEnabled(false);
+        holder.chart.setTouchEnabled(false);
+        dataTrending.setMode(LineDataSet.Mode.CUBIC_BEZIER);
+        Description description = holder.chart.getDescription();
+        description.setEnabled(false);
+        List<ILineDataSet> dataSets = new ArrayList<>();
+
+
+        dataSets.add(dataTrending);
+
+        LineData data = new LineData(dataSets);
+        holder.chart.setData(data);
+        holder.chart.invalidate();
+        return v;
+    }
+
+
+
+    private class ViewHolderTag {
+        LinearLayout trends_container;
+        TextView tag_name;
+        TextView tag_stats;
+        TextView count;
+        LineChart chart;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java
index 68ec5415c..0f6aae9dc 100644
--- a/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/ColorSettingsFragment.java
@@ -178,12 +178,16 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
                                 if (key.compareTo("base_theme") == 0) {
                                     SharedPreferences sharedpreferences = getActivity().getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
                                     SharedPreferences.Editor appEditor = sharedpreferences.edit();
-                                    appEditor.putInt(Helper.SET_THEME, Integer.parseInt(value));
+                                    if( value != null && value.matches("-?\\d+")) {
+                                        appEditor.putInt(Helper.SET_THEME, Integer.parseInt(value));
+                                    }
                                     appEditor.commit();
                                 } else if (key.compareTo("pref_color_navigation_bar") == 0 || key.compareTo("pref_color_status_bar") == 0) {
-                                    editor.putBoolean(key, Boolean.valueOf(value));
+                                    editor.putBoolean(key, Boolean.parseBoolean(value));
                                 } else {
-                                    editor.putInt(key, Integer.valueOf(value));
+                                    if( value != null && value.matches("-?\\d+")) {
+                                        editor.putInt(key, Integer.parseInt(value));
+                                    }
                                 }
                             }
                         }
@@ -246,10 +250,16 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
         PreferenceScreen preferenceScreen = getPreferenceScreen();
         FragmentActivity context = getActivity();
         assert context != null;
+        if( preferenceScreen == null){
+            Toasty.error(getActivity(), getString(R.string.toast_error), Toasty.LENGTH_SHORT).show();
+            return;
+        }
         SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
         ListPreference pref_theme_picker = (ListPreference) findPreference("pref_theme_picker");
         Preference theme_link_color = findPreference("theme_link_color");
         Preference theme_boost_header_color = findPreference("theme_boost_header_color");
+        Preference theme_text_header_1_line = findPreference("theme_text_header_1_line");
+        Preference theme_text_header_2_line = findPreference("theme_text_header_2_line");
         Preference theme_statuses_color = findPreference("theme_statuses_color");
         Preference theme_icons_color = findPreference("theme_icons_color");
         Preference theme_text_color = findPreference("theme_text_color");
@@ -261,9 +271,11 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
         Preference pref_import = findPreference("pref_import");
         Preference pref_export = findPreference("pref_export");
         Preference reset_pref = findPreference("reset_pref");
-        if (!sharedpreferences.getBoolean("use_custom_theme", false)) {
+        if (!sharedpreferences.getBoolean("use_custom_theme", false) ) {
             preferenceScreen.removePreference(theme_link_color);
             preferenceScreen.removePreference(theme_boost_header_color);
+            preferenceScreen.removePreference(theme_text_header_1_line);
+            preferenceScreen.removePreference(theme_text_header_2_line);
             preferenceScreen.removePreference(theme_statuses_color);
             preferenceScreen.removePreference(theme_icons_color);
             preferenceScreen.removePreference(theme_text_color);
@@ -361,6 +373,8 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
         SharedPreferences.Editor editor = prefs.edit();
         editor.remove("theme_boost_header_color");
+        editor.remove("theme_text_header_1_line");
+        editor.remove("theme_text_header_2_line");
         editor.remove("theme_statuses_color");
         editor.remove("theme_link_color");
         editor.remove("theme_icons_color");
@@ -370,7 +384,7 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
         editor.remove("theme_accent");
         editor.remove("theme_text_color");
         editor.remove("theme_primary");
-        editor.remove("use_custom_theme");
+        //editor.remove("use_custom_theme");
         editor.commit();
     }
 
@@ -387,6 +401,8 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
             builder.append("value").append(',');
             builder.append('\n');
             int theme_boost_header_color = prefs.getInt("theme_boost_header_color", -1);
+            int theme_text_header_1_line = prefs.getInt("theme_text_header_1_line", -1);
+            int theme_text_header_2_line = prefs.getInt("theme_text_header_2_line", -1);
             int theme_statuses_color = prefs.getInt("theme_statuses_color", -1);
             int theme_link_color = prefs.getInt("theme_link_color", -1);
             int theme_icons_color = prefs.getInt("theme_icons_color", -1);
@@ -408,6 +424,14 @@ public class ColorSettingsFragment extends PreferenceFragmentCompat implements S
             builder.append(theme_boost_header_color).append(',');
             builder.append('\n');
 
+            builder.append("theme_text_header_1_line").append(',');
+            builder.append(theme_text_header_1_line).append(',');
+            builder.append('\n');
+
+            builder.append("theme_text_header_2_line").append(',');
+            builder.append(theme_text_header_2_line).append(',');
+            builder.append('\n');
+
             builder.append("theme_statuses_color").append(',');
             builder.append(theme_statuses_color).append(',');
             builder.append('\n');
diff --git a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
index a2ff09e6e..99c8cd88c 100644
--- a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
@@ -68,9 +68,11 @@ import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Set;
 
 import app.fedilab.android.R;
@@ -118,6 +120,7 @@ import static app.fedilab.android.fragments.ContentSettingsFragment.type.INTERFA
 import static app.fedilab.android.fragments.ContentSettingsFragment.type.LANGUAGE;
 import static app.fedilab.android.fragments.ContentSettingsFragment.type.MENU;
 import static app.fedilab.android.fragments.ContentSettingsFragment.type.NOTIFICATIONS;
+import static app.fedilab.android.fragments.ContentSettingsFragment.type.PRIVACY;
 import static app.fedilab.android.fragments.ContentSettingsFragment.type.TIMELINES;
 
 public class ContentSettingsFragment extends Fragment implements OnRetrieveRemoteAccountInterface, OnRetrieveRelationshipInterface {
@@ -263,7 +266,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
     }
 
     @Override
-    public void onRetrieveRemoteAccount(Results results) {
+    public void onRetrieveRemoteAccount(Results results, boolean devAccount) {
         if (results == null) {
             return;
         }
@@ -378,6 +381,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
         LinearLayout settings_admin = rootView.findViewById(R.id.settings_admin);
         LinearLayout settings_interface = rootView.findViewById(R.id.settings_interface);
         LinearLayout settings_compose = rootView.findViewById(R.id.settings_compose);
+        LinearLayout settings_privacy = rootView.findViewById(R.id.settings_privacy);
         LinearLayout settings_hide_menu = rootView.findViewById(R.id.settings_hide_menu);
         LinearLayout settings_translation = rootView.findViewById(R.id.settings_translation);
 
@@ -392,6 +396,8 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
             settings_interface.setVisibility(View.VISIBLE);
         } else if (type == COMPOSE) {
             settings_compose.setVisibility(View.VISIBLE);
+        } else if (type == PRIVACY) {
+            settings_privacy.setVisibility(View.VISIBLE);
         } else if (type == MENU) {
             settings_hide_menu.setVisibility(View.VISIBLE);
         } else if (type == LANGUAGE) {
@@ -504,7 +510,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
 
         Spinner set_attachment_group = rootView.findViewById(R.id.set_attachment_group);
         String[] attachment_labels = {context.getString(R.string.set_attachment_always), context.getString(R.string.set_attachment_wifi), context.getString(R.string.set_attachment_ask)};
-        ArrayAdapter<String> adapterAttachment = new ArrayAdapter<>(context,
+        ArrayAdapter<String> adapterAttachment = new ArrayAdapter<>(Objects.requireNonNull(getActivity()),
                 android.R.layout.simple_spinner_dropdown_item, attachment_labels);
         set_attachment_group.setAdapter(adapterAttachment);
         int attachmentAction = sharedpreferences.getInt(Helper.SET_ATTACHMENT_ACTION, Helper.ATTACHMENT_ALWAYS);
@@ -552,8 +558,8 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
 
         //Video mode
         final Spinner video_mode_spinner = rootView.findViewById(R.id.set_video_mode);
-        ArrayAdapter<CharSequence> video_mode_spinnerAdapter = ArrayAdapter.createFromResource(getContext(),
-                R.array.settings_video_mode, android.R.layout.simple_spinner_item);
+        ArrayAdapter<CharSequence> video_mode_spinnerAdapter = ArrayAdapter.createFromResource(Objects.requireNonNull(getActivity()),
+                R.array.settings_video_mode, android.R.layout.simple_spinner_dropdown_item);
         video_mode_spinner.setAdapter(video_mode_spinnerAdapter);
         if (videoMode == Helper.VIDEO_MODE_TORRENT)
             videoMode = Helper.VIDEO_MODE_DIRECT;
@@ -715,6 +721,8 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
                     store = Helper.SET_YANDEX_API_KEY;
                 else if (translatore == Helper.TRANS_DEEPL)
                     store = Helper.SET_DEEPL_API_KEY;
+                else if (translatore == Helper.TRANS_SYSTRAN)
+                    store = Helper.SET_SYSTRAN_API_KEY;
                 if (store != null)
                     if (s != null && s.length() > 0)
                         editor.putString(store, s.toString().trim());
@@ -915,6 +923,46 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
         });
 
 
+
+        TextView set_user_agent = rootView.findViewById(R.id.set_user_agent);
+        String user_agent = sharedpreferences.getString(Helper.SET_CUSTOM_USER_AGENT, null);
+
+        if (user_agent != null) {
+            set_user_agent.setText(user_agent);
+        }
+        set_user_agent.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+            }
+            @Override
+            public void afterTextChanged(Editable s) {
+                SharedPreferences.Editor editor = sharedpreferences.edit();
+                if (s.toString().trim().length() > 0) {
+                    editor.putString(Helper.SET_CUSTOM_USER_AGENT, s.toString().toLowerCase().trim());
+                } else {
+                    editor.putString(Helper.SET_CUSTOM_USER_AGENT, null);
+                }
+                editor.apply();
+            }
+        });
+
+
+        final SwitchCompat set_utm_parameters = rootView.findViewById(R.id.set_utm_parameters);
+        boolean utm_parameters = sharedpreferences.getBoolean(Helper.SET_FILTER_UTM, true);
+        set_utm_parameters.setChecked(utm_parameters);
+
+        set_utm_parameters.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                SharedPreferences.Editor editor = sharedpreferences.edit();
+                editor.putBoolean(Helper.SET_FILTER_UTM, set_utm_parameters.isChecked());
+                editor.apply();
+            }
+        });
+
         TextView set_nitter_host = rootView.findViewById(R.id.set_nitter_host);
         boolean nitter = sharedpreferences.getBoolean(Helper.SET_NITTER, false);
         final SwitchCompat set_nitter = rootView.findViewById(R.id.set_nitter);
@@ -1138,7 +1186,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
 
         Spinner set_mode = rootView.findViewById(R.id.set_mode);
         String[] mode_labels = {context.getString(R.string.set_normal), context.getString(R.string.set_compact), context.getString(R.string.set_console)};
-        ArrayAdapter<String> adapterMode = new ArrayAdapter<>(context,
+        ArrayAdapter<String> adapterMode = new ArrayAdapter<>(Objects.requireNonNull(getActivity()),
                 android.R.layout.simple_spinner_dropdown_item, mode_labels);
         set_mode.setAdapter(adapterMode);
         boolean compact_mode = sharedpreferences.getBoolean(Helper.SET_COMPACT_MODE, false);
@@ -1303,11 +1351,12 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
         boolean notify = sharedpreferences.getBoolean(Helper.SET_NOTIFY, true);
         final SwitchCompat switchCompatNotify = rootView.findViewById(R.id.set_notify);
         switchCompatNotify.setChecked(notify);
-        final LinearLayout notification_settings = rootView.findViewById(R.id.notification_settings);
-        if (notify)
-            notification_settings.setVisibility(View.VISIBLE);
-        else
-            notification_settings.setVisibility(View.GONE);
+        final LinearLayout notification_container = rootView.findViewById(R.id.notification_container);
+        if (notify) {
+            notification_container.setVisibility(View.VISIBLE);
+        } else {
+            notification_container.setVisibility(View.GONE);
+        }
         switchCompatNotify.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
@@ -1316,9 +1365,15 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
                 editor.putBoolean(Helper.SET_NOTIFY, isChecked);
                 editor.apply();
                 if (isChecked) {
-                    notification_settings.setVisibility(View.VISIBLE);
+                    notification_container.setVisibility(View.VISIBLE);
+                    notification_container.setVisibility(View.VISIBLE);
+                    Helper.startStreaming(context);
+                }else {
+                    context.sendBroadcast(new Intent(context, StopLiveNotificationReceiver.class));
+                    context.sendBroadcast(new Intent(context, StopDelayedNotificationReceiver.class));
+                    ApplicationJob.cancelAllJob(NotificationsSyncJob.NOTIFICATION_REFRESH);
+                    notification_container.setVisibility(View.GONE);
                 }
-                Helper.startStreaming(context);
             }
         });
 
@@ -1326,7 +1381,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
         //Live notification mode
         final Spinner set_live_type = rootView.findViewById(R.id.set_live_type);
         String[] labels = {context.getString(R.string.live_notif), context.getString(R.string.live_delayed), context.getString(R.string.no_live_notif)};
-        ArrayAdapter<String> adapterLive = new ArrayAdapter<>(context,
+        ArrayAdapter<String> adapterLive = new ArrayAdapter<>(Objects.requireNonNull(getActivity()),
                 android.R.layout.simple_spinner_dropdown_item, labels);
 
         LinearLayout live_notif_per_account = rootView.findViewById(R.id.live_notif_per_account);
@@ -1353,43 +1408,34 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 if (liveNotificationCount > 0) {
                     SharedPreferences.Editor editor = sharedpreferences.edit();
+
+                    context.sendBroadcast(new Intent(context, StopLiveNotificationReceiver.class));
+                    context.sendBroadcast(new Intent(context, StopDelayedNotificationReceiver.class));
+                    ApplicationJob.cancelAllJob(NotificationsSyncJob.NOTIFICATION_REFRESH);
                     switch (position) {
                         case Helper.NOTIF_LIVE:
                             editor.putBoolean(Helper.SET_LIVE_NOTIFICATIONS, true);
                             editor.putBoolean(Helper.SET_DELAYED_NOTIFICATIONS, false);
                             live_notif_per_account.setVisibility(View.VISIBLE);
-                            editor.apply();
-                            context.sendBroadcast(new Intent(context, StopDelayedNotificationReceiver.class));
-                            ApplicationJob.cancelAllJob(NotificationsSyncJob.NOTIFICATION_REFRESH);
+                            editor.commit();
+                            set_live_type_indication.setText(R.string.live_notif_indication);
+                            Helper.startStreaming(context);
                             break;
                         case Helper.NOTIF_DELAYED:
                             editor.putBoolean(Helper.SET_LIVE_NOTIFICATIONS, false);
                             editor.putBoolean(Helper.SET_DELAYED_NOTIFICATIONS, true);
                             live_notif_per_account.setVisibility(View.VISIBLE);
-                            context.sendBroadcast(new Intent(context, StopLiveNotificationReceiver.class));
-                            editor.apply();
-                            ApplicationJob.cancelAllJob(NotificationsSyncJob.NOTIFICATION_REFRESH);
+                            set_live_type_indication.setText(R.string.set_live_type_indication);
+                            editor.commit();
+                            Helper.startStreaming(context);
                             break;
                         case Helper.NOTIF_NONE:
                             editor.putBoolean(Helper.SET_LIVE_NOTIFICATIONS, false);
                             editor.putBoolean(Helper.SET_DELAYED_NOTIFICATIONS, false);
-                            live_notif_per_account.setVisibility(View.GONE);
-                            context.sendBroadcast(new Intent(context, StopLiveNotificationReceiver.class));
-                            context.sendBroadcast(new Intent(context, StopDelayedNotificationReceiver.class));
-                            NotificationsSyncJob.schedule(false);
-                            editor.apply();
-                            break;
-                    }
-                    Helper.startStreaming(context);
-                    switch (Helper.liveNotifType(context)) {
-                        case Helper.NOTIF_LIVE:
-                            set_live_type_indication.setText(R.string.live_notif_indication);
-                            break;
-                        case Helper.NOTIF_DELAYED:
-                            set_live_type_indication.setText(R.string.set_live_type_indication);
-                            break;
-                        case Helper.NOTIF_NONE:
+                            editor.commit();
                             set_live_type_indication.setText(R.string.no_live_indication);
+                            live_notif_per_account.setVisibility(View.GONE);
+                            NotificationsSyncJob.schedule(false);
                             break;
                     }
                 } else {
@@ -1605,6 +1651,38 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
         });
 
 
+        // Media Description Timeout
+        SeekBar medDescTimeoutSeekBar = rootView.findViewById(R.id.set_med_desc_timeout);
+        final TextView set_med_desc_timeout_value = rootView.findViewById(R.id.set_med_desc_timeout_value);
+
+        medDescTimeoutSeekBar.setMax(30);
+
+        int medDescTimeout = sharedpreferences.getInt(Helper.SET_MED_DESC_TIMEOUT, 3);
+
+        medDescTimeoutSeekBar.setProgress(medDescTimeout);
+        set_med_desc_timeout_value.setText(String.valueOf(medDescTimeout));
+
+        medDescTimeoutSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+            }
+
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+
+                set_med_desc_timeout_value.setText(String.valueOf(progress));
+
+                SharedPreferences.Editor editor = sharedpreferences.edit();
+                editor.putInt(Helper.SET_MED_DESC_TIMEOUT, progress);
+                editor.apply();
+            }
+        });
+
+
         LinearLayout toot_visibility_container = rootView.findViewById(R.id.toot_visibility_container);
         SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
 
@@ -1691,7 +1769,9 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
 
         boolean allow_live_notifications = sharedpreferences.getBoolean(Helper.SET_ALLOW_STREAM + userId + instance, true);
         TextView set_allow_live_notifications_title = rootView.findViewById(R.id.set_allow_live_notifications_title);
-        set_allow_live_notifications_title.setText(context.getString(R.string.set_allow_live_notifications, account.getAcct() + "@" + account.getInstance()));
+        if (account != null) {
+            set_allow_live_notifications_title.setText(context.getString(R.string.set_allow_live_notifications, account.getAcct() + "@" + account.getInstance()));
+        }
         final SwitchCompat set_allow_live_notifications = rootView.findViewById(R.id.set_allow_live_notifications);
         set_allow_live_notifications.setChecked(allow_live_notifications);
         set_allow_live_notifications.setOnClickListener(new View.OnClickListener() {
@@ -1784,10 +1864,15 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
 
         //Translators
         final Spinner translation_layout_spinner = rootView.findViewById(R.id.translation_layout_spinner);
-        ArrayAdapter<CharSequence> adapterTrans = ArrayAdapter.createFromResource(getContext(),
-                R.array.settings_translation, android.R.layout.simple_spinner_item);
-        translation_layout_spinner.setAdapter(adapterTrans);
 
+
+        List<String> translatorsList = Arrays.asList(getResources().getStringArray(R.array.settings_translation));
+        ArrayList<String> trans = new ArrayList<>(translatorsList);
+        trans.add(getString(R.string.no));
+
+        ArrayAdapter<String> adapterTrans = new ArrayAdapter<>(getActivity(),
+                android.R.layout.simple_spinner_dropdown_item, trans);
+        translation_layout_spinner.setAdapter(adapterTrans);
         int positionSpinnerTrans;
         switch (sharedpreferences.getInt(Helper.SET_TRANSLATOR, Helper.TRANS_YANDEX)) {
             case Helper.TRANS_YANDEX:
@@ -1800,8 +1885,13 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
                 your_api_key.setVisibility(View.VISIBLE);
                 your_api_key.setText(sharedpreferences.getString(Helper.SET_DEEPL_API_KEY, ""));
                 break;
-            case Helper.TRANS_NONE:
+            case Helper.TRANS_SYSTRAN:
                 positionSpinnerTrans = 2;
+                your_api_key.setVisibility(View.VISIBLE);
+                your_api_key.setText(sharedpreferences.getString(Helper.SET_SYSTRAN_API_KEY, ""));
+                break;
+            case Helper.TRANS_NONE:
+                positionSpinnerTrans = 3;
                 your_api_key.setVisibility(View.GONE);
                 break;
             default:
@@ -1819,30 +1909,30 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
                         case 0:
                             your_api_key.setVisibility(View.VISIBLE);
                             editor.putInt(Helper.SET_TRANSLATOR, Helper.TRANS_YANDEX);
-                            editor.apply();
-                            if (sharedpreferences.getString(Helper.SET_DEEPL_API_KEY, null) != null)
-                                your_api_key.setText(sharedpreferences.getString(Helper.SET_DEEPL_API_KEY, ""));
+                            editor.commit();
+                            your_api_key.setText(sharedpreferences.getString(Helper.SET_YANDEX_API_KEY, ""));
+
                             break;
                         case 1:
                             your_api_key.setVisibility(View.VISIBLE);
                             editor.putInt(Helper.SET_TRANSLATOR, Helper.TRANS_DEEPL);
-                            editor.apply();
-                            if (sharedpreferences.getString(Helper.SET_YANDEX_API_KEY, null) != null)
-                                your_api_key.setText(sharedpreferences.getString(Helper.SET_YANDEX_API_KEY, null));
+                            editor.commit();
+                            your_api_key.setText(sharedpreferences.getString(Helper.SET_DEEPL_API_KEY, ""));
                             break;
                         case 2:
+                            your_api_key.setVisibility(View.VISIBLE);
+                            editor.putInt(Helper.SET_TRANSLATOR, Helper.TRANS_SYSTRAN);
+                            editor.commit();
+                            your_api_key.setText(sharedpreferences.getString(Helper.SET_SYSTRAN_API_KEY, ""));
+                            break;
+                        case 3:
                             your_api_key.setVisibility(View.GONE);
                             set_trans_forced.isChecked();
                             editor.putBoolean(Helper.SET_TRANS_FORCED, false);
                             editor.putInt(Helper.SET_TRANSLATOR, Helper.TRANS_NONE);
-                            editor.apply();
+                            editor.commit();
                             break;
                     }
-                    if (getActivity() != null)
-                        getActivity().recreate();
-                    Intent intent = new Intent(context, MainActivity.class);
-                    intent.putExtra(Helper.INTENT_ACTION, Helper.BACK_TO_SETTINGS);
-                    startActivity(intent);
                 } else {
                     countTrans++;
                 }
@@ -2092,8 +2182,8 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
 
 
         final Spinner action_notification = rootView.findViewById(R.id.action_notification);
-        ArrayAdapter<CharSequence> adapterAction = ArrayAdapter.createFromResource(getContext(),
-                R.array.action_notification, android.R.layout.simple_spinner_item);
+        ArrayAdapter<CharSequence> adapterAction = ArrayAdapter.createFromResource(Objects.requireNonNull(getActivity()),
+                R.array.action_notification, android.R.layout.simple_spinner_dropdown_item);
         action_notification.setAdapter(adapterAction);
         int positionNotificationAntion;
         switch (sharedpreferences.getInt(Helper.SET_NOTIFICATION_ACTION, Helper.ACTION_ACTIVE)) {
@@ -2227,7 +2317,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
             ledLabel.setEnabled(true);
             led_colour_spinner.setEnabled(true);
 
-            ArrayAdapter<CharSequence> adapterLEDColour = ArrayAdapter.createFromResource(getContext(), R.array.led_colours, android.R.layout.simple_spinner_item);
+            ArrayAdapter<CharSequence> adapterLEDColour = ArrayAdapter.createFromResource(Objects.requireNonNull(getActivity()), R.array.led_colours, android.R.layout.simple_spinner_dropdown_item);
             led_colour_spinner.setAdapter(adapterLEDColour);
             int positionSpinnerLEDColour = (sharedpreferences.getInt(Helper.SET_LED_COLOUR, Helper.LED_COLOUR));
             led_colour_spinner.setSelection(positionSpinnerLEDColour);
@@ -2258,6 +2348,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
         }
 
         SwitchCompat nav_news = rootView.findViewById(R.id.nav_news);
+        SwitchCompat nav_trends = rootView.findViewById(R.id.nav_trends);
         SwitchCompat nav_list = rootView.findViewById(R.id.nav_list);
         SwitchCompat nav_scheduled = rootView.findViewById(R.id.nav_scheduled);
         SwitchCompat nav_archive = rootView.findViewById(R.id.nav_archive);
@@ -2276,6 +2367,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
             mainMenu = new MainMenuItem();
         }
         nav_news.setChecked(mainMenu.isNav_news());
+        nav_trends.setChecked(mainMenu.isNav_trends());
         nav_list.setChecked(mainMenu.isNav_list());
         nav_scheduled.setChecked(mainMenu.isNav_scheduled());
         nav_archive.setChecked(mainMenu.isNav_archive());
@@ -2292,6 +2384,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
         validate.setOnClickListener(view -> {
             MainMenuItem mainMenuItem = new MainMenuItem();
             mainMenuItem.setNav_news(nav_news.isChecked());
+            mainMenuItem.setNav_trends(nav_trends.isChecked());
             mainMenuItem.setNav_list(nav_list.isChecked());
             mainMenuItem.setNav_scheduled(nav_scheduled.isChecked());
             mainMenuItem.setNav_archive(nav_archive.isChecked());
@@ -2340,7 +2433,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
         String currentLanguage = sharedpreferences.getString(Helper.SET_DEFAULT_LOCALE_NEW, Helper.localeToStringStorage(Locale.getDefault()));
         Locale currentLocale = Helper.restoreLocaleFromString(currentLanguage);
         final Spinner set_change_locale = rootView.findViewById(R.id.set_change_locale);
-        ArrayAdapter<String> adapterLocale = new ArrayAdapter<>(context,
+        ArrayAdapter<String> adapterLocale = new ArrayAdapter<>(Objects.requireNonNull(getActivity()),
                 android.R.layout.simple_spinner_dropdown_item, Helper.getLocales(context));
 
         set_change_locale.setAdapter(adapterLocale);
@@ -2595,6 +2688,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
         NOTIFICATIONS,
         INTERFACE,
         COMPOSE,
+        PRIVACY,
         LANGUAGE,
         MENU,
         COLORS
diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java
index 0d76f7abd..921528b2d 100644
--- a/app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java
@@ -127,8 +127,8 @@ public class DisplayFiltersFragment extends Fragment implements OnFilterActionIn
                     CheckBox context_whole_word = dialogView.findViewById(R.id.context_whole_word);
                     CheckBox context_drop = dialogView.findViewById(R.id.context_drop);
                     Spinner filter_expire = dialogView.findViewById(R.id.filter_expire);
-                    ArrayAdapter<CharSequence> adapterResize = ArrayAdapter.createFromResource(Objects.requireNonNull(getContext()),
-                            R.array.filter_expire, android.R.layout.simple_spinner_item);
+                    ArrayAdapter<CharSequence> adapterResize = ArrayAdapter.createFromResource(Objects.requireNonNull(getActivity()),
+                            R.array.filter_expire, android.R.layout.simple_spinner_dropdown_item);
                     filter_expire.setAdapter(adapterResize);
                     final int[] expire = {-1};
                     filter_expire.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java
index f5006553b..6c684f623 100644
--- a/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java
@@ -24,6 +24,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.provider.ContactsContract;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -31,15 +32,23 @@ import android.widget.RelativeLayout;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.ListPreloader;
+import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader;
+import com.bumptech.glide.util.FixedPreloadSizeProvider;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import app.fedilab.android.R;
@@ -49,6 +58,7 @@ import app.fedilab.android.asynctasks.RetrieveNotificationsAsyncTask;
 import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
 import app.fedilab.android.client.APIResponse;
 import app.fedilab.android.client.Entities.Account;
+import app.fedilab.android.client.Entities.Attachment;
 import app.fedilab.android.client.Entities.Notification;
 import app.fedilab.android.client.Entities.Status;
 import app.fedilab.android.drawers.NotificationsListAdapter;
@@ -117,6 +127,13 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve
         }
         RelativeLayout main_timeline_container;
         lv_notifications = rootView.findViewById(R.id.lv_notifications);
+        ListPreloader.PreloadSizeProvider sizeProvider =
+                new FixedPreloadSizeProvider(640, 480);
+        ListPreloader.PreloadModelProvider modelProvider = new MyPreloadModelProvider();
+        RecyclerViewPreloader<ContactsContract.CommonDataKinds.Photo> preloader =
+                new RecyclerViewPreloader<>(
+                        Glide.with(context), modelProvider, sizeProvider, 20 );
+        lv_notifications.addOnScrollListener(preloader);
         mainLoader = rootView.findViewById(R.id.loader);
         nextElementLoader = rootView.findViewById(R.id.loading_next_notifications);
         textviewNoAction = rootView.findViewById(R.id.no_action);
@@ -500,6 +517,31 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve
         }
     }
 
+    private class MyPreloadModelProvider implements ListPreloader.PreloadModelProvider<String> {
+        @Override
+        @NonNull
+        public List<String> getPreloadItems(int position) {
+            Status status = notifications.get(position).getStatus();
+            if (status == null || status.getMedia_attachments() == null || status.getMedia_attachments().size() ==0) {
+                return Collections.emptyList();
+            }
+            List<String> preloaded_urls = new ArrayList<>();
+            for(Attachment attachment: status.getMedia_attachments()) {
+                preloaded_urls.add(attachment.getPreview_url());
+            }
+            return  preloaded_urls;
+        }
+
+        @Nullable
+        @Override
+        public RequestBuilder<?> getPreloadRequestBuilder(@NonNull String url) {
+            return Glide.with(context)
+                    .load(url)
+                    .override(640, 480);
+        }
+
+    }
+
 
     public enum Type {
         ALL,
diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java
index 8990cb590..e65d55606 100644
--- a/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java
@@ -27,11 +27,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
+import android.widget.Spinner;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -40,7 +42,6 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.jaredrummler.materialspinner.MaterialSpinner;
 
 import net.gotev.uploadservice.MultipartUploadRequest;
 import net.gotev.uploadservice.ServerResponse;
@@ -55,6 +56,7 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import app.fedilab.android.R;
 import app.fedilab.android.activities.MainActivity;
@@ -89,8 +91,8 @@ public class DisplayPlaylistsFragment extends Fragment implements OnPlaylistActi
     private RelativeLayout textviewNoAction;
     private HashMap<Integer, String> privacyToSend;
     private HashMap<String, String> channelToSend;
-    private MaterialSpinner set_upload_channel;
-    private MaterialSpinner set_upload_privacy;
+    private Spinner set_upload_channel;
+    private Spinner set_upload_privacy;
     private HashMap<String, String> channels;
 
     @Override
@@ -394,7 +396,7 @@ public class DisplayPlaylistsFragment extends Fragment implements OnPlaylistActi
 
         channelToSend = new HashMap<>();
         channelToSend.put(channelName[0], channelId[0]);
-        ArrayAdapter<String> adapterChannel = new ArrayAdapter<>(context,
+        ArrayAdapter<String> adapterChannel = new ArrayAdapter<>(Objects.requireNonNull(getActivity()),
                 android.R.layout.simple_spinner_dropdown_item, channelName);
         set_upload_channel.setAdapter(adapterChannel);
 
@@ -421,14 +423,14 @@ public class DisplayPlaylistsFragment extends Fragment implements OnPlaylistActi
             i++;
         }
 
-        ArrayAdapter<String> adapterPrivacies = new ArrayAdapter<>(context,
+        ArrayAdapter<String> adapterPrivacies = new ArrayAdapter<>(Objects.requireNonNull(getActivity()),
                 android.R.layout.simple_spinner_dropdown_item, privaciesA);
         set_upload_privacy.setAdapter(adapterPrivacies);
 
         //Manage privacies
-        set_upload_privacy.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
+        set_upload_privacy.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
-            public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 LinkedHashMap<Integer, String> privaciesCheck = new LinkedHashMap<>(peertubeInformation.getPrivacies());
                 Iterator it = privaciesCheck.entrySet().iterator();
                 int i = 0;
@@ -443,11 +445,16 @@ public class DisplayPlaylistsFragment extends Fragment implements OnPlaylistActi
                     i++;
                 }
             }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
         });
         //Manage languages
-        set_upload_channel.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
+        set_upload_channel.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
-            public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 LinkedHashMap<String, String> channelsCheck = new LinkedHashMap<>(channels);
                 Iterator it = channelsCheck.entrySet().iterator();
                 int i = 0;
@@ -462,6 +469,11 @@ public class DisplayPlaylistsFragment extends Fragment implements OnPlaylistActi
                     i++;
                 }
             }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
         });
     }
 }
diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java
index ac0bedece..afc31130f 100644
--- a/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java
@@ -20,15 +20,17 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -36,7 +38,8 @@ import app.fedilab.android.R;
 import app.fedilab.android.asynctasks.RetrieveSearchAsyncTask;
 import app.fedilab.android.client.API;
 import app.fedilab.android.client.APIResponse;
-import app.fedilab.android.drawers.SearchTagsAdapter;
+import app.fedilab.android.client.Entities.Trends;
+import app.fedilab.android.drawers.TrendsAdapter;
 import app.fedilab.android.interfaces.OnRetrieveSearchInterface;
 import es.dmoral.toasty.Toasty;
 
@@ -49,14 +52,13 @@ public class DisplaySearchTagsFragment extends Fragment implements OnRetrieveSea
 
 
     private Context context;
-    private SearchTagsAdapter searchTagsAdapter;
-    private List<String> tags;
+    private TrendsAdapter trendsAdapter;
+    private List<Trends> tags;
     private String search;
-    private RecyclerView lv_search_tags;
+    private ListView lv_search_tags;
     private RelativeLayout loader;
     private RelativeLayout textviewNoAction;
     private RelativeLayout loading_next_tags;
-    private LinearLayoutManager mLayoutManager;
     private boolean flag_loading;
     private SwipeRefreshLayout swipeRefreshLayout;
     private String max_id;
@@ -88,8 +90,6 @@ public class DisplaySearchTagsFragment extends Fragment implements OnRetrieveSea
             Toasty.error(context, getString(R.string.toast_error_search), Toast.LENGTH_LONG).show();
         }
 
-        mLayoutManager = new LinearLayoutManager(context);
-        lv_search_tags.setLayoutManager(mLayoutManager);
         int c1 = getResources().getColor(R.color.cyanea_accent);
         int c2 = getResources().getColor(R.color.cyanea_primary_dark);
         int c3 = getResources().getColor(R.color.cyanea_primary);
@@ -100,36 +100,37 @@ public class DisplaySearchTagsFragment extends Fragment implements OnRetrieveSea
         swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                int size = tags.size();
                 tags.clear();
                 tags = new ArrayList<>();
                 max_id = "0";
-                searchTagsAdapter.notifyItemRangeRemoved(0, size);
+                trendsAdapter.notifyDataSetChanged();
                 if (search != null) {
                     new RetrieveSearchAsyncTask(context, search, API.searchType.TAGS, null, DisplaySearchTagsFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
                 }
             }
         });
-        lv_search_tags.addOnScrollListener(new RecyclerView.OnScrollListener() {
-            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-                int firstVisibleItem = mLayoutManager.findFirstVisibleItemPosition();
-                if (dy > 0) {
-                    int visibleItemCount = mLayoutManager.getChildCount();
-                    int totalItemCount = mLayoutManager.getItemCount();
-                    if (firstVisibleItem + visibleItemCount == totalItemCount && context != null) {
-                        if (!flag_loading) {
-                            flag_loading = true;
-                            if (search != null) {
-                                new RetrieveSearchAsyncTask(context, search, API.searchType.TAGS, max_id, DisplaySearchTagsFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-                            }
-                            loading_next_tags.setVisibility(View.VISIBLE);
+        lv_search_tags.setOnScrollListener(new AbsListView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(AbsListView view, int scrollState) {
+
+            }
+
+            @Override
+            public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+                if (firstVisibleItem + visibleItemCount == totalItemCount && context != null) {
+                    if (!flag_loading) {
+                        flag_loading = true;
+                        if (search != null) {
+                            new RetrieveSearchAsyncTask(context, search, API.searchType.TAGS, max_id, DisplaySearchTagsFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
                         }
-                    } else {
-                        loading_next_tags.setVisibility(View.GONE);
+                        loading_next_tags.setVisibility(View.VISIBLE);
                     }
+                } else {
+                    loading_next_tags.setVisibility(View.GONE);
                 }
             }
         });
+
         if (search != null) {
             new RetrieveSearchAsyncTask(context, search, API.searchType.TAGS, null, DisplaySearchTagsFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         }
@@ -138,8 +139,8 @@ public class DisplaySearchTagsFragment extends Fragment implements OnRetrieveSea
 
 
     public void scrollToTop() {
-        if (lv_search_tags != null && searchTagsAdapter != null) {
-            lv_search_tags.setAdapter(searchTagsAdapter);
+        if (lv_search_tags != null && trendsAdapter != null) {
+            lv_search_tags.setAdapter(trendsAdapter);
         }
     }
 
@@ -158,7 +159,7 @@ public class DisplaySearchTagsFragment extends Fragment implements OnRetrieveSea
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NotNull Context context) {
         super.onAttach(context);
         this.context = context;
     }
@@ -167,7 +168,7 @@ public class DisplaySearchTagsFragment extends Fragment implements OnRetrieveSea
     @Override
     public void onRetrieveSearch(APIResponse apiResponse) {
 
-        searchTagsAdapter = new SearchTagsAdapter(tags);
+        trendsAdapter = new TrendsAdapter(context, tags);
         loader.setVisibility(View.GONE);
         swipeRefreshLayout.setRefreshing(false);
         if (apiResponse.getError() != null) {
@@ -185,14 +186,14 @@ public class DisplaySearchTagsFragment extends Fragment implements OnRetrieveSea
             max_id = "0";
         max_id = String.valueOf(Integer.valueOf(max_id) + 20);
         lv_search_tags.setVisibility(View.VISIBLE);
-        List<String> newTags = new ArrayList<>();
+        List<Trends> newTags = new ArrayList<>();
         if (apiResponse.getResults() != null) {
-            newTags = apiResponse.getResults().getHashtags();
+            newTags = apiResponse.getResults().getTrends();
         }
         tags.addAll(newTags);
-        SearchTagsAdapter searchTagsAdapter = new SearchTagsAdapter(tags);
-        lv_search_tags.setAdapter(searchTagsAdapter);
-        searchTagsAdapter.notifyDataSetChanged();
+        TrendsAdapter trendsAdapter = new TrendsAdapter(context, tags);
+        lv_search_tags.setAdapter(trendsAdapter);
+        trendsAdapter.notifyDataSetChanged();
         if (newTags.size() == 0 && tags.size() == 0)
             textviewNoAction.setVisibility(View.VISIBLE);
         else
diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
index 8a76cd9b6..786da6001 100644
--- a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java
@@ -25,6 +25,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.provider.ContactsContract;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -34,13 +35,21 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.ListPreloader;
+import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader;
+import com.bumptech.glide.util.FixedPreloadSizeProvider;
+
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -56,6 +65,7 @@ import app.fedilab.android.asynctasks.RetrievePeertubeSearchAsyncTask;
 import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
 import app.fedilab.android.client.APIResponse;
 import app.fedilab.android.client.Entities.Account;
+import app.fedilab.android.client.Entities.Attachment;
 import app.fedilab.android.client.Entities.Conversation;
 import app.fedilab.android.client.Entities.Peertube;
 import app.fedilab.android.client.Entities.RemoteInstance;
@@ -130,6 +140,35 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
     public DisplayStatusFragment() {
     }
 
+
+    private class MyPreloadModelProvider implements ListPreloader.PreloadModelProvider<String> {
+        @Override
+        @NonNull
+        public List<String> getPreloadItems(int position) {
+            if( statuses == null || statuses.size() == 0){
+                return Collections.emptyList();
+            }
+            Status status = statuses.get(position);
+            if (status.getMedia_attachments() == null || status.getMedia_attachments().size() ==0) {
+                return Collections.emptyList();
+            }
+            List<String> preloaded_urls = new ArrayList<>();
+            for(Attachment attachment: status.getMedia_attachments()) {
+                preloaded_urls.add(attachment.getPreview_url());
+            }
+            return  preloaded_urls;
+        }
+
+        @Nullable
+        @Override
+        public RequestBuilder<?> getPreloadRequestBuilder(@NonNull String url) {
+            return Glide.with(context)
+                    .load(url)
+                    .override(640, 480);
+        }
+
+    }
+
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View rootView = inflater.inflate(R.layout.fragment_status, container, false);
@@ -189,6 +228,13 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                 c1, c2, c1
         );
         lv_status = rootView.findViewById(R.id.lv_status);
+        ListPreloader.PreloadSizeProvider sizeProvider =
+                new FixedPreloadSizeProvider(640, 480);
+        ListPreloader.PreloadModelProvider modelProvider = new MyPreloadModelProvider();
+        RecyclerViewPreloader<ContactsContract.CommonDataKinds.Photo> preloader =
+                new RecyclerViewPreloader<>(
+                        Glide.with(context), modelProvider, sizeProvider, 20 );
+        lv_status.addOnScrollListener(preloader);
         mainLoader = rootView.findViewById(R.id.loader);
         nextElementLoader = rootView.findViewById(R.id.loading_next_status);
         textviewNoAction = rootView.findViewById(R.id.no_action);
@@ -206,7 +252,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
             lastReadToot = sharedpreferences.getString(Helper.LAST_READ_TOOT_ID + userId + instance, null);
             lastReadTootDate = Helper.stringToDate(context, sharedpreferences.getString(Helper.LAST_READ_TOOT_DATE + userId + instance, null));
         }
-        if (instanceType == null || instanceType.equals("MASTODON") || instanceType.equals("MISSKEY") || instanceType.equals("GNU")) {
+        if (instanceType == null || instanceType.equals("MASTODON") || instanceType.equals("MISSKEY") || instanceType.equals("GNU") || instanceType.equals("NITTER")) {
             if (type == RetrieveFeedsAsyncTask.Type.TAG && tag != null) {
                 BaseMainActivity.displayPeertube = null;
                 List<TagTimeline> tagTimelines = new SearchDAO(context, db).getTimelineInfo(tag);
@@ -217,7 +263,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                 }
             } else {
                 BaseMainActivity.displayPeertube = null;
-                statusListAdapter = new StatusListAdapter(type, targetedId, isOnWifi, this.statuses);
+                statusListAdapter = new StatusListAdapter(instanceType, type, targetedId, isOnWifi, this.statuses);
                 lv_status.setAdapter(statusListAdapter);
             }
         } else if (instanceType.equals("PEERTUBE")) {
@@ -257,7 +303,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                     Status status = b.getParcelable("status");
                     String delete_statuses_from = b.getString("delete_statuses_for_id", null);
                     if (status != null && statusListAdapter != null) {
-                        statusListAdapter.notifyStatusWithActionChanged(status);
+                        statusListAdapter.notifyStatusChanged(status);
                     } else if (delete_statuses_from != null) {
                         List<Status> statusesToRemove = new ArrayList<>();
                         for (Status status_temp : statuses) {
@@ -580,7 +626,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
             }
             //Let's deal with statuses
             if (statuses != null && statuses.size() > 0) {
-                if (statusListAdapter != null && (instanceType.equals("MASTODON") || instanceType.equals("MISSKEY") || instanceType.equals("GNU"))) {
+                if (statusListAdapter != null && (instanceType.equals("MASTODON") || instanceType.equals("NITTER") || instanceType.equals("MISSKEY") || instanceType.equals("GNU"))) {
                     this.statuses.addAll(statuses);
                     statusListAdapter.notifyItemRangeInserted(previousPosition, statuses.size());
                 } else if (artListAdapter != null && instanceType.equals("ART")) {
@@ -736,7 +782,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
 
         if (type == RetrieveFeedsAsyncTask.Type.HOME || type == RetrieveFeedsAsyncTask.Type.PF_HOME)
             asyncTask = new RetrieveFeedsAfterBookmarkAsyncTask(context, null, false, DisplayStatusFragment.this).execute();
-        if (type == RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE)
+        if (type == RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE && (instanceType == null || instanceType.compareTo("NITTER") != 0))
             asyncTask = new RetrieveMissingFeedsAsyncTask(context, remoteInstance, sinceId, type, DisplayStatusFragment.this).execute();
         else if (type == RetrieveFeedsAsyncTask.Type.TAG)
             asyncTask = new RetrieveMissingFeedsAsyncTask(context, tag, sinceId, type, DisplayStatusFragment.this).execute();
@@ -831,15 +877,8 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
 
 
     public void scrollToTop() {
-        if (lv_status != null && instanceType != null) {
-            if (statusListAdapter != null && (instanceType.equals("MASTODON") || instanceType.equals("MISSKEY") || instanceType.equals("GNU")))
-                lv_status.setAdapter(statusListAdapter);
-            else if (pixelfedListAdapter != null && instanceType.equals("PIXELFED"))
-                lv_status.setAdapter(pixelfedListAdapter);
-            else if (artListAdapter != null && instanceType.equals("ART"))
-                lv_status.setAdapter(artListAdapter);
-            else if (peertubeAdapater != null && instanceType.equals("PEERTUBE"))
-                lv_status.setAdapter(peertubeAdapater);
+        if( mLayoutManager != null ) {
+            mLayoutManager.scrollToPositionWithOffset(0, 0);
         }
     }
 
@@ -870,6 +909,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
             switch (instanceType) {
                 case "MASTODON":
                 case "MISSKEY":
+                case "NITTER":
                 case "GNU":
                     statusListAdapter.notifyItemRangeChanged(0, this.statuses.size());
                     break;
@@ -899,7 +939,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                         Status status = it.next();
                         for (Status status1 : statuses) {
                             if (status.getConversationId() != null && status.getConversationId().equals(status1.getConversationId())) {
-                                if (instanceType.equals("MASTODON") || instanceType.equals("MISSKEY") || instanceType.equals("GNU"))
+                                if (instanceType.equals("MASTODON") || instanceType.equals("MISSKEY") || instanceType.equals("NITTER")|| instanceType.equals("GNU"))
                                     statusListAdapter.notifyItemRemoved(position);
                                 else if (instanceType.equals("PIXELFED"))
                                     pixelfedListAdapter.notifyItemRemoved(position);
@@ -938,7 +978,8 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                     }
                 }
             }
-            if (statusListAdapter != null && (instanceType.equals("MASTODON") || instanceType.equals("MISSKEY") || instanceType.equals("GNU")))
+
+            if (statusListAdapter != null && (instanceType.equals("MASTODON") || instanceType.equals("MISSKEY") || instanceType.equals("NITTER") || instanceType.equals("GNU")))
                 statusListAdapter.notifyItemRangeInserted(0, inserted);
             else if (pixelfedListAdapter != null && instanceType.equals("PIXELFED"))
                 pixelfedListAdapter.notifyItemRangeInserted(0, inserted);
@@ -1083,7 +1124,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
                     if (context instanceof BaseMainActivity) {
                         boolean remember_position_home = sharedpreferences.getBoolean(Helper.SET_REMEMBER_POSITION_HOME, true);
                         if (remember_position_home)
-                            asyncTask = new RetrieveFeedsAsyncTask(context, type, initialBookMark, DisplayStatusFragment.this).execute();
+                            asyncTask = new RetrieveFeedsAsyncTask(context, type, initialBookMark, true,DisplayStatusFragment.this).execute();
                         else
                             asyncTask = new RetrieveFeedsAsyncTask(context, type, null, DisplayStatusFragment.this).execute();
                     }
@@ -1165,6 +1206,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn
             switch (instanceType) {
                 case "MASTODON":
                 case "MISSKEY":
+                case "NITTER":
                 case "GNU":
                     statusListAdapter.notifyItemRangeRemoved(0, lenght);
                     break;
diff --git a/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java b/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java
index 22635d514..d758e73c5 100644
--- a/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/MediaSliderFragment.java
@@ -294,6 +294,10 @@ public class MediaSliderFragment extends Fragment implements MediaPlayer.OnCompl
                 webview_video.setWebChromeClient(mastalabWebChromeClient);
                 webview_video.getSettings().setDomStorageEnabled(true);
                 webview_video.getSettings().setAppCacheEnabled(true);
+                String user_agent = sharedpreferences.getString(Helper.SET_CUSTOM_USER_AGENT, null);
+                if( user_agent != null) {
+                    webview_video.getSettings().setUserAgentString(user_agent);
+                }
                 webview_video.getSettings().setMediaPlaybackRequiresUserGesture(false);
                 webview_video.setWebViewClient(new MastalabWebViewClient((Activity) context));
                 webview_video.loadUrl(attachment.getUrl());
diff --git a/app/src/main/java/app/fedilab/android/fragments/SettingsPeertubeFragment.java b/app/src/main/java/app/fedilab/android/fragments/SettingsPeertubeFragment.java
index b881d605d..5cffdfa7c 100644
--- a/app/src/main/java/app/fedilab/android/fragments/SettingsPeertubeFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/SettingsPeertubeFragment.java
@@ -28,6 +28,8 @@ import android.widget.Spinner;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
+import java.util.Objects;
+
 import app.fedilab.android.R;
 import app.fedilab.android.helper.Helper;
 
@@ -56,8 +58,8 @@ public class SettingsPeertubeFragment extends Fragment {
 
         //Video mode
         final Spinner video_mode_spinner = rootView.findViewById(R.id.set_video_mode);
-        ArrayAdapter<CharSequence> video_mode_spinnerAdapter = ArrayAdapter.createFromResource(getContext(),
-                R.array.settings_video_mode, android.R.layout.simple_spinner_item);
+        ArrayAdapter<CharSequence> video_mode_spinnerAdapter = ArrayAdapter.createFromResource(Objects.requireNonNull(getActivity()),
+                R.array.settings_video_mode, android.R.layout.simple_spinner_dropdown_item);
         video_mode_spinner.setAdapter(video_mode_spinnerAdapter);
         if (videoMode == Helper.VIDEO_MODE_TORRENT)
             videoMode = Helper.VIDEO_MODE_DIRECT;
diff --git a/app/src/main/java/app/fedilab/android/fragments/TabLayoutTootsFragment.java b/app/src/main/java/app/fedilab/android/fragments/TabLayoutTootsFragment.java
index fe54ff24f..d4f4219df 100644
--- a/app/src/main/java/app/fedilab/android/fragments/TabLayoutTootsFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/TabLayoutTootsFragment.java
@@ -145,6 +145,11 @@ public class TabLayoutTootsFragment extends Fragment {
             }
         }
 
+        @Override
+        public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
+
+        }
+
         @Override
         public int getCount() {
             return mNumOfTabs;
diff --git a/app/src/main/java/app/fedilab/android/helper/CrossActions.java b/app/src/main/java/app/fedilab/android/helper/CrossActions.java
index 50cf6e353..fe150bb5e 100644
--- a/app/src/main/java/app/fedilab/android/helper/CrossActions.java
+++ b/app/src/main/java/app/fedilab/android/helper/CrossActions.java
@@ -37,17 +37,20 @@ import java.util.List;
 
 import app.fedilab.android.R;
 import app.fedilab.android.activities.BaseActivity;
+import app.fedilab.android.activities.MainActivity;
 import app.fedilab.android.activities.ShowAccountActivity;
 import app.fedilab.android.activities.ShowConversationActivity;
 import app.fedilab.android.activities.TootActivity;
 import app.fedilab.android.asynctasks.PostActionAsyncTask;
 import app.fedilab.android.asynctasks.RetrieveFeedsAsyncTask;
+import app.fedilab.android.asynctasks.UpdateAccountInfoAsyncTask;
 import app.fedilab.android.client.API;
 import app.fedilab.android.client.APIResponse;
 import app.fedilab.android.client.Entities.Account;
 import app.fedilab.android.client.Entities.Mention;
 import app.fedilab.android.client.Entities.Results;
 import app.fedilab.android.client.Entities.Status;
+import app.fedilab.android.client.GNUAPI;
 import app.fedilab.android.drawers.AccountsSearchAdapter;
 import app.fedilab.android.drawers.PixelfedListAdapter;
 import app.fedilab.android.drawers.StatusListAdapter;
@@ -94,7 +97,7 @@ public class CrossActions {
                         for (Account account : accountstmp) {
                             String mentionAcct = (mention.getAcct().contains("@")) ? mention.getAcct() : mention.getAcct() + "@" + currentAccount.getInstance();
                             if ((account.getAcct() + "@" + account.getInstance()).equals(mentionAcct) && !addedAccount.contains(account.getId() + "|" + account.getAcct())) {
-                                if (account.getSocial() == null || account.getSocial().equals("MASTODON") || account.getSocial().equals("PLEROMA"))
+                                if (account.getSocial() == null || account.getSocial().equals("MASTODON") || account.getSocial().equals("PLEROMA") || account.getSocial().equals("FRIENDICA"))
                                     accounts.add(account);
                             }
                         }
@@ -103,7 +106,7 @@ public class CrossActions {
                         Account tootOwner = status.getAccount();
                         String mentionAcct = (tootOwner.getAcct().contains("@")) ? tootOwner.getAcct() : tootOwner.getAcct() + "@" + currentAccount.getInstance();
                         if ((account.getAcct() + "@" + account.getInstance()).equals(mentionAcct) && !addedAccount.contains(account.getId() + "|" + account.getAcct())) {
-                            if (account.getSocial() == null || account.getSocial().equals("MASTODON") || account.getSocial().equals("PLEROMA"))
+                            if (account.getSocial() == null || account.getSocial().equals("MASTODON") || account.getSocial().equals("PLEROMA")|| account.getSocial().equals("FRIENDICA"))
                                 accounts.add(account);
                         }
                     }
@@ -329,7 +332,7 @@ public class CrossActions {
 
             @Override
             protected Void doInBackground(Void... voids) {
-                API api = new API(contextReference.get(), account.getInstance(), account.getToken());
+
                 String url = remoteAccount.getUrl();
                 if (url == null) {
                     if (remoteAccount.getHost() != null && remoteAccount.getAcct().split("@").length > 1) //Peertube compatibility
@@ -337,7 +340,14 @@ public class CrossActions {
                     else
                         url = "https://" + remoteAccount.getInstance() + "/@" + remoteAccount.getAcct();
                 }
-                APIResponse apiResponse = api.search2(url, null, null);
+                APIResponse apiResponse;
+                if(MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
+                    GNUAPI api = new GNUAPI(contextReference.get(), account.getInstance(), account.getToken());
+                    apiResponse = api.search(remoteAccount.getAcct()+"@"+remoteAccount.getInstance());
+                } else {
+                    API api = new API(contextReference.get(), account.getInstance(), account.getToken());
+                    apiResponse = api.search2(url, null, null);
+                }
                 response = apiResponse.getResults();
                 return null;
             }
@@ -414,8 +424,15 @@ public class CrossActions {
 
             @Override
             protected Void doInBackground(Void... voids) {
-                API api = new API(contextReference.get(), account.getInstance(), account.getToken());
-                APIResponse apiResponse = api.search(remoteStatus.getUrl());
+
+                APIResponse apiResponse;
+                if(MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) {
+                    GNUAPI api = new GNUAPI(contextReference.get(), account.getInstance(), account.getToken());
+                    apiResponse = api.search2(remoteStatus.getUrl());
+                } else {
+                    API api = new API(contextReference.get(), account.getInstance(), account.getToken());
+                    apiResponse = api.search(remoteStatus.getUrl());
+                }
                 response = apiResponse.getResults();
                 return null;
             }
@@ -626,7 +643,7 @@ public class CrossActions {
                                 protected Void doInBackground(Void... voids) {
 
 
-                                    API api = new API(contextReference.get(), account.getInstance(), account.getToken());
+
                                     String uri;
                                     if (status.getReblog() != null) {
                                         if (status.getReblog().getUri().startsWith("http"))
@@ -639,9 +656,18 @@ public class CrossActions {
                                         else
                                             uri = status.getUrl();
                                     }
-                                    APIResponse search = api.search(uri);
-                                    if (search != null && search.getResults() != null) {
-                                        remoteStatuses = search.getResults().getStatuses();
+                                    if( account.getSocial().compareTo("FRIENDICA") != 0 ) {
+                                        API api = new API(contextReference.get(), account.getInstance(), account.getToken());
+                                        APIResponse search = api.search(uri);
+                                        if (search != null && search.getResults() != null) {
+                                            remoteStatuses = search.getResults().getStatuses();
+                                        }
+                                    }else{
+                                        GNUAPI api = new GNUAPI(contextReference.get(), account.getInstance(), account.getToken());
+                                        APIResponse search = api.search2(uri);
+                                        if (search != null && search.getResults() != null) {
+                                            remoteStatuses = search.getResults().getStatuses();
+                                        }
                                     }
                                     return null;
                                 }
diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index 24f4c2bef..062f3b960 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -58,6 +58,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.Environment;
+import android.os.Looper;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.provider.OpenableColumns;
@@ -161,6 +162,7 @@ import java.net.InetSocketAddress;
 import java.net.PasswordAuthentication;
 import java.net.Proxy;
 import java.net.URISyntaxException;
+import java.nio.channels.FileChannel;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.Security;
@@ -182,6 +184,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Random;
 import java.util.TimeZone;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -238,6 +241,7 @@ import static app.fedilab.android.activities.BaseMainActivity.mutedAccount;
 import static app.fedilab.android.activities.BaseMainActivity.regex_home;
 import static app.fedilab.android.activities.BaseMainActivity.regex_local;
 import static app.fedilab.android.activities.BaseMainActivity.regex_public;
+import static app.fedilab.android.activities.BaseMainActivity.social;
 import static app.fedilab.android.helper.Helper.NotifType.MENTION;
 import static app.fedilab.android.sqlite.StatusCacheDAO.ARCHIVE_CACHE;
 import static app.fedilab.android.sqlite.StatusCacheDAO.BOOKMARK_CACHE;
@@ -337,7 +341,9 @@ public class Helper {
     public static final String SET_TIME_TO = "set_time_to";
     public static final String SET_AUTO_STORE = "set_auto_store";
     public static final String SET_POPUP_PUSH = "set_popup_push_new";
+    public static final String SET_POPUP_RELEASE_NOTES = "set_popup_push_release_notes";
     public static final String SET_NSFW_TIMEOUT = "set_nsfw_timeout";
+    public static final String SET_MED_DESC_TIMEOUT = "set_med_desc_timeout";
     public static final String SET_MEDIA_URLS = "set_media_urls";
     public static final String SET_TEXT_SIZE = "set_text_size";
     public static final String SET_ICON_SIZE = "set_icon_size";
@@ -414,7 +420,8 @@ public class Helper {
 
     public static final int TRANS_YANDEX = 0;
     public static final int TRANS_DEEPL = 1;
-    public static final int TRANS_NONE = 2;
+    public static final int TRANS_NONE = 3;
+    public static final int TRANS_SYSTRAN = 2;
 
     public static final int ACTION_SILENT = 0;
     public static final int ACTION_ACTIVE = 1;
@@ -439,6 +446,7 @@ public class Helper {
     public static final String SET_INVIDIOUS_HOST = "set_invidious_host";
     public static final String DEFAULT_INVIDIOUS_HOST = "invidio.us";
 
+    public static final String SET_FILTER_UTM = "set_filter_utm";
     public static final String SET_NITTER = "set_nitter";
     public static final String SET_NITTER_HOST = "set_nitter_host";
     public static final String DEFAULT_NITTER_HOST = "nitter.net";
@@ -473,6 +481,7 @@ public class Helper {
     public static final String SET_ART_WITH_NSFW = "set_art_with_nsfw";
     public static final String SET_SECURITY_PROVIDER = "set_security_provider";
     public static final String SET_ALLOW_STREAM = "set_allow_stream";
+    public static final String SET_CUSTOM_USER_AGENT = "set_custom_user_agent";
     //End points
     public static final String EP_AUTHORIZE = "/oauth/authorize";
 
@@ -510,9 +519,10 @@ public class Helper {
     public static final String RECEIVE_UPDATE_TOPBAR = "receive_update_topbar";
     //User agent
     //public static final String USER_AGENT = "Fedilab/"+ BuildConfig.VERSION_NAME + " Android/"+ Build.VERSION.RELEASE;
-    public static final String USER_AGENT = System.getProperty("http.agent");
+    public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 6.1; rv:60.0) Gecko/20100101 Firefox/60.0";
     public static final String SET_YANDEX_API_KEY = "set_yandex_api_key";
     public static final String SET_DEEPL_API_KEY = "set_deepl_api_key";
+    public static final String SET_SYSTRAN_API_KEY = "set_systran_api_key";
     public static final String VIDEO_ID = "video_id_update";
     public static final Pattern urlPattern = Pattern.compile(
             "(?i)\\b((?:[a-z][\\w-]+:(?:/{1,3}|[a-z0-9%])|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,10}/)(?:[^\\s()<>]+|\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\))+(?:\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:'\".,<>?«»“”‘’]))",
@@ -1000,6 +1010,33 @@ public class Helper {
         }
     }
 
+    /***
+     * Returns a String depending of the date
+     * @param context Context
+     * @param dateEndPoll Date
+     * @return String
+     */
+    public static String dateDiffPoll(Context context, Date dateEndPoll) {
+        Date now = new Date();
+        long diff = dateEndPoll.getTime() - now.getTime();
+        long seconds = diff / 1000;
+        long minutes = seconds / 60;
+        long hours = minutes / 60;
+        long days = hours / 24;
+
+        if (days > 0)
+            return context.getResources().getQuantityString(R.plurals.date_day_polls, (int) days, (int) days);
+        else if (hours > 0)
+            return context.getResources().getQuantityString(R.plurals.date_hours_polls, (int) hours, (int) hours);
+        else if (minutes > 0)
+            return context.getResources().getQuantityString(R.plurals.date_minutes_polls, (int) minutes, (int) minutes);
+        else {
+            if (seconds < 0)
+                seconds = 0;
+            return context.getResources().getQuantityString(R.plurals.date_seconds_polls, (int) seconds, (int) seconds);
+        }
+    }
+
     /***
      * Toast message depending of the status code and the initial action
      * @param context Context
@@ -1641,6 +1678,9 @@ public class Helper {
                 MenuItem nav_list = menu.findItem(R.id.nav_list);
                 if (nav_list != null)
                     nav_list.setVisible(false);
+                MenuItem nav_trends = menu.findItem(R.id.nav_trends);
+                if (nav_trends != null)
+                    nav_trends.setVisible(false);
                 MenuItem nav_peertube = menu.findItem(R.id.nav_peertube);
                 if (nav_peertube != null)
                     nav_peertube.setVisible(false);
@@ -1649,7 +1689,7 @@ public class Helper {
                     nav_filters.setVisible(false);
                 MenuItem nav_follow_request = menu.findItem(R.id.nav_follow_request);
                 if (nav_follow_request != null)
-                    nav_follow_request.setVisible(false);
+                    nav_follow_request.setVisible(true);
                 MenuItem nav_who_to_follow = menu.findItem(R.id.nav_who_to_follow);
                 if (nav_who_to_follow != null)
                     nav_who_to_follow.setVisible(false);
@@ -1710,6 +1750,19 @@ public class Helper {
                 if (!mainMenuItem.isNav_scheduled()) {
                     menu.findItem(R.id.nav_scheduled).setVisible(false);
                 }
+                if (!mainMenuItem.isNav_trends() || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
+                    menu.findItem(R.id.nav_trends).setVisible(false);
+                }
+                if (!mainMenuItem.isNav_scheduled()) {
+                    menu.findItem(R.id.nav_scheduled).setVisible(false);
+                }
+                final SharedPreferences sharedpreferences = activity.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+                String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
+                String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, Helper.getLiveInstance(activity));
+                boolean display_admin_menu = sharedpreferences.getBoolean(Helper.SET_DISPLAY_ADMIN_MENU + userId + instance, false);
+                if (!display_admin_menu) {
+                    menu.findItem(R.id.nav_administration).setVisible(false);
+                }
             }
         }
         if (!BuildConfig.DONATIONS) {
@@ -2419,15 +2472,10 @@ public class Helper {
         webView.getSettings().setAllowContentAccess(true);
         webView.getSettings().setLoadsImagesAutomatically(true);
         webView.getSettings().setSupportMultipleWindows(false);
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
-            //noinspection deprecation
-            webView.getSettings().setPluginState(WebSettings.PluginState.ON);
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            webView.getSettings().setMediaPlaybackRequiresUserGesture(true);
-        }
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
-            webView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        webView.getSettings().setMediaPlaybackRequiresUserGesture(true);
+        String user_agent = sharedpreferences.getString(Helper.SET_CUSTOM_USER_AGENT, null);
+        if( user_agent != null) {
+            webView.getSettings().setUserAgentString(user_agent);
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             boolean cookies = sharedpreferences.getBoolean(Helper.SET_COOKIES, false);
@@ -3093,12 +3141,14 @@ public class Helper {
         SQLiteDatabase db = Sqlite.getInstance(activity, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
         Account account = new AccountDAO(activity, db).getUniqAccount(userID, instance);
         if (account != null) {
-            if (account.isLocked()) {
-                if (navigationView.getMenu().findItem(R.id.nav_follow_request) != null)
-                    navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(true);
-            } else {
-                if (navigationView.getMenu().findItem(R.id.nav_follow_request) != null)
-                    navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(false);
+            if( social != UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA && social != UpdateAccountInfoAsyncTask.SOCIAL.GNU) {
+                if (account.isLocked()) {
+                    if (navigationView.getMenu().findItem(R.id.nav_follow_request) != null)
+                        navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(true);
+                } else {
+                    if (navigationView.getMenu().findItem(R.id.nav_follow_request) != null)
+                        navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(false);
+                }
             }
 
             if (MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.MASTODON && MainActivity.social != UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) {
@@ -3531,8 +3581,6 @@ public class Helper {
                 }
                 byte[] data = bao.toByteArray();
                 bs = new ByteArrayInputStream(data);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -4071,14 +4119,18 @@ public class Helper {
         }
     }
 
-    public static String remove_tracking_param(String original_content) {
+    public static String remove_tracking_param(Context context, String original_content) {
         if (original_content == null)
             return original_content;
         String cleaned_content = original_content;
-        for (String utm : UTM_PARAMS) {
-            cleaned_content = cleaned_content.replaceAll("&amp;" + utm + "=[0-9a-zA-Z._-]*", "");
-            cleaned_content = cleaned_content.replaceAll("&" + utm + "=[0-9a-zA-Z._-]*", "");
-            cleaned_content = cleaned_content.replaceAll("\\?" + utm + "=[0-9a-zA-Z._-]*", "?");
+        final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        boolean utm_parameters = sharedpreferences.getBoolean(Helper.SET_FILTER_UTM, true);
+        if( utm_parameters ) {
+            for (String utm : UTM_PARAMS) {
+                cleaned_content = cleaned_content.replaceAll("&amp;" + utm + "=[0-9a-zA-Z._-]*", "");
+                cleaned_content = cleaned_content.replaceAll("&" + utm + "=[0-9a-zA-Z._-]*", "");
+                cleaned_content = cleaned_content.replaceAll("\\?" + utm + "=[0-9a-zA-Z._-]*", "?");
+            }
         }
         return cleaned_content;
     }
@@ -4183,11 +4235,99 @@ public class Helper {
             //Request was successfully enqueued for download.
         }, error -> {
         });
-
-
     }
 
 
+    /**
+     * Download from Glid cache
+     * @param context
+     * @param url
+     */
+    public static void manageMove(Context context, String url, boolean share){
+        Glide.with(context)
+                .asFile()
+                .load(url)
+                .into(new SimpleTarget<File>() {
+                    @Override
+                    public void onResourceReady(@NotNull File file, Transition<? super File> transition) {
+                        Helper.notifyDownload(context, url, file, share);
+                    }
+                });
+    }
+
+    /**
+     * Notify after moving a file from Glide cache
+     * @param context
+     * @param url
+     * @param sourceFile
+     */
+    private static void notifyDownload(Context context, String url, File sourceFile, boolean share){
+
+        final String fileName = URLUtil.guessFileName(url, null, null);
+        final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        final String targeted_folder = sharedpreferences.getString(Helper.SET_FOLDER_RECORD, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath());
+
+        FileInputStream fis = null;
+        FileOutputStream fos = null;
+        FileChannel in = null;
+        FileChannel out = null;
+        try
+        {
+            File backupFile = new File(targeted_folder+"/"+fileName);
+            backupFile.createNewFile();
+            fis = new FileInputStream(sourceFile);
+            fos = new FileOutputStream(backupFile);
+            in = fis.getChannel();
+            out = fos.getChannel();
+            long size = in.size();
+            in.transferTo(0, size, out);
+            String mime = Helper.getMimeType(url);
+            final Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            Uri uri = Uri.fromFile(backupFile);
+            intent.setDataAndType(uri, mime);
+            SQLiteDatabase db = Sqlite.getInstance(context, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+            String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
+            String instance = sharedpreferences.getString(Helper.PREF_INSTANCE, Helper.getLiveInstance(context));
+            Account account = new AccountDAO(context, db).getUniqAccount(userId, instance);
+            if (!share) {
+                Helper.notify_user(context, account, intent, BitmapFactory.decodeResource(context.getResources(),
+                        R.mipmap.ic_launcher_bubbles), NotifType.STORE, context.getString(R.string.save_over), context.getString(R.string.download_from, fileName));
+                Toasty.success(context, context.getString(R.string.save_over), Toasty.LENGTH_LONG).show();
+            } else {
+                Intent shareIntent = new Intent(Intent.ACTION_SEND);
+                shareIntent.putExtra(Intent.EXTRA_STREAM, uri);
+                shareIntent.setType(mime);
+                try {
+                    context.startActivity(shareIntent);
+                } catch (Exception ignored) {
+                    ignored.printStackTrace();
+                }
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+        finally {
+            try {
+                if (fis != null)
+                    fis.close();
+            } catch (Throwable ignore) {}
+            try {
+                if (fos != null)
+                    fos.close();
+            } catch (Throwable ignore) {}
+            try {
+                if (in != null && in.isOpen())
+                    in.close();
+            } catch (Throwable ignore) {}
+
+            try {
+                if (out != null && out.isOpen())
+                    out.close();
+            } catch (Throwable ignore) {}
+        }
+    }
+
     public static Uri getImageUri(Context inContext, Bitmap inImage) {
         ByteArrayOutputStream bytes = new ByteArrayOutputStream();
         inImage.compress(Bitmap.CompressFormat.JPEG, 100, bytes);
@@ -4556,9 +4696,7 @@ public class Helper {
                 } else {
                     context.startService(streamingIntent);
                 }
-                context.startService(streamingIntent);
-            } catch (Exception ignored) {
-            }
+            } catch (Exception ignored) {}
         }
     }
 
@@ -4726,4 +4864,11 @@ public class Helper {
         }
     }
 
+
+    public static Thread getThreadByName(String threadName) {
+        for (Thread t : Thread.getAllStackTraces().keySet()) {
+            if (t.getName().equals(threadName)) return t;
+        }
+        return null;
+    }
 }
diff --git a/app/src/main/java/app/fedilab/android/helper/LongClickLinkMovementMethod.java b/app/src/main/java/app/fedilab/android/helper/LongClickLinkMovementMethod.java
new file mode 100644
index 000000000..1097af0d4
--- /dev/null
+++ b/app/src/main/java/app/fedilab/android/helper/LongClickLinkMovementMethod.java
@@ -0,0 +1,90 @@
+package app.fedilab.android.helper;
+
+
+import android.os.Handler;
+import android.text.Layout;
+import android.text.Selection;
+import android.text.Spannable;
+import android.text.method.LinkMovementMethod;
+import android.text.method.MovementMethod;
+import android.view.MotionEvent;
+import android.widget.TextView;
+
+
+//https://stackoverflow.com/a/20435892
+public class LongClickLinkMovementMethod extends LinkMovementMethod {
+
+    private Handler mLongClickHandler;
+    private static int LONG_CLICK_TIME = 1000;
+    private boolean mIsLongPressed = false;
+
+
+    @Override
+    public boolean onTouchEvent(final TextView widget, Spannable buffer,
+                                MotionEvent event) {
+        int action = event.getAction();
+        if(action == MotionEvent.ACTION_CANCEL){
+            if(mLongClickHandler!=null){
+                mLongClickHandler.removeCallbacksAndMessages(null);
+            }
+        }
+
+        if (action == MotionEvent.ACTION_UP ||
+                action == MotionEvent.ACTION_DOWN) {
+            int x = (int) event.getX();
+            int y = (int) event.getY();
+
+            x -= widget.getTotalPaddingLeft();
+            y -= widget.getTotalPaddingTop();
+
+            x += widget.getScrollX();
+            y += widget.getScrollY();
+
+            Layout layout = widget.getLayout();
+            int line = layout.getLineForVertical(y);
+            int off = layout.getOffsetForHorizontal(line, x);
+
+            final LongClickableSpan[] link = buffer.getSpans(off, off, LongClickableSpan.class);
+
+            if (link.length != 0) {
+                if (action == MotionEvent.ACTION_UP) {
+                    if(mLongClickHandler!=null){
+                        mLongClickHandler.removeCallbacksAndMessages(null);
+                    }
+                    if(!mIsLongPressed) {
+                        link[0].onClick(widget);
+                    }
+                    mIsLongPressed = false;
+                } else {
+                    Selection.setSelection(buffer,
+                            buffer.getSpanStart(link[0]),
+                            buffer.getSpanEnd(link[0]));
+                    mLongClickHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            link[0].onLongClick(widget);
+                            mIsLongPressed = true;
+                            widget.invalidate();
+                        }
+                    },LONG_CLICK_TIME);
+                }
+                return true;
+            }
+        }
+
+        return super.onTouchEvent(widget, buffer, event);
+    }
+
+
+    public static MovementMethod getInstance() {
+        if (sInstance == null) {
+            sInstance = new LongClickLinkMovementMethod();
+            sInstance.mLongClickHandler = new Handler();
+        }
+
+        return sInstance;
+    }
+    private static LongClickLinkMovementMethod sInstance;
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/android/helper/LongClickableSpan.java b/app/src/main/java/app/fedilab/android/helper/LongClickableSpan.java
new file mode 100644
index 000000000..9d518ec94
--- /dev/null
+++ b/app/src/main/java/app/fedilab/android/helper/LongClickableSpan.java
@@ -0,0 +1,10 @@
+package app.fedilab.android.helper;
+
+import android.text.style.ClickableSpan;
+import android.view.View;
+
+public abstract class LongClickableSpan extends ClickableSpan {
+
+    abstract public void onLongClick(View view);
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/android/interfaces/OnRetrieveIdentityProofInterface.java b/app/src/main/java/app/fedilab/android/interfaces/OnRetrieveIdentityProofInterface.java
new file mode 100644
index 000000000..788be7b07
--- /dev/null
+++ b/app/src/main/java/app/fedilab/android/interfaces/OnRetrieveIdentityProofInterface.java
@@ -0,0 +1,25 @@
+/* Copyright 2019 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+package app.fedilab.android.interfaces;
+
+import app.fedilab.android.client.APIResponse;
+
+/**
+ * Created by Thomas on 17/12/2019.
+ * Interface when identity proof is retrieved
+ */
+public interface OnRetrieveIdentityProofInterface {
+    void onIdentityProof(APIResponse apiResponse);
+}
diff --git a/app/src/main/java/app/fedilab/android/interfaces/OnRetrieveRemoteAccountInterface.java b/app/src/main/java/app/fedilab/android/interfaces/OnRetrieveRemoteAccountInterface.java
index 2cf392d96..9e1e40b8f 100644
--- a/app/src/main/java/app/fedilab/android/interfaces/OnRetrieveRemoteAccountInterface.java
+++ b/app/src/main/java/app/fedilab/android/interfaces/OnRetrieveRemoteAccountInterface.java
@@ -22,5 +22,5 @@ import app.fedilab.android.client.Entities.Results;
  * Interface for retrieving a remote account
  */
 public interface OnRetrieveRemoteAccountInterface {
-    void onRetrieveRemoteAccount(Results results);
+    void onRetrieveRemoteAccount(Results results, boolean developerAccount);
 }
diff --git a/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java b/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java
index 674706075..09b710a60 100644
--- a/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java
+++ b/app/src/main/java/app/fedilab/android/jobs/NotificationsSyncJob.java
@@ -224,6 +224,20 @@ public class NotificationsSyncJob extends Job {
                         }
                     }
                     break;
+                case "follow_request":
+                    notifType = Helper.NotifType.FOLLLOW;
+                    if (notif_follow) {
+                        newFollows++;
+                        if (notificationUrl == null) {
+                            notificationUrl = notification.getAccount().getAvatar();
+                            if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0)
+                                title = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name(), true), getContext().getString(R.string.notif_follow_request));
+                            else
+                                title = String.format("@%s %s", notification.getAccount().getAcct(), getContext().getString(R.string.notif_follow_request));
+                            targeted_account = notification.getAccount().getId();
+                        }
+                    }
+                    break;
                 case "follow":
                     notifType = Helper.NotifType.FOLLLOW;
                     if (notif_follow) {
diff --git a/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java b/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
index 7cab70536..932537b5a 100644
--- a/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
+++ b/app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
@@ -80,7 +80,6 @@ public class LiveNotificationDelayedService extends Service {
     public static int totalAccount = 0;
     public static int eventsCount = 0;
     public static HashMap<String, String> since_ids = new HashMap<>();
-    public static HashMap<String, Thread> threads = new HashMap<>();
     protected Account account;
     private NotificationChannel channel;
     private boolean fetch;
@@ -88,6 +87,8 @@ public class LiveNotificationDelayedService extends Service {
 
     public void onCreate() {
         super.onCreate();
+        final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        boolean notify = sharedpreferences.getBoolean(Helper.SET_NOTIFY, true);
 
         if (Build.VERSION.SDK_INT >= 26) {
             channel = new NotificationChannel(CHANNEL_ID,
@@ -96,47 +97,76 @@ public class LiveNotificationDelayedService extends Service {
 
             ((NotificationManager) Objects.requireNonNull(getSystemService(Context.NOTIFICATION_SERVICE))).createNotificationChannel(channel);
         }
+
         SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
         List<Account> accountStreams = new AccountDAO(getApplicationContext(), db).getAllAccountCrossAction();
         totalAccount = 0;
-        for (Account account : accountStreams) {
-            if (account.getSocial() == null || account.getSocial().equals("MASTODON") || account.getSocial().equals("PLEROMA") || account.getSocial().equals("PIXELFED")) {
-                final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-                boolean allowStream = sharedpreferences.getBoolean(Helper.SET_ALLOW_STREAM + account.getId() + account.getInstance(), true);
-                if (allowStream) {
-                    totalAccount++;
+        if( accountStreams != null) {
+            for (Account account : accountStreams) {
+                if (account.getSocial() == null || account.getSocial().equals("MASTODON") || account.getSocial().equals("PLEROMA") || account.getSocial().equals("PIXELFED")) {
+                    boolean allowStream = sharedpreferences.getBoolean(Helper.SET_ALLOW_STREAM + account.getId() + account.getInstance(), true);
+                    if (allowStream) {
+                        totalAccount++;
+                    }
                 }
             }
         }
+        Intent myIntent = new Intent(getApplicationContext(), MainActivity.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(
+                getApplicationContext(),
+                0,
+                myIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT);
 
+        android.app.Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
+                .setShowWhen(false)
+                .setContentIntent(pendingIntent)
+                .setContentTitle(getString(R.string.top_notification))
+                .setSmallIcon(getNotificationIcon(getApplicationContext()))
+                .setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
+
+        startForeground(1, notification);
+        if( !notify ){
+            stopSelf();
+            return;
+        }
         if (totalAccount > 0) {
-            Intent myIntent = new Intent(getApplicationContext(), MainActivity.class);
-            PendingIntent pendingIntent = PendingIntent.getActivity(
-                    getApplicationContext(),
-                    0,
-                    myIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT);
-
-            android.app.Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
-                    .setShowWhen(false)
-                    .setContentIntent(pendingIntent)
-                    .setContentTitle(getString(R.string.top_notification))
-                    .setSmallIcon(getNotificationIcon(getApplicationContext()))
-                    .setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
-
-            startForeground(1, notification);
+            startStream();
         } else {
             stopSelf();
         }
-        startStream();
+
     }
 
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        for (Thread t : Thread.getAllStackTraces().keySet()) {
+            if (t.getName().startsWith("notif_delayed_")){
+                t.interrupt();
+            }
+        }
+        Thread.currentThread().interrupt();
+    }
+
+
+
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-
-        if (intent == null || intent.getBooleanExtra("stop", false)) {
+        final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        boolean notify = sharedpreferences.getBoolean(Helper.SET_NOTIFY, true);
+        if (!notify || intent == null || intent.getBooleanExtra("stop", false)) {
             totalAccount = 0;
-            stopForeground(true);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                stopForeground(STOP_FOREGROUND_DETACH);
+                NotificationManager notificationManager =  (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+                assert notificationManager != null;
+                notificationManager.deleteNotificationChannel(CHANNEL_ID);
+            }
+            if (intent != null) {
+                intent.replaceExtras(new Bundle());
+            }
             stopSelf();
         }
         if (totalAccount > 0) {
@@ -154,7 +184,6 @@ public class LiveNotificationDelayedService extends Service {
             final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
             fetch = true;
             if (accountStreams != null) {
-                Thread thread;
                 for (final Account accountStream : accountStreams) {
                     String key = accountStream.getUsername() + "@" + accountStream.getInstance();
                     boolean allowStream = sharedpreferences.getBoolean(Helper.SET_ALLOW_STREAM + accountStream.getId() + accountStream.getInstance(), true);
@@ -164,36 +193,38 @@ public class LiveNotificationDelayedService extends Service {
                     if (!sleeps.containsKey(key)) {
                         sleeps.put(key, 30000);
                     }
-                    if (threads.containsKey(key) && threads.get(key) != null) {
-                        thread = threads.get(key);
-                        if (thread != null && !thread.isInterrupted()) {
-                            thread.interrupt();
-                            threads.put(key, null);
-                        }
+                    Thread thread = Helper.getThreadByName("notif_delayed_"+key);
+                    if( thread == null){
+                        startThread(accountStream, key);
+                    } else if(thread.getState() != Thread.State.RUNNABLE) {
+                        thread.interrupt();
+                        startThread(accountStream, key);
                     }
-                    thread = new Thread() {
-                        @Override
-                        public void run() {
-                            while (fetch) {
-                                taks(accountStream);
-                                fetch = (Helper.liveNotifType(getApplicationContext()) == Helper.NOTIF_DELAYED);
-                                if (sleeps.containsKey(key) && sleeps.get(key) != null) {
-                                    try {
-                                        Thread.sleep(sleeps.get(key));
-                                    } catch (InterruptedException e) {
-                                        SystemClock.sleep(sleeps.get(key));
-                                    }
-                                }
-                            }
-                        }
-                    };
-                    thread.start();
-                    threads.put(key, thread);
                 }
             }
         }
     }
 
+    private void startThread(Account accountStream, String key){
+        Thread thread = new Thread() {
+            @Override
+            public void run() {
+                while (fetch) {
+                    taks(accountStream);
+                    fetch = (Helper.liveNotifType(getApplicationContext()) == Helper.NOTIF_DELAYED);
+                    if (sleeps.containsKey(key) && sleeps.get(key) != null) {
+                        try {
+                            Thread.sleep(sleeps.get(key));
+                        } catch (InterruptedException e) {
+                            SystemClock.sleep(sleeps.get(key));
+                        }
+                    }
+                }
+            }
+        };
+        thread.setName("notif_delayed_"+key);
+        thread.start();
+    }
 
     @Nullable
     @Override
@@ -341,6 +372,18 @@ public class LiveNotificationDelayedService extends Service {
                                 canSendBroadCast = false;
                             }
                             break;
+                        case "follow_request":
+                            notifType = Helper.NotifType.FOLLLOW;
+                            if (notif_follow) {
+                                if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0)
+                                    message = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name(), true), getString(R.string.notif_follow_request));
+                                else
+                                    message = String.format("@%s %s", notification.getAccount().getAcct(), getString(R.string.notif_follow_request));
+                                targeted_account = notification.getAccount().getId();
+                            } else {
+                                canSendBroadCast = false;
+                            }
+                            break;
                         case "follow":
                             notifType = Helper.NotifType.FOLLLOW;
                             if (notif_follow) {
diff --git a/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java b/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
index abbc1b468..c012d89d0 100644
--- a/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
+++ b/app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
@@ -62,9 +62,7 @@ import org.json.JSONObject;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 import app.fedilab.android.R;
@@ -92,7 +90,6 @@ public class LiveNotificationService extends Service implements NetworkStateRece
     public static String CHANNEL_ID = "live_notifications";
     public static int totalAccount = 0;
     public static int eventsCount = 0;
-    private static HashMap<String, Thread> threads = new HashMap<>();
     private static HashMap<String, String> lastNotification = new HashMap<>();
     private static HashMap<String, WebSocket> webSocketFutures = new HashMap<>();
 
@@ -106,14 +103,13 @@ public class LiveNotificationService extends Service implements NetworkStateRece
 
     public void onCreate() {
         super.onCreate();
-
+        final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        boolean notify = sharedpreferences.getBoolean(Helper.SET_NOTIFY, true);
         networkStateReceiver = new NetworkStateReceiver();
         networkStateReceiver.addListener(this);
         registerReceiver(networkStateReceiver, new IntentFilter(android.net.ConnectivityManager.CONNECTIVITY_ACTION));
 
 
-        SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
-
         if (Build.VERSION.SDK_INT >= 26) {
             channel = new NotificationChannel(CHANNEL_ID,
                     "Live notifications",
@@ -124,29 +120,34 @@ public class LiveNotificationService extends Service implements NetworkStateRece
         SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
         List<Account> accountStreams = new AccountDAO(getApplicationContext(), db).getAllAccountCrossAction();
         totalAccount = 0;
-        for (Account account : accountStreams) {
-            if (account.getSocial() == null || account.getSocial().equals("MASTODON") || account.getSocial().equals("PLEROMA")) {
-                boolean allowStream = sharedpreferences.getBoolean(Helper.SET_ALLOW_STREAM + account.getId() + account.getInstance(), true);
-                if (allowStream) {
-                    totalAccount++;
+        if( accountStreams != null) {
+            for (Account account : accountStreams) {
+                if (account.getSocial() == null || account.getSocial().equals("MASTODON") || account.getSocial().equals("PLEROMA")) {
+                    boolean allowStream = sharedpreferences.getBoolean(Helper.SET_ALLOW_STREAM + account.getId() + account.getInstance(), true);
+                    if (allowStream) {
+                        totalAccount++;
+                    }
                 }
             }
         }
-        if (totalAccount > 0) {
-            Intent myIntent = new Intent(getApplicationContext(), MainActivity.class);
-            PendingIntent pendingIntent = PendingIntent.getActivity(
-                    getApplicationContext(),
-                    0,
-                    myIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT);
-            android.app.Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
-                    .setContentTitle(getString(R.string.top_notification))
-                    .setContentIntent(pendingIntent)
-                    .setSmallIcon(getNotificationIcon(getApplicationContext()))
-                    .setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
+        Intent myIntent = new Intent(getApplicationContext(), MainActivity.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(
+                getApplicationContext(),
+                0,
+                myIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT);
+        android.app.Notification notification = new NotificationCompat.Builder(this, CHANNEL_ID)
+                .setContentTitle(getString(R.string.top_notification))
+                .setContentIntent(pendingIntent)
+                .setSmallIcon(getNotificationIcon(getApplicationContext()))
+                .setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
 
-            startForeground(1, notification);
-        } else {
+        startForeground(1, notification);
+        if( !notify ){
+            stopSelf();
+            return;
+        }
+        if (totalAccount == 0) {
             stopSelf();
         }
     }
@@ -170,10 +171,19 @@ public class LiveNotificationService extends Service implements NetworkStateRece
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-
-        if (intent == null || intent.getBooleanExtra("stop", false)) {
+        final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        boolean notify = sharedpreferences.getBoolean(Helper.SET_NOTIFY, true);
+        if (!notify || intent == null || intent.getBooleanExtra("stop", false)) {
             totalAccount = 0;
-            stopForeground(true);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                stopForeground(STOP_FOREGROUND_DETACH);
+                NotificationManager notificationManager =  (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+                assert notificationManager != null;
+                notificationManager.deleteNotificationChannel(CHANNEL_ID);
+            }
+            if (intent != null) {
+                intent.replaceExtras(new Bundle());
+            }
             stopSelf();
         }
         if (totalAccount > 0) {
@@ -185,8 +195,17 @@ public class LiveNotificationService extends Service implements NetworkStateRece
     @Override
     public void onDestroy() {
         super.onDestroy();
-        networkStateReceiver.removeListener(this);
-        unregisterReceiver(networkStateReceiver);
+        for (Thread t : Thread.getAllStackTraces().keySet()) {
+            if (t.getName().startsWith("notif_live_")){
+                t.interrupt();
+                t = null;
+            };
+        }
+        Thread.currentThread().interrupt();
+        if( networkStateReceiver != null) {
+            networkStateReceiver.removeListener(this);
+            unregisterReceiver(networkStateReceiver);
+        }
     }
 
 
@@ -262,17 +281,29 @@ public class LiveNotificationService extends Service implements NetworkStateRece
     private void startWork(Account accountStream) {
 
         String key = accountStream.getAcct() + "@" + accountStream.getInstance();
-        if (!threads.containsKey(key) || !Objects.requireNonNull(threads.get(key)).isAlive()) {
-            Thread thread = new Thread() {
+        Thread thread = Helper.getThreadByName("notif_live_"+key);
+        if( thread == null){
+            thread = new Thread() {
                 @Override
                 public void run() {
                     taks(accountStream);
                 }
             };
+            thread.setName("notif_live_"+key);
+            thread.start();
+        } else if(thread.getState() != Thread.State.RUNNABLE) {
+            thread.interrupt();
+            thread = new Thread() {
+                @Override
+                public void run() {
+                    taks(accountStream);
+                }
+            };
+            thread.setName("notif_live_"+key);
             thread.start();
-            threads.put(accountStream.getAcct() + "@" + accountStream.getInstance(), thread);
         }
 
+
     }
 
     private void onRetrieveStreaming(Account account, JSONObject response) {
@@ -384,6 +415,18 @@ public class LiveNotificationService extends Service implements NetworkStateRece
                                         canSendBroadCast = false;
                                     }
                                     break;
+                                case "follow_request":
+                                    notifType = Helper.NotifType.FOLLLOW;
+                                    if (notif_follow) {
+                                        if (notification.getAccount().getDisplay_name() != null && notification.getAccount().getDisplay_name().length() > 0)
+                                            message = String.format("%s %s", Helper.shortnameToUnicode(notification.getAccount().getDisplay_name(), true), getString(R.string.notif_follow_request));
+                                        else
+                                            message = String.format("@%s %s", notification.getAccount().getAcct(), getString(R.string.notif_follow_request));
+                                        targeted_account = notification.getAccount().getId();
+                                    } else {
+                                        canSendBroadCast = false;
+                                    }
+                                    break;
                                 case "follow":
                                     notifType = Helper.NotifType.FOLLLOW;
                                     if (notif_follow) {
@@ -487,14 +530,12 @@ public class LiveNotificationService extends Service implements NetworkStateRece
 
     @Override
     public void networkUnavailable() {
-        Iterator it = threads.entrySet().iterator();
-        while (it.hasNext()) {
-            Map.Entry pair = (Map.Entry) it.next();
-            if (pair.getValue() == null || !((Thread) pair.getValue()).isAlive()) {
-                if ((pair.getValue()) != null)
-                    ((Thread) pair.getValue()).interrupt();
-            }
-            it.remove();
+        for (Thread t : Thread.getAllStackTraces().keySet()) {
+            if (t.getName().startsWith("notif_live_")){
+                t.interrupt();
+                t = null;
+            };
         }
+        Thread.currentThread().interrupt();
     }
 }
diff --git a/app/src/main/java/app/fedilab/android/services/StopDelayedNotificationReceiver.java b/app/src/main/java/app/fedilab/android/services/StopDelayedNotificationReceiver.java
index 800456da7..5a473fb10 100644
--- a/app/src/main/java/app/fedilab/android/services/StopDelayedNotificationReceiver.java
+++ b/app/src/main/java/app/fedilab/android/services/StopDelayedNotificationReceiver.java
@@ -34,8 +34,7 @@ public class StopDelayedNotificationReceiver extends BroadcastReceiver {
         streamingServiceIntent.putExtra("stop", true);
         try {
             context.startService(streamingServiceIntent);
-        } catch (Exception ignored) {
-        }
+        } catch (Exception ignored) {}
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/android/services/StopLiveNotificationReceiver.java b/app/src/main/java/app/fedilab/android/services/StopLiveNotificationReceiver.java
index 40bf26f30..5131890d7 100644
--- a/app/src/main/java/app/fedilab/android/services/StopLiveNotificationReceiver.java
+++ b/app/src/main/java/app/fedilab/android/services/StopLiveNotificationReceiver.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.Intent;
 
 
+
 /**
  * Created by Thomas on 22/09/2017.
  * BroadcastReceiver for restarting the service
@@ -34,9 +35,7 @@ public class StopLiveNotificationReceiver extends BroadcastReceiver {
         streamingServiceIntent.putExtra("stop", true);
         try {
             context.startService(streamingServiceIntent);
-        } catch (Exception ignored) {
-            ignored.printStackTrace();
-        }
+        } catch (Exception ignored) {}
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/android/sqlite/AccountDAO.java b/app/src/main/java/app/fedilab/android/sqlite/AccountDAO.java
index ab6321289..fb7c92873 100644
--- a/app/src/main/java/app/fedilab/android/sqlite/AccountDAO.java
+++ b/app/src/main/java/app/fedilab/android/sqlite/AccountDAO.java
@@ -255,7 +255,7 @@ public class AccountDAO {
     public List<Account> getAllAccountCrossAction() {
 
         try {
-            Cursor c = db.query(Sqlite.TABLE_USER_ACCOUNT, null, Sqlite.COL_SOCIAL + " != 'PEERTUBE' AND " + Sqlite.COL_OAUTHTOKEN + " != 'null'", null, null, null, Sqlite.COL_INSTANCE + " ASC", null);
+            Cursor c = db.query(Sqlite.TABLE_USER_ACCOUNT, null, Sqlite.COL_SOCIAL + " != 'PEERTUBE' AND " +  Sqlite.COL_SOCIAL + " != 'GNU' AND " +Sqlite.COL_OAUTHTOKEN + " != 'null'", null, null, null, Sqlite.COL_INSTANCE + " ASC", null);
             return cursorToListUser(c);
         } catch (Exception e) {
             return null;
diff --git a/app/src/main/java/app/fedilab/android/sqlite/CustomEmojiDAO.java b/app/src/main/java/app/fedilab/android/sqlite/CustomEmojiDAO.java
index b4935a47d..63729353f 100644
--- a/app/src/main/java/app/fedilab/android/sqlite/CustomEmojiDAO.java
+++ b/app/src/main/java/app/fedilab/android/sqlite/CustomEmojiDAO.java
@@ -160,7 +160,7 @@ public class CustomEmojiDAO {
     public List<Emojis> getEmojiStartingBy(String shortCode) {
         try {
             String instance = Helper.getLiveInstance(context);
-            Cursor c = db.query(Sqlite.TABLE_CUSTOM_EMOJI, null, Sqlite.COL_SHORTCODE + " LIKE \"%" + shortCode + "%\" AND " + Sqlite.COL_INSTANCE + " = \"" + instance + "\"", null, Sqlite.COL_SHORTCODE, null, null, null);
+            Cursor c = db.query(Sqlite.TABLE_CUSTOM_EMOJI, null, Sqlite.COL_SHORTCODE + " LIKE \"%" + shortCode + "%\" AND " + Sqlite.COL_INSTANCE + " = \"" + instance + "\"", null, Sqlite.COL_SHORTCODE, null, null, "20");
             return cursorToListEmojis(c);
         } catch (Exception e) {
             return null;
diff --git a/app/src/main/java/app/fedilab/android/sqlite/MainMenuDAO.java b/app/src/main/java/app/fedilab/android/sqlite/MainMenuDAO.java
index 7ad4d1811..836c89179 100644
--- a/app/src/main/java/app/fedilab/android/sqlite/MainMenuDAO.java
+++ b/app/src/main/java/app/fedilab/android/sqlite/MainMenuDAO.java
@@ -100,6 +100,7 @@ public class MainMenuDAO {
         values.put(Sqlite.COL_NAV_MUTED, mainMenuItem.isNav_muted() ? 1 : 0);
         values.put(Sqlite.COL_NAV_BLOCKED_DOMAINS, mainMenuItem.isNav_blocked() ? 1 : 0);
         values.put(Sqlite.COL_NAV_HOWTO, mainMenuItem.isNav_howto() ? 1 : 0);
+        values.put(Sqlite.COL_NAV_TRENDS, mainMenuItem.isNav_trends() ? 1 : 0);
         //Inserts menu conf
         try {
             db.insert(Sqlite.TABLE_MAIN_MENU_ITEMS, null, values);
@@ -132,6 +133,7 @@ public class MainMenuDAO {
         values.put(Sqlite.COL_NAV_MUTED, mainMenuItem.isNav_muted() ? 1 : 0);
         values.put(Sqlite.COL_NAV_BLOCKED_DOMAINS, mainMenuItem.isNav_blocked() ? 1 : 0);
         values.put(Sqlite.COL_NAV_HOWTO, mainMenuItem.isNav_howto() ? 1 : 0);
+        values.put(Sqlite.COL_NAV_TRENDS, mainMenuItem.isNav_trends() ? 1 : 0);
         try {
             db.update(Sqlite.TABLE_MAIN_MENU_ITEMS, values, Sqlite.COL_USER_ID + " =  ? AND " + Sqlite.COL_INSTANCE + " =  ? ",
                     new String[]{userId, instance});
@@ -166,6 +168,7 @@ public class MainMenuDAO {
         values.put(Sqlite.COL_NAV_MUTED, mainMenuItem.isNav_muted() ? 1 : 0);
         values.put(Sqlite.COL_NAV_BLOCKED_DOMAINS, mainMenuItem.isNav_blocked() ? 1 : 0);
         values.put(Sqlite.COL_NAV_HOWTO, mainMenuItem.isNav_howto() ? 1 : 0);
+        values.put(Sqlite.COL_NAV_TRENDS, mainMenuItem.isNav_trends() ? 1 : 0);
         try {
             db.update(Sqlite.TABLE_MAIN_MENU_ITEMS, values, Sqlite.COL_USER_ID + " =  ? AND " + Sqlite.COL_INSTANCE + " =  ? ",
                     new String[]{userId, instance});
@@ -238,6 +241,7 @@ public class MainMenuDAO {
         mainMenuItem.setNav_news(c.getInt(c.getColumnIndex(Sqlite.COL_NAV_NEWS)) == 1);
         mainMenuItem.setNav_peertube(c.getInt(c.getColumnIndex(Sqlite.COL_NAV_PEERTUBE)) == 1);
         mainMenuItem.setNav_scheduled(c.getInt(c.getColumnIndex(Sqlite.COL_NAV_SCHEDULED)) == 1);
+        mainMenuItem.setNav_trends(c.getInt(c.getColumnIndex(Sqlite.COL_NAV_TRENDS)) == 1);
         //Close the cursor
         c.close();
         return mainMenuItem;
diff --git a/app/src/main/java/app/fedilab/android/sqlite/Sqlite.java b/app/src/main/java/app/fedilab/android/sqlite/Sqlite.java
index 5aee650c4..94bd1e96b 100644
--- a/app/src/main/java/app/fedilab/android/sqlite/Sqlite.java
+++ b/app/src/main/java/app/fedilab/android/sqlite/Sqlite.java
@@ -48,7 +48,7 @@ import static android.content.Context.MODE_PRIVATE;
 
 public class Sqlite extends SQLiteOpenHelper {
 
-    public static final int DB_VERSION = 36;
+    public static final int DB_VERSION = 37;
     public static final String DB_NAME = "mastodon_etalab_db";
     //Table for custom emoji
     public static final String TABLE_CUSTOM_EMOJI = "CUSTOM_EMOJI";
@@ -183,6 +183,7 @@ public class Sqlite extends SQLiteOpenHelper {
     static final String COL_NAV_MUTED = "NAV_MUTED";
     static final String COL_NAV_BLOCKED_DOMAINS = "NAV_BLOCKED_DOMAINS";
     static final String COL_NAV_HOWTO = "NAV_HOWTO";
+    static final String COL_NAV_TRENDS = "NAV_TRENDS";
     private static final String TABLE_USER_ACCOUNT_TEMP = "USER_ACCOUNT_TEMP";
     private static final String CREATE_TABLE_USER_ACCOUNT = "CREATE TABLE " + TABLE_USER_ACCOUNT + " ("
             + COL_USER_ID + " TEXT, " + COL_USERNAME + " TEXT NOT NULL, " + COL_ACCT + " TEXT NOT NULL, "
@@ -260,6 +261,7 @@ public class Sqlite extends SQLiteOpenHelper {
             + COL_NAV_BLOCKED + " INTEGER  DEFAULT 1, "
             + COL_NAV_MUTED + " INTEGER  DEFAULT 1, "
             + COL_NAV_BLOCKED_DOMAINS + " INTEGER  DEFAULT 1, "
+            + COL_NAV_TRENDS + " INTEGER  DEFAULT 1, "
             + COL_NAV_HOWTO + " INTEGER  DEFAULT 1)";
     private static final String CREATE_TABLE_USER_NOTES = "CREATE TABLE "
             + TABLE_USER_NOTES + "("
@@ -533,6 +535,10 @@ public class Sqlite extends SQLiteOpenHelper {
                 db.execSQL(CREATE_UNIQUE_CACHE_INDEX);
             case 35:
                 db.execSQL(CREATE_TABLE_USER_NOTES);
+            case 36:
+                if (oldVersion > 33) {
+                    db.execSQL("ALTER TABLE " + TABLE_MAIN_MENU_ITEMS + " ADD COLUMN " + COL_NAV_TRENDS + " INTEGER  DEFAULT 1");
+                }
             default:
                 break;
         }
diff --git a/app/src/main/java/app/fedilab/android/sqlite/StatusCacheDAO.java b/app/src/main/java/app/fedilab/android/sqlite/StatusCacheDAO.java
index 42b94d9f3..85bd71817 100644
--- a/app/src/main/java/app/fedilab/android/sqlite/StatusCacheDAO.java
+++ b/app/src/main/java/app/fedilab/android/sqlite/StatusCacheDAO.java
@@ -765,7 +765,7 @@ public class StatusCacheDAO {
         status.setIn_reply_to_id(c.getString(c.getColumnIndex(Sqlite.COL_IN_REPLY_TO_ID)));
         status.setIn_reply_to_account_id(c.getString(c.getColumnIndex(Sqlite.COL_IN_REPLY_TO_ACCOUNT_ID)));
         status.setReblog(Helper.restoreStatusFromString(c.getString(c.getColumnIndex(Sqlite.COL_REBLOG))));
-        status.setContent(c.getString(c.getColumnIndex(Sqlite.COL_CONTENT)));
+        status.setContent(context, c.getString(c.getColumnIndex(Sqlite.COL_CONTENT)));
         status.setCreated_at(Helper.stringToDate(context, c.getString(c.getColumnIndex(Sqlite.COL_CREATED_AT))));
         status.setEmojis(Helper.restoreEmojisFromString(c.getString(c.getColumnIndex(Sqlite.COL_EMOJIS))));
         status.setReblogs_count(c.getInt(c.getColumnIndex(Sqlite.COL_REBLOGS_COUNT)));
@@ -812,7 +812,7 @@ public class StatusCacheDAO {
             status.setIn_reply_to_id(c.getString(c.getColumnIndex(Sqlite.COL_IN_REPLY_TO_ID)));
             status.setIn_reply_to_account_id(c.getString(c.getColumnIndex(Sqlite.COL_IN_REPLY_TO_ACCOUNT_ID)));
             status.setReblog(Helper.restoreStatusFromString(c.getString(c.getColumnIndex(Sqlite.COL_REBLOG))));
-            status.setContent(c.getString(c.getColumnIndex(Sqlite.COL_CONTENT)));
+            status.setContent(context, c.getString(c.getColumnIndex(Sqlite.COL_CONTENT)));
             status.setCreated_at(Helper.stringToDate(context, c.getString(c.getColumnIndex(Sqlite.COL_CREATED_AT))));
             status.setEmojis(Helper.restoreEmojisFromString(c.getString(c.getColumnIndex(Sqlite.COL_EMOJIS))));
             status.setReblogs_count(c.getInt(c.getColumnIndex(Sqlite.COL_REBLOGS_COUNT)));
diff --git a/app/src/main/java/app/fedilab/android/webview/MastalabWebViewClient.java b/app/src/main/java/app/fedilab/android/webview/MastalabWebViewClient.java
index 9718c3b89..b29384b08 100644
--- a/app/src/main/java/app/fedilab/android/webview/MastalabWebViewClient.java
+++ b/app/src/main/java/app/fedilab/android/webview/MastalabWebViewClient.java
@@ -83,7 +83,9 @@ public class MastalabWebViewClient extends WebViewClient {
                 }
             } catch (URISyntaxException e) {
                 try {
-                    url = url.substring(0, 50);
+                    if ( url.length() > 50) {
+                        url = url.substring(0, 50);
+                    }
                     uri = new URI(url);
                     String domain = uri.getHost();
                     if (domain != null) {
diff --git a/app/src/main/res/drawable-anydpi/ic_card_travel.xml b/app/src/main/res/drawable-anydpi/ic_card_travel.xml
index 727736e37..5c9fb4015 100644
--- a/app/src/main/res/drawable-anydpi/ic_card_travel.xml
+++ b/app/src/main/res/drawable-anydpi/ic_card_travel.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="?colorAccent"
         android:pathData="M20,6h-3L17,4c0,-1.11 -0.89,-2 -2,-2L9,2c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -2,0.89 -2,2v11c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM9,4h6v2L9,6L9,4zM20,19L4,19v-2h16v2zM20,14L4,14L4,8h3v2h2L9,8h6v2h2L17,8h3v6z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_keyboard_arrow_right.xml b/app/src/main/res/drawable-anydpi/ic_keyboard_arrow_right.xml
index 138fcc3eb..18bcb76f2 100644
--- a/app/src/main/res/drawable-anydpi/ic_keyboard_arrow_right.xml
+++ b/app/src/main/res/drawable-anydpi/ic_keyboard_arrow_right.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="?iconColorMenu"
         android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10,5.75l6,6 -6,6z" />
 </vector>
diff --git a/app/src/main/res/drawable-anydpi/ic_locked_account.xml b/app/src/main/res/drawable-anydpi/ic_locked_account.xml
new file mode 100644
index 000000000..1d62aa3f1
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_locked_account.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="?colorAccent"
+        android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z" />
+</vector>
diff --git a/app/src/main/res/drawable-v19/block_quote_background.xml b/app/src/main/res/drawable-v19/block_quote_background.xml
new file mode 100644
index 000000000..a0fe1f77a
--- /dev/null
+++ b/app/src/main/res/drawable-v19/block_quote_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/blue" />
+            <size android:width="5dp" />
+        </shape>
+    </item>
+    <!-- draw another block to cut-off the left and right bars -->
+    <item android:left="5.0dp">
+        <shape>
+            <solid android:color="@color/light_blue" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/diag_bottom_android4.xml b/app/src/main/res/drawable-v19/diag_bottom.xml
similarity index 100%
rename from app/src/main/res/drawable/diag_bottom_android4.xml
rename to app/src/main/res/drawable-v19/diag_bottom.xml
diff --git a/app/src/main/res/drawable/diag_top_android4.xml b/app/src/main/res/drawable-v19/diag_top.xml
similarity index 100%
rename from app/src/main/res/drawable/diag_top_android4.xml
rename to app/src/main/res/drawable-v19/diag_top.xml
diff --git a/app/src/main/res/drawable/translation_border_android4.xml b/app/src/main/res/drawable-v19/translation_border.xml
similarity index 100%
rename from app/src/main/res/drawable/translation_border_android4.xml
rename to app/src/main/res/drawable-v19/translation_border.xml
diff --git a/app/src/main/res/drawable/block_quote_background.xml b/app/src/main/res/drawable/block_quote_background.xml
new file mode 100644
index 000000000..8c6cf929a
--- /dev/null
+++ b/app/src/main/res/drawable/block_quote_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <solid android:color="@color/cyanea_accent" />
+            <size android:width="5dp" />
+        </shape>
+    </item>
+    <!-- draw another block to cut-off the left and right bars -->
+    <item android:left="5.0dp">
+        <shape>
+            <solid android:color="@color/transparent" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/green_border.xml b/app/src/main/res/drawable/green_border.xml
index 52ba23b5c..7cd9ec943 100644
--- a/app/src/main/res/drawable/green_border.xml
+++ b/app/src/main/res/drawable/green_border.xml
@@ -4,7 +4,7 @@
     <stroke
         android:width="1dip"
         android:color="@color/verified_text" />
-    <corners android:radius="2dp"></corners>
+    <corners android:radius="2dp" />
     <padding
         android:bottom="1dip"
         android:left="4dip"
diff --git a/app/src/main/res/drawable/ic_trending_tags.xml b/app/src/main/res/drawable/ic_trending_tags.xml
new file mode 100644
index 000000000..4d3859d53
--- /dev/null
+++ b/app/src/main/res/drawable/ic_trending_tags.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M16,6l2.29,2.29 -4.88,4.88 -4,-4L2,16.59 3.41,18l6,-6 4,4 6.3,-6.29L22,12V6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_verified_user.xml b/app/src/main/res/drawable/ic_verified_user.xml
new file mode 100644
index 000000000..e60289574
--- /dev/null
+++ b/app/src/main/res/drawable/ic_verified_user.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#00C853"
+        android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM10,17l-4,-4 1.41,-1.41L10,14.17l6.59,-6.59L18,9l-8,8z" />
+</vector>
diff --git a/app/src/main/res/drawable/menu_selector.xml b/app/src/main/res/drawable/menu_selector.xml
new file mode 100644
index 000000000..21368eece
--- /dev/null
+++ b/app/src/main/res/drawable/menu_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/cyanea_accent" android:state_checked="true" />
+    <item android:drawable="@color/cyanea_accent" android:state_pressed="true" />
+    <item android:drawable="@color/cyanea_accent" android:state_focused="true" />
+    <item android:drawable="@color/cyanea_primary_dark" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/nitter.xml b/app/src/main/res/drawable/nitter.xml
new file mode 100644
index 000000000..abe938838
--- /dev/null
+++ b/app/src/main/res/drawable/nitter.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="500"
+    android:viewportWidth="500" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#f00" android:pathData="M73.6,33.6L71,36.3v427.4l2.6,2.7 2.7,2.6h87.4l2.7,-2.6 2.6,-2.7L169,339.9c0,-102.6 0.2,-123.9 1.3,-123.9 0.8,0 41.1,56.1 89.7,124.7 48.5,68.7 89.2,125.6 90.4,126.5 1.9,1.6 5.5,1.8 37.7,1.8h35.6l2.7,-2.6 2.6,-2.7L429,36.3l-2.6,-2.7 -2.7,-2.6h-87.4l-2.7,2.6 -2.6,2.7v123.8c0,102.6 -0.2,123.9 -1.3,123.9 -0.8,0 -41.1,-56.1 -89.7,-124.8 -48.5,-68.6 -89.2,-125.5 -90.4,-126.4 -1.9,-1.6 -5.5,-1.8 -37.7,-1.8L76.3,31l-2.7,2.6zM232.5,180.7c51.2,72.3 94.4,133.1 96.1,134.9 2.9,3.1 3.6,3.4 9.1,3.4 5.2,0 6.4,-0.4 8.7,-2.6l2.6,-2.7L349,49h62v402l-25.2,-0.1h-25.3l-93,-131.6c-51.1,-72.3 -94.4,-133.1 -96.1,-134.9 -2.9,-3.1 -3.6,-3.4 -9.1,-3.4 -5.2,0 -6.4,0.4 -8.7,2.6l-2.6,2.7L151,451L89,451L89,49l25.3,0.1h25.2l93,131.6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/red_border.xml b/app/src/main/res/drawable/red_border.xml
index bc97c685f..24f709aeb 100644
--- a/app/src/main/res/drawable/red_border.xml
+++ b/app/src/main/res/drawable/red_border.xml
@@ -4,7 +4,7 @@
     <stroke
         android:width="1dip"
         android:color="@color/red_1" />
-    <corners android:radius="2dp"></corners>
+    <corners android:radius="2dp" />
     <padding
         android:bottom="1dip"
         android:left="4dip"
diff --git a/app/src/main/res/layout-sw600dp/activity_about.xml b/app/src/main/res/layout-sw600dp/activity_about.xml
index 7780fd3c6..b022810e0 100644
--- a/app/src/main/res/layout-sw600dp/activity_about.xml
+++ b/app/src/main/res/layout-sw600dp/activity_about.xml
@@ -20,7 +20,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -169,36 +169,6 @@
             android:layout_marginRight="150dp"
             android:textSize="16sp"
             android:visibility="gone" />
-        <!-- About logo designer -->
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|center_horizontal"
-            android:layout_marginTop="10dp"
-            android:padding="5dp"
-            android:text="@string/thanks_text_logo"
-            android:textColor="?colorAccent"
-            android:textSize="16sp" />
-
-        <app.fedilab.android.helper.ExpandableHeightListView
-            android:id="@+id/lv_designers"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|center_horizontal"
-            android:layout_marginLeft="150dp"
-            android:layout_marginRight="150dp"
-            android:divider="@null"
-            android:scrollbars="none" />
-
-        <TextView
-            android:id="@+id/txt_designers"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|center_horizontal"
-            android:layout_marginLeft="150dp"
-            android:layout_marginRight="150dp"
-            android:textSize="16sp"
-            android:visibility="gone" />
         <!-- About contributors -->
 
         <TextView
@@ -221,6 +191,15 @@
             android:layout_marginRight="150dp"
             android:divider="@null"
             android:scrollbars="none" />
+        <TextView
+            android:id="@+id/txt_thankyou3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:layout_marginLeft="150dp"
+            android:layout_marginRight="150dp"
+            android:textSize="16sp"
+            android:visibility="gone" />
 
         <TextView
             android:id="@+id/txt_thankyou1"
diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml
index 29fcb743a..aadc1bcac 100644
--- a/app/src/main/res/layout-sw600dp/activity_show_account.xml
+++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml
@@ -151,22 +151,22 @@
                     android:paddingTop="8dp"
                     app:layout_scrollFlags="scroll|enterAlways">
 
-                    <LinearLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="5dp"
-                        android:baselineAligned="false"
-                        android:gravity="center"
-                        android:orientation="horizontal">
+                        android:layout_marginTop="5dp">
 
                         <LinearLayout
-                            android:layout_width="0dp"
+                            android:id="@+id/names_container"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
-                            android:layout_weight="1"
                             android:gravity="center_horizontal"
                             android:orientation="vertical"
-                            tools:ignore="UselessParent">
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent">
 
                             <TextView
                                 android:id="@+id/account_dn"
@@ -211,36 +211,6 @@
                                 android:textColor="@color/red"
                                 android:visibility="gone" />
 
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:id="@+id/account_followed_by"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:background="@drawable/green_border"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/followed_by"
-                                    android:textColor="@color/verified_text"
-                                    android:visibility="gone" />
-
-                                <TextView
-                                    android:id="@+id/account_follow_request"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:background="@drawable/blue_border"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/request_sent"
-                                    android:textColor="@color/mastodonC4"
-                                    android:visibility="gone" />
-                            </LinearLayout>
-
                             <TextView
                                 android:id="@+id/account_moved"
                                 android:layout_width="wrap_content"
@@ -253,7 +223,21 @@
                                 android:visibility="gone" />
                         </LinearLayout>
 
-                    </LinearLayout>
+                        <ImageView
+                            android:id="@+id/identity_proofs_indicator"
+                            android:layout_width="45dp"
+                            android:layout_height="45dp"
+                            android:layout_marginStart="10dp"
+                            android:contentDescription="Identity proofs"
+                            android:padding="8dp"
+                            android:scaleType="fitCenter"
+                            android:src="@drawable/ic_verified_user"
+                            android:visibility="gone"
+                            app:layout_constraintBottom_toBottomOf="@id/names_container"
+                            app:layout_constraintStart_toEndOf="@id/names_container"
+                            app:layout_constraintTop_toTopOf="@id/names_container" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <TextView
                         android:id="@+id/account_note"
@@ -263,42 +247,69 @@
                         android:gravity="center"
                         android:padding="10dp" />
 
-                    <LinearLayout
+                    <HorizontalScrollView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
                         android:layout_marginBottom="10dp"
-                        android:gravity="center"
-                        android:orientation="horizontal">
+                        android:fillViewport="true"
+                        android:scrollbars="none">
 
-                        <TextView
-                            android:id="@+id/instance_info"
+                        <LinearLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginEnd="5dp"
-                            android:background="@drawable/blue_border"
-                            android:gravity="center"
-                            android:textColor="@color/mastodonC4"
-                            android:visibility="gone" />
+                            android:gravity="center_horizontal"
+                            android:orientation="horizontal">
 
-                        <TextView
-                            android:id="@+id/seperator"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginEnd="5dp"
-                            android:gravity="center"
-                            android:text="-"
-                            android:visibility="gone" />
+                            <TextView
+                                android:id="@+id/instance_info"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/blue_border"
+                                android:maxLines="1"
+                                android:textColor="@color/mastodonC4"
+                                android:visibility="gone" />
 
-                        <TextView
-                            android:id="@+id/account_date"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:gravity="center" />
-                    </LinearLayout>
+                            <TextView
+                                android:id="@+id/account_date"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/blue_border"
+                                android:maxLines="1"
+                                android:visibility="gone"
+                                android:textColor="@color/mastodonC4" />
+
+                            <TextView
+                                android:id="@+id/account_followed_by"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/green_border"
+                                android:maxLines="1"
+                                android:text="@string/followed_by"
+                                android:textColor="@color/verified_text"
+                                android:visibility="gone" />
+
+                            <TextView
+                                android:id="@+id/account_follow_request"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/blue_border"
+                                android:maxLines="1"
+                                android:text="@string/request_sent"
+                                android:textColor="@color/mastodonC4"
+                                android:visibility="gone" />
+
+
+                        </LinearLayout>
+
+                    </HorizontalScrollView>
                     <!-- Fields container -->
                     <LinearLayout
                         android:id="@+id/fields_container"
@@ -477,7 +488,8 @@
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
             app:layout_collapseMode="pin"
-            app:theme="@style/ThemeOverlay.AppCompat.Light">
+            app:theme="@style/ThemeOverlay.AppCompat.Light"
+          >
 
             <LinearLayout
                 android:id="@+id/toolbar_content"
@@ -493,7 +505,6 @@
                     android:layout_height="30dp"
                     android:layout_gravity="center_vertical"
                     android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
                     android:contentDescription="@string/profile_picture"
                     android:gravity="center_vertical" />
 
diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml
deleted file mode 100644
index e56ff1a97..000000000
--- a/app/src/main/res/layout-sw600dp/activity_toot.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-    Copyright 2017 Thomas Schneider
-
-    This file is a part of Fedilab
-
-    This program is free software; you can redistribute it and/or modify it under the terms of the
-    GNU General Public License as published by the Free Software Foundation; either version 3 of the
-    License, or (at your option) any later version.
-
-    Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-    Public License for more details.
-
-    You should have received a copy of the GNU General Public License along with Fedilab; if not,
-    see <http://www.gnu.org/licenses>.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
-
-    <RelativeLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="@dimen/fab_margin"
-        android:paddingTop="@dimen/fab_margin"
-        android:paddingRight="@dimen/fab_margin"
-        android:paddingBottom="@dimen/fab_margin">
-
-        <TextView
-            android:id="@+id/warning_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_margin="5dp"
-            android:background="@drawable/red_border"
-            android:gravity="center"
-            android:text="@string/reply_might_be_useless"
-            android:textColor="@color/red_1"
-            android:visibility="gone" />
-
-        <EditText
-            android:id="@+id/toot_cw_content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:animateLayoutChanges="true"
-            android:hint="@string/toot_cw_placeholder"
-            android:visibility="gone" />
-
-        <ScrollView
-            android:id="@+id/composer_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/bottom_bar_tooting"
-            android:layout_below="@+id/toot_cw_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginLeft="0dp"
-            android:layout_marginEnd="0dp"
-            android:layout_marginRight="0dp"
-            android:layout_marginBottom="0dp"
-            android:fillViewport="true">
-
-            <app.fedilab.android.helper.MastalabAutoCompleteTextView
-                android:id="@+id/toot_content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:gravity="top|start"
-                android:hint="@string/toot_placeholder"
-                android:inputType="textMultiLine|textCapSentences"
-                android:minLines="4" />
-        </ScrollView>
-
-        <HorizontalScrollView
-            android:id="@+id/toolbar_scrollview"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="#e6e6e6"
-            android:scrollbars="none"
-            android:visibility="gone">
-
-            <include layout="@layout/editor_toolbar_linearlayout_horizontal" />
-        </HorizontalScrollView>
-
-        <ScrollView
-            android:id="@+id/wysiwyg_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/bottom_bar_tooting"
-            android:layout_below="@+id/toolbar_scrollview"
-            android:layout_alignParentEnd="true"
-            android:layout_marginLeft="0dp"
-            android:layout_marginEnd="0dp"
-            android:layout_marginRight="0dp"
-            android:layout_marginBottom="0dp"
-            android:fillViewport="true"
-            android:visibility="gone">
-
-            <com.github.irshulx.Editor
-                android:id="@+id/editor"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/toot_placeholder"
-                android:paddingLeft="10dp"
-                android:paddingTop="10dp"
-                android:paddingRight="10dp"
-                android:paddingBottom="100dp"
-                app:render_type="Editor" />
-        </ScrollView>
-
-        <LinearLayout
-            android:id="@+id/bottom_bar_tooting"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:id="@+id/progress_bar_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone">
-
-                <ProgressBar
-                    android:id="@+id/upload_progress"
-                    style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:indeterminate="false"
-                    android:max="100"
-                    android:progress="0" />
-
-                <TextView
-                    android:id="@+id/toolbar_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:textColor="@color/dark_text"
-                    android:textSize="12sp" />
-            </RelativeLayout>
-
-            <HorizontalScrollView
-                android:id="@+id/picture_scrollview"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone">
-
-                <LinearLayout
-                    android:id="@+id/toot_picture_container"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="center_vertical"
-                    android:maxHeight="100dp"
-                    android:orientation="horizontal"
-                    android:padding="5dp"></LinearLayout>
-            </HorizontalScrollView>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <ImageButton
-                    android:id="@+id/toot_picture"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginRight="5dp"
-                    android:background="@color/transparent"
-                    android:contentDescription="@string/toot_select_image"
-                    android:gravity="center"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/ic_insert_photo" />
-
-                <ImageButton
-                    android:id="@+id/poll_action"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginRight="5dp"
-                    android:background="@color/transparent"
-                    android:contentDescription="@string/poll"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/ic_view_list_poll"
-                    android:visibility="gone" />
-
-                <ImageButton
-                    android:id="@+id/toot_visibility"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginRight="5dp"
-                    android:background="@color/transparent"
-                    android:contentDescription="@string/toot_visibility_tilte"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/ic_public" />
-
-                <Button
-                    android:id="@+id/toot_cw"
-                    android:layout_width="50dp"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginRight="5dp"
-                    android:adjustViewBounds="true"
-                    android:background="@color/transparent"
-                    android:scaleType="centerCrop"
-                    android:text="@string/cw"
-                    android:textSize="25sp" />
-
-                <ImageButton
-                    android:id="@+id/toot_emoji"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="5dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_marginRight="5dp"
-                    android:background="@color/transparent"
-                    android:contentDescription="@string/emoji_picker"
-                    android:minWidth="0dp"
-                    android:minHeight="0dp"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/ic_insert_emoticon" />
-
-                <TextView
-                    android:id="@+id/toot_space_left"
-                    android:layout_width="0dp"
-                    android:layout_height="45dp"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:textColor="?colorAccent" />
-
-                <Button
-                    android:id="@+id/toot_it"
-                    style="@style/Base.Widget.AppCompat.Button.Colored"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50dp"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:text="@string/toot_it"
-                    android:textSize="18sp" />
-
-            </LinearLayout>
-
-            <CheckBox
-                android:id="@+id/toot_sensitive"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/toot_sensitive"
-                android:visibility="gone" />
-        </LinearLayout>
-    </RelativeLayout>
-</ScrollView>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index e08fcb194..918fe230c 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -145,31 +145,6 @@
             android:visibility="gone" />
 
 
-        <!-- About logo designer -->
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginTop="10dp"
-            android:gravity="center_vertical"
-            android:padding="5dp"
-            android:text="@string/thanks_text_logo"
-            android:textColor="?colorAccent"
-            android:textSize="16sp" />
-
-        <app.fedilab.android.helper.ExpandableHeightListView
-            android:id="@+id/lv_designers"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:divider="@null"
-            android:scrollbars="none" />
-
-        <TextView
-            android:id="@+id/txt_designers"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="16sp"
-            android:visibility="gone" />
         <!-- About contributors -->
 
         <TextView
@@ -190,6 +165,13 @@
             android:divider="@null"
             android:scrollbars="none" />
 
+        <TextView
+            android:id="@+id/txt_thankyou3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:visibility="gone" />
+
         <TextView
             android:id="@+id/txt_thankyou1"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index ce69f8589..7c0c30a7e 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -37,7 +37,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+               />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
@@ -57,7 +58,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:divider="@null"
-                    android:scrollbars="none"></androidx.recyclerview.widget.RecyclerView>
+                    android:scrollbars="none"/>
             </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
             <RelativeLayout
diff --git a/app/src/main/res/layout/activity_hashtag.xml b/app/src/main/res/layout/activity_hashtag.xml
index a64d2252c..a7f241fa0 100644
--- a/app/src/main/res/layout/activity_hashtag.xml
+++ b/app/src/main/res/layout/activity_hashtag.xml
@@ -37,7 +37,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+                />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/activity_instance_profile.xml b/app/src/main/res/layout/activity_instance_profile.xml
new file mode 100644
index 000000000..54c0dcaaa
--- /dev/null
+++ b/app/src/main/res/layout/activity_instance_profile.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="450dp"
+    android:layout_margin="@dimen/fab_margin"
+    android:fitsSystemWindows="true"
+    tools:context="app.fedilab.android.activities.InstanceProfileActivity">
+
+    <ImageView
+        android:id="@+id/back_ground_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:alpha="0.2"
+        android:contentDescription="@string/logo_of_the_instance"
+        android:scaleType="centerCrop" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/instance_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/fab_margin"
+            android:layout_marginEnd="@dimen/fab_margin"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_margin="10dp"
+                android:background="@drawable/blue_border"
+                android:gravity="center"
+                android:textColor="@color/mastodonC4"
+                android:textSize="20sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/description"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="5dp"
+                android:autoLink="web"
+                android:gravity="center"
+                android:textSize="14sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/name" />
+
+            <TextView
+                android:id="@+id/user_count_label"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:text="@string/user_count"
+                android:textAlignment="center"
+                app:layout_constraintEnd_toStartOf="@id/status_count_label"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/description" />
+
+            <TextView
+                android:id="@+id/status_count_label"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:text="@string/status_count"
+                android:textAlignment="center"
+                app:layout_constraintEnd_toStartOf="@id/instance_count_label"
+                app:layout_constraintStart_toEndOf="@id/user_count_label"
+                app:layout_constraintTop_toBottomOf="@id/description" />
+
+            <TextView
+                android:id="@+id/instance_count_label"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:text="@string/instance_count"
+                android:textAlignment="center"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/status_count_label"
+                app:layout_constraintTop_toBottomOf="@id/description" />
+
+            <TextView
+                android:id="@+id/user_count"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                app:layout_constraintEnd_toEndOf="@id/user_count_label"
+                app:layout_constraintStart_toStartOf="@id/user_count_label"
+                app:layout_constraintTop_toBottomOf="@id/user_count_label" />
+
+            <TextView
+                android:id="@+id/status_count"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                app:layout_constraintEnd_toEndOf="@id/status_count_label"
+                app:layout_constraintStart_toStartOf="@id/status_count_label"
+                app:layout_constraintTop_toBottomOf="@id/status_count_label" />
+
+            <TextView
+                android:id="@+id/instance_count"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                app:layout_constraintEnd_toEndOf="@id/instance_count_label"
+                app:layout_constraintStart_toStartOf="@id/instance_count_label"
+                app:layout_constraintTop_toBottomOf="@id/instance_count_label" />
+
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/barrier_counters_bottom"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:barrierDirection="bottom"
+                app:constraint_referenced_ids="user_count,status_count,instance_count" />
+
+            <TextView
+                android:id="@+id/software"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:textSize="12sp"
+                android:textStyle="italic"
+                app:layout_constraintEnd_toStartOf="@id/version"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/barrier_counters_bottom" />
+
+            <TextView
+                android:id="@+id/version"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:textSize="12sp"
+                android:textStyle="italic"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/software"
+                app:layout_constraintTop_toBottomOf="@id/barrier_counters_bottom" />
+
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/barrier_software_version_bottom"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:barrierDirection="bottom"
+                app:constraint_referenced_ids="software,version" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/lv_accounts"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginEnd="5dp"
+                android:divider="@null"
+                android:scrollbars="none"
+                app:layout_constraintTop_toBottomOf="@id/barrier_software_version_bottom" />
+
+            <Button
+                android:id="@+id/close"
+                style="@style/Base.Widget.AppCompat.Button.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="20dp"
+                android:text="@string/close"
+                android:textAllCaps="false"
+                android:textColor="@color/white"
+                android:textSize="16sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/lv_accounts" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </ScrollView>
+
+    <ProgressBar
+        android:id="@+id/loader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_instance_social.xml b/app/src/main/res/layout/activity_instance_social.xml
index 4d6151770..58e39eafb 100644
--- a/app/src/main/res/layout/activity_instance_social.xml
+++ b/app/src/main/res/layout/activity_instance_social.xml
@@ -28,58 +28,76 @@
         android:orientation="vertical"
         android:visibility="gone">
 
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:id="@+id/main_container">
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:textSize="20sp" />
+
+            <TextView
+                android:id="@+id/values"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dp"
+                android:gravity="center" />
+
+
+            <TextView
+                android:id="@+id/checked_at"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dp" />
+
+            <TextView
+                android:id="@+id/up"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dp"
+                android:textSize="16sp"
+                android:textStyle="bold" />
+
+
+            <TextView
+                android:id="@+id/uptime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dp" />
+
+            <TextView
+                android:id="@+id/ref_instance"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_gravity="end|center_vertical"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="5dp"
+                android:layout_weight="1"
+                android:text="via instances.social"
+                tools:ignore="HardcodedText" />
+        </LinearLayout>
+        <TextView
+            android:layout_marginTop="50dp"
+            android:layout_marginBottom="50dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
             android:gravity="center"
-            android:textSize="20sp" />
-
-        <TextView
-            android:id="@+id/values"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="10dp"
-            android:gravity="center" />
-
-
-        <TextView
-            android:id="@+id/checked_at"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="10dp" />
-
-        <TextView
-            android:id="@+id/up"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="10dp"
             android:textSize="16sp"
-            android:textStyle="bold" />
-
-
-        <TextView
-            android:id="@+id/uptime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:id="@+id/no_instance"
+            android:visibility="gone"
+            android:autoLink="web"
             android:layout_gravity="center"
-            android:layout_marginTop="10dp" />
-
-        <TextView
-            android:id="@+id/ref_instance"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:layout_gravity="end|center_vertical"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="5dp"
-            android:layout_weight="1"
-            android:text="via instances.social"
-            tools:ignore="HardcodedText" />
-
+            android:text="@string/no_instance_reccord"
+            />
         <Button
             android:id="@+id/close"
             style="@style/Base.Widget.AppCompat.Button.Colored"
@@ -93,6 +111,7 @@
             android:textSize="16sp" />
     </LinearLayout>
 
+
     <RelativeLayout
         android:id="@+id/loader"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml
index 32ea1e91e..8e57f197f 100644
--- a/app/src/main/res/layout/activity_list.xml
+++ b/app/src/main/res/layout/activity_list.xml
@@ -39,7 +39,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+                />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 649cfabcb..9fb168f2a 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -25,181 +25,209 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <ImageView
-            android:id="@+id/main_logo"
-            android:layout_width="150dp"
-            android:layout_height="150dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dp"
-            android:contentDescription="@string/app_logo" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/step_instance"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        <LinearLayout
+            <ImageView
+                android:id="@+id/main_logo"
+                android:layout_width="150dp"
+                android:layout_height="150dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="20dp"
+                android:contentDescription="@string/app_logo"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/login_instance_layout"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="50dp"
+                android:layout_marginTop="30dp"
+                app:errorEnabled="true"
+                app:layout_constraintEnd_toStartOf="@id/info_instance"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/main_logo">
+
+                <androidx.appcompat.widget.AppCompatAutoCompleteTextView
+                    android:id="@+id/login_instance"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:dropDownAnchor="@id/login_instance_layout"
+                    android:hint="@string/instance_example"
+                    android:imeOptions="actionNext"
+                    android:inputType="textWebEmailAddress"
+                    android:maxLines="1" />
+
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <ImageView
+                android:id="@+id/info_instance"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_marginEnd="50dp"
+                android:contentDescription="@string/more_information"
+                android:src="@drawable/ic_info_login"
+                app:layout_constraintBottom_toBottomOf="@id/login_instance_layout"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@id/login_instance_layout" />
+
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/barrier_instance_bottom"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:barrierDirection="bottom"
+                app:constraint_referenced_ids="info_instance,login_instance_layout" />
+
+            <Button
+                android:id="@+id/connect_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="20dp"
+                android:drawableStart="@drawable/ic_check_circle"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:maxLines="1"
+                android:paddingStart="15dp"
+                android:paddingTop="12dp"
+                android:paddingEnd="20dp"
+                android:paddingBottom="12dp"
+                android:text="@string/connect_instance"
+                android:textAllCaps="false"
+                android:textSize="20sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/barrier_instance_bottom" />
+
+            <TextView
+                android:id="@+id/create_an_account"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="30dp"
+                android:drawableStart="@drawable/mastodon_icon_item"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="@string/join_mastodon"
+                android:textSize="16sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/connect_button" />
+
+            <TextView
+                android:id="@+id/create_an_account_peertube"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="20dp"
+                android:drawableStart="@drawable/peertube_icon"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="@string/join_peertube"
+                android:textSize="16sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/create_an_account" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/step_login_credential"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginStart="@dimen/activity_vertical_margin_login"
-            android:layout_marginLeft="@dimen/activity_vertical_margin_login"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="@dimen/activity_vertical_margin_login"
-            android:layout_marginRight="@dimen/activity_vertical_margin_login"
-            android:layout_marginBottom="20dp"
-            android:gravity="center"
-            android:orientation="vertical">
+            android:paddingStart="50dp"
+            android:paddingEnd="50dp"
+            android:visibility="gone">
 
-            <LinearLayout
-                android:id="@+id/step_instance"
-                android:layout_width="match_parent"
+            <TextView
+                android:id="@+id/instance_chosen"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_gravity="center"
+                android:layout_marginTop="20dp"
+                android:textColor="?colorAccent"
+                android:textSize="20sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/login_instance_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:errorEnabled="true">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <AutoCompleteTextView
-                            android:id="@+id/login_instance"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:hint="@string/instance_example"
-                            android:imeOptions="actionNext"
-                            android:inputType="textWebEmailAddress"
-                            android:maxLines="1" />
-
-                        <ImageView
-                            android:id="@+id/info_instance"
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:contentDescription="@string/more_information"
-                            android:src="@drawable/ic_info_login" />
-                    </LinearLayout>
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <Button
-                    android:id="@+id/connect_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="20dp"
-                    android:drawableStart="@drawable/ic_check_circle"
-                    android:drawablePadding="10dp"
-                    android:gravity="center"
-                    android:maxLines="1"
-                    android:paddingStart="15dp"
-                    android:paddingTop="12dp"
-                    android:paddingEnd="20dp"
-                    android:paddingBottom="12dp"
-                    android:text="@string/connect_instance"
-                    android:textAllCaps="false"
-                    android:textSize="20sp" />
-
-
-                <TextView
-                    android:id="@+id/create_an_account"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="30dp"
-                    android:drawableStart="@drawable/mastodon_icon_item"
-                    android:drawablePadding="10dp"
-                    android:gravity="center"
-                    android:text="@string/join_mastodon"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:id="@+id/create_an_account_peertube"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="20dp"
-                    android:drawableStart="@drawable/peertube_icon"
-                    android:drawablePadding="10dp"
-                    android:gravity="center"
-                    android:text="@string/join_peertube"
-                    android:textSize="16sp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/step_login_credential"
-                android:layout_width="match_parent"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/login_uid_container"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone">
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/instance_chosen">
 
-                <TextView
-                    android:id="@+id/instance_chosen"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_margin="10dp"
-                    android:textColor="?colorAccent"
-                    android:textSize="16sp" />
-
-                <LinearLayout
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/login_uid"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:autofillHints="username"
+                    android:hint="@string/username"
+                    android:inputType="textEmailAddress"
+                    android:maxLines="1" />
 
-                    <EditText
-                        android:id="@+id/login_uid"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:hint="@string/username"
-                        android:inputType="textEmailAddress"
-                        android:maxLines="1" />
-                </LinearLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-                <LinearLayout
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/login_passwd_container"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/login_uid_container">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/login_passwd"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:autofillHints="password"
+                    android:hint="@string/password"
+                    android:inputType="textPassword"
+                    android:maxLines="1" />
 
-                    <EditText
-                        android:id="@+id/login_passwd"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:hint="@string/password"
-                        android:inputType="textPassword"
-                        android:maxLines="1" />
-                </LinearLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-                <TextView
-                    android:id="@+id/login_issue"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="10dp"
-                    android:visibility="gone" />
+            <TextView
+                android:id="@+id/login_issue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="10dp"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/login_passwd_container" />
 
-                <Button
-                    android:id="@+id/login_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="20dp"
-                    android:drawableStart="@drawable/mastodon_icon"
-                    android:drawablePadding="10dp"
-                    android:gravity="center"
-                    android:maxLines="1"
-                    android:paddingStart="15dp"
-                    android:paddingTop="12dp"
-                    android:paddingEnd="20dp"
-                    android:paddingBottom="12dp"
-                    android:text="@string/login"
-                    android:textAllCaps="false"
-                    android:textSize="20sp" />
-            </LinearLayout>
+            <Button
+                android:id="@+id/login_button"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="20dp"
+                android:drawableStart="@drawable/mastodon_icon"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:maxLines="1"
+                android:paddingStart="15dp"
+                android:paddingTop="12dp"
+                android:paddingEnd="20dp"
+                android:paddingBottom="12dp"
+                android:text="@string/login"
+                android:textAllCaps="false"
+                android:textSize="20sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/login_issue" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        </LinearLayout>
     </LinearLayout>
+
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c8b67691b..95b7969b0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -38,7 +38,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways">
+                app:layout_scrollFlags="scroll|enterAlways"
+                >
 
                 <ImageView
                     android:id="@+id/iconbar"
@@ -159,6 +160,8 @@
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:fitsSystemWindows="false"
+        app:itemTextColor="?attr/textColor"
+        android:background="@color/cyanea_primary_dark_reference"
         app:headerLayout="@layout/nav_header_main"
         app:menu="@menu/activity_main_drawer" />
 
diff --git a/app/src/main/res/layout/activity_ower_notifications.xml b/app/src/main/res/layout/activity_ower_notifications.xml
index 24d4e6aa5..6aca79cee 100644
--- a/app/src/main/res/layout/activity_ower_notifications.xml
+++ b/app/src/main/res/layout/activity_ower_notifications.xml
@@ -22,7 +22,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+                />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/activity_ower_status.xml b/app/src/main/res/layout/activity_ower_status.xml
index 0ad2f0757..64b67e06b 100644
--- a/app/src/main/res/layout/activity_ower_status.xml
+++ b/app/src/main/res/layout/activity_ower_status.xml
@@ -22,7 +22,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+                />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/activity_peertube_edit.xml b/app/src/main/res/layout/activity_peertube_edit.xml
index 5e93dbc2c..251d3c290 100644
--- a/app/src/main/res/layout/activity_peertube_edit.xml
+++ b/app/src/main/res/layout/activity_peertube_edit.xml
@@ -119,11 +119,11 @@
                     android:gravity="center"
                     android:text="@string/channel" />
 
-                <com.jaredrummler.materialspinner.MaterialSpinner
+                <Spinner
                     android:id="@+id/set_upload_channel"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:ms_background_color="?colorPrimaryDark" />
+                     />
             </LinearLayout>
 
 
@@ -142,11 +142,11 @@
                     android:gravity="center"
                     android:text="@string/category" />
 
-                <com.jaredrummler.materialspinner.MaterialSpinner
+                <Spinner
                     android:id="@+id/set_upload_categories"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:ms_background_color="?colorPrimaryDark" />
+                    />
             </LinearLayout>
 
 
@@ -165,11 +165,11 @@
                     android:gravity="center"
                     android:text="@string/license" />
 
-                <com.jaredrummler.materialspinner.MaterialSpinner
+                <Spinner
                     android:id="@+id/set_upload_licenses"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:ms_background_color="?colorPrimaryDark" />
+                     />
             </LinearLayout>
 
 
@@ -188,11 +188,11 @@
                     android:gravity="center"
                     android:text="@string/language" />
 
-                <com.jaredrummler.materialspinner.MaterialSpinner
+                <Spinner
                     android:id="@+id/set_upload_languages"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:ms_background_color="?colorPrimaryDark" />
+                    />
             </LinearLayout>
 
             <!-- Videos Privacy -->
@@ -210,11 +210,11 @@
                     android:gravity="center"
                     android:text="@string/action_privacy" />
 
-                <com.jaredrummler.materialspinner.MaterialSpinner
+                <Spinner
                     android:id="@+id/set_upload_privacy"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:ms_background_color="?colorPrimaryDark" />
+                    />
             </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/activity_peertube_upload.xml b/app/src/main/res/layout/activity_peertube_upload.xml
index d3d81ac8d..fb7b007a5 100644
--- a/app/src/main/res/layout/activity_peertube_upload.xml
+++ b/app/src/main/res/layout/activity_peertube_upload.xml
@@ -64,12 +64,11 @@
                 android:text="@string/channel"
                 android:textSize="16sp" />
 
-            <com.jaredrummler.materialspinner.MaterialSpinner
+            <Spinner
                 android:id="@+id/set_upload_channel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="16sp"
-                app:ms_background_color="?colorPrimaryDark" />
+                android:textSize="16sp" />
         </LinearLayout>
 
 
@@ -89,12 +88,12 @@
                 android:text="@string/action_privacy"
                 android:textSize="16sp" />
 
-            <com.jaredrummler.materialspinner.MaterialSpinner
+            <Spinner
                 android:id="@+id/set_upload_privacy"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="16sp"
-                app:ms_background_color="?colorPrimaryDark" />
+                />
         </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/activity_playlists.xml b/app/src/main/res/layout/activity_playlists.xml
index c66150ac9..52396b648 100644
--- a/app/src/main/res/layout/activity_playlists.xml
+++ b/app/src/main/res/layout/activity_playlists.xml
@@ -39,7 +39,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+                />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index ea2f6404a..a43402196 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -35,12 +35,13 @@
             android:text="@string/pickup_instance_category"
             android:textSize="16sp" />
 
-        <com.jaredrummler.materialspinner.MaterialSpinner
+        <Spinner
             android:id="@+id/reg_category"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="16sp"
-            app:ms_background_color="?colorPrimaryDark" />
+            android:layout_gravity="end"
+           />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/reg_category_view"
diff --git a/app/src/main/res/layout/activity_search_result.xml b/app/src/main/res/layout/activity_search_result.xml
index 200291ae8..bb464a29c 100644
--- a/app/src/main/res/layout/activity_search_result.xml
+++ b/app/src/main/res/layout/activity_search_result.xml
@@ -28,7 +28,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:divider="@null"
-        android:scrollbars="none"></ListView>
+        android:scrollbars="none"/>
 
     <RelativeLayout
         android:id="@+id/no_result"
@@ -48,7 +48,7 @@
             android:typeface="serif" />
     </RelativeLayout>
     <!-- Main Loader -->
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout
         android:id="@+id/loader"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_search_result_tabs.xml b/app/src/main/res/layout/activity_search_result_tabs.xml
index e3f090ee5..bebbd5e6a 100644
--- a/app/src/main/res/layout/activity_search_result_tabs.xml
+++ b/app/src/main/res/layout/activity_search_result_tabs.xml
@@ -27,6 +27,7 @@
         android:id="@+id/search_tabLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:tabTextAppearance="@style/TabLayoutStyle"
         android:background="?colorPrimary"
         app:tabGravity="fill"
         app:tabMode="fixed"
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index 3a90c1bec..1abd61f38 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -26,7 +26,7 @@
         android:id="@+id/appBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?backgroundColor"
+        android:background="@color/cyanea_primary_dark"
         android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
@@ -158,22 +158,22 @@
                     android:paddingTop="8dp"
                     app:layout_scrollFlags="scroll|enterAlways">
 
-                    <LinearLayout
+                    <androidx.constraintlayout.widget.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="5dp"
-                        android:baselineAligned="false"
-                        android:gravity="center"
-                        android:orientation="horizontal">
+                        android:layout_marginTop="5dp">
 
                         <LinearLayout
-                            android:layout_width="0dp"
+                            android:id="@+id/names_container"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
-                            android:layout_weight="1"
                             android:gravity="center_horizontal"
                             android:orientation="vertical"
-                            tools:ignore="UselessParent">
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent">
 
                             <TextView
                                 android:id="@+id/account_dn"
@@ -219,38 +219,6 @@
                                 android:textColor="@color/red"
                                 android:visibility="gone" />
 
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:id="@+id/account_followed_by"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:layout_marginTop="5dp"
-                                    android:background="@drawable/green_border"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/followed_by"
-                                    android:textColor="@color/verified_text"
-                                    android:visibility="gone" />
-
-                                <TextView
-                                    android:id="@+id/account_follow_request"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center"
-                                    android:layout_marginTop="5dp"
-                                    android:background="@drawable/blue_border"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/request_sent"
-                                    android:textColor="@color/mastodonC4"
-                                    android:visibility="gone" />
-                            </LinearLayout>
-
                             <TextView
                                 android:id="@+id/account_moved"
                                 android:layout_width="wrap_content"
@@ -264,7 +232,21 @@
 
                         </LinearLayout>
 
-                    </LinearLayout>
+                        <ImageView
+                            android:id="@+id/identity_proofs_indicator"
+                            android:layout_width="45dp"
+                            android:layout_height="45dp"
+                            android:layout_marginStart="10dp"
+                            android:contentDescription="@string/identity_proofs"
+                            android:padding="8dp"
+                            android:scaleType="fitCenter"
+                            android:src="@drawable/ic_verified_user"
+                            android:visibility="gone"
+                            app:layout_constraintBottom_toBottomOf="@id/names_container"
+                            app:layout_constraintStart_toEndOf="@id/names_container"
+                            app:layout_constraintTop_toTopOf="@id/names_container" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <TextView
                         android:id="@+id/account_note"
@@ -274,43 +256,68 @@
                         android:gravity="center"
                         android:padding="10dp" />
 
-                    <LinearLayout
+                    <HorizontalScrollView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center"
                         android:layout_marginBottom="10dp"
-                        android:gravity="center"
-                        android:orientation="horizontal">
+                        android:fillViewport="true"
+                        android:scrollbars="none">
 
-                        <TextView
-                            android:id="@+id/instance_info"
+                        <LinearLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginEnd="5dp"
-                            android:background="@drawable/blue_border"
-                            android:gravity="center"
-                            android:textColor="@color/mastodonC4"
-                            android:visibility="gone" />
+                            android:gravity="center_horizontal"
+                            android:orientation="horizontal">
 
-                        <TextView
-                            android:id="@+id/seperator"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginEnd="5dp"
-                            android:gravity="center"
-                            android:text="-"
-                            android:visibility="gone"
-                            tools:ignore="HardcodedText" />
+                            <TextView
+                                android:id="@+id/instance_info"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/blue_border"
+                                android:maxLines="1"
+                                android:textColor="@color/mastodonC4"
+                                android:visibility="gone" />
 
-                        <TextView
-                            android:id="@+id/account_date"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:gravity="center" />
-                    </LinearLayout>
+                            <TextView
+                                android:id="@+id/account_date"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/blue_border"
+                                android:maxLines="1"
+                                android:visibility="gone"
+                                android:textColor="@color/mastodonC4" />
+
+                            <TextView
+                                android:id="@+id/account_followed_by"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/green_border"
+                                android:maxLines="1"
+                                android:text="@string/followed_by"
+                                android:textColor="@color/verified_text"
+                                android:visibility="gone" />
+
+                            <TextView
+                                android:id="@+id/account_follow_request"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="3dp"
+                                android:layout_marginEnd="3dp"
+                                android:background="@drawable/blue_border"
+                                android:maxLines="1"
+                                android:text="@string/request_sent"
+                                android:textColor="@color/mastodonC4"
+                                android:visibility="gone" />
+
+                        </LinearLayout>
+
+                    </HorizontalScrollView>
                     <!-- Fields container -->
                     <LinearLayout
                         android:id="@+id/fields_container"
@@ -489,7 +496,8 @@
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
             app:layout_collapseMode="pin"
-            app:theme="@style/ThemeOverlay.AppCompat.Light">
+            app:theme="@style/ThemeOverlay.AppCompat.Light"
+            >
 
             <LinearLayout
                 android:id="@+id/toolbar_content"
diff --git a/app/src/main/res/layout/activity_show_conversation.xml b/app/src/main/res/layout/activity_show_conversation.xml
index 395bad3b7..4c5d3264a 100644
--- a/app/src/main/res/layout/activity_show_conversation.xml
+++ b/app/src/main/res/layout/activity_show_conversation.xml
@@ -17,15 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways">
-
-                <include layout="@layout/conversation_action_bar" />
-            </androidx.appcompat.widget.Toolbar>
+            <include layout="@layout/conversation_action_bar" />
         </com.google.android.material.appbar.AppBarLayout>
 
         <!-- Framelayout to display Fragments -->
diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index e02c9e079..a8bb9c906 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -14,287 +14,275 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>.
 -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/tools"
+<LinearLayout android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true"
-    app:ignore="NamespaceTypo">
+    android:orientation="vertical"
+    android:paddingLeft="@dimen/toot_padding"
+    android:paddingTop="@dimen/toot_padding"
+    android:paddingRight="@dimen/toot_padding"
+    android:paddingBottom="@dimen/toot_padding"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <RelativeLayout
-        android:id="@+id/drawer_layout"
+    <TextView
+        android:id="@+id/warning_message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="@dimen/toot_padding"
-        android:paddingTop="@dimen/toot_padding"
-        android:paddingRight="@dimen/toot_padding"
-        android:paddingBottom="@dimen/toot_padding">
+        android:layout_gravity="center"
+        android:layout_margin="5dp"
+        android:background="@drawable/red_border"
+        android:gravity="center"
+        android:text="@string/reply_might_be_useless"
+        android:textColor="@color/red_1"
+        android:visibility="gone" />
 
-        <TextView
-            android:id="@+id/warning_message"
+    <EditText
+        android:id="@+id/toot_cw_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:animateLayoutChanges="true"
+        android:hint="@string/toot_cw_placeholder"
+        android:visibility="gone" />
+
+    <ScrollView
+        android:id="@+id/composer_container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_marginLeft="0dp"
+        android:layout_marginEnd="0dp"
+        android:layout_marginRight="0dp"
+        android:layout_marginBottom="0dp"
+        android:fillViewport="true">
+
+        <app.fedilab.android.helper.MastalabAutoCompleteTextView
+            android:id="@+id/toot_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_margin="5dp"
-            android:background="@drawable/red_border"
-            android:gravity="center"
-            android:text="@string/reply_might_be_useless"
-            android:textColor="@color/red_1"
-            android:visibility="gone" />
+            android:layout_marginTop="10dp"
+            android:gravity="top|start"
+            android:hint="@string/toot_placeholder"
+            android:inputType="textMultiLine|textCapSentences"
+            android:minLines="4" />
+    </ScrollView>
 
-        <EditText
-            android:id="@+id/toot_cw_content"
+    <HorizontalScrollView
+        android:id="@+id/toolbar_scrollview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?colorPrimary"
+        android:scrollbars="none"
+        android:visibility="gone">
+
+        <include layout="@layout/editor_toolbar_linearlayout_horizontal" />
+    </HorizontalScrollView>
+
+    <ScrollView
+        android:id="@+id/wysiwyg_container"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:layout_marginLeft="0dp"
+        android:layout_marginEnd="0dp"
+        android:layout_marginRight="0dp"
+        android:layout_marginBottom="0dp"
+        android:fillViewport="true"
+        android:visibility="gone">
+
+        <com.github.irshulx.Editor
+            android:id="@+id/editor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/warning_message"
-            android:layout_marginTop="20dp"
-            android:animateLayoutChanges="true"
-            android:hint="@string/toot_cw_placeholder"
-            android:visibility="gone" />
+            android:hint="@string/toot_placeholder"
+            android:paddingLeft="10dp"
+            android:paddingTop="10dp"
+            android:paddingRight="10dp"
+            android:paddingBottom="100dp"
+            app:render_type="Editor" />
+    </ScrollView>
 
-        <ScrollView
-            android:id="@+id/composer_container"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/suggestions"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:id="@+id/bottom_bar_tooting"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/progress_bar_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/bottom_bar_tooting"
-            android:layout_below="@+id/toot_cw_content"
-            android:layout_alignParentEnd="true"
-            android:layout_marginLeft="0dp"
-            android:layout_marginEnd="0dp"
-            android:layout_marginRight="0dp"
-            android:layout_marginBottom="0dp"
-            android:fillViewport="true">
+            android:layout_height="wrap_content"
+            android:visibility="gone">
 
-            <app.fedilab.android.helper.MastalabAutoCompleteTextView
-                android:id="@+id/toot_content"
+            <ProgressBar
+                android:id="@+id/upload_progress"
+                style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:gravity="top|start"
-                android:hint="@string/toot_placeholder"
-                android:inputType="textMultiLine|textCapSentences"
-                android:minLines="4" />
-        </ScrollView>
+                android:indeterminate="false"
+                android:max="100"
+                android:progress="0" />
+
+            <TextView
+                android:id="@+id/toolbar_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:textColor="@color/dark_text"
+                android:textSize="12sp" />
+        </RelativeLayout>
 
         <HorizontalScrollView
-            android:id="@+id/toolbar_scrollview"
+            android:id="@+id/picture_scrollview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="#e6e6e6"
-            android:scrollbars="none"
             android:visibility="gone">
 
-            <include layout="@layout/editor_toolbar_linearlayout_horizontal" />
-        </HorizontalScrollView>
-
-        <ScrollView
-            android:id="@+id/wysiwyg_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/bottom_bar_tooting"
-            android:layout_below="@+id/toolbar_scrollview"
-            android:layout_alignParentEnd="true"
-            android:layout_marginLeft="0dp"
-            android:layout_marginEnd="0dp"
-            android:layout_marginRight="0dp"
-            android:layout_marginBottom="0dp"
-            android:fillViewport="true"
-            android:visibility="gone">
-
-            <com.github.irshulx.Editor
-                android:id="@+id/editor"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/toot_placeholder"
-                android:paddingLeft="10dp"
-                android:paddingTop="10dp"
-                android:paddingRight="10dp"
-                android:paddingBottom="100dp"
-                app:render_type="Editor" />
-        </ScrollView>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/suggestions"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-
-        <LinearLayout
-            android:id="@+id/bottom_bar_tooting"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:orientation="vertical">
-
-            <RelativeLayout
-                android:id="@+id/progress_bar_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone">
-
-                <ProgressBar
-                    android:id="@+id/upload_progress"
-                    style="@style/Base.Widget.AppCompat.ProgressBar.Horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:indeterminate="false"
-                    android:max="100"
-                    android:progress="0" />
-
-                <TextView
-                    android:id="@+id/toolbar_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:gravity="center"
-                    android:textColor="@color/dark_text"
-                    android:textSize="12sp" />
-            </RelativeLayout>
-
-            <HorizontalScrollView
-                android:id="@+id/picture_scrollview"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone">
-
-                <LinearLayout
-                    android:id="@+id/toot_picture_container"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="center_vertical"
-                    android:maxHeight="100dp"
-                    android:orientation="horizontal"
-                    android:padding="5dp" />
-            </HorizontalScrollView>
-
             <LinearLayout
-                android:id="@+id/compression_loader"
-                android:layout_width="match_parent"
+                android:id="@+id/toot_picture_container"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginStart="@dimen/activity_vertical_margin"
-                android:layout_marginTop="3dp"
-                android:layout_marginEnd="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="3dp"
+                android:gravity="center_vertical"
+                android:maxHeight="100dp"
                 android:orientation="horizontal"
-                android:visibility="gone">
+                android:padding="5dp" />
+        </HorizontalScrollView>
 
-                <ProgressBar
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
-                    android:layout_gravity="center" />
+        <LinearLayout
+            android:id="@+id/compression_loader"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/activity_vertical_margin"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="@dimen/activity_vertical_margin"
+            android:layout_marginBottom="3dp"
+            android:orientation="horizontal"
+            android:visibility="gone">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="5dp"
-                    android:gravity="center_vertical"
-                    android:text="@string/please_wait_compression"
-                    android:textColor="?colorAccent"
-                    android:textSize="12sp" />
-            </LinearLayout>
+            <ProgressBar
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:layout_gravity="center" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <ImageButton
-                    android:id="@+id/toot_picture"
-                    android:layout_width="28dp"
-                    android:layout_height="28dp"
-                    android:layout_gravity="center"
-                    android:layout_marginEnd="5dp"
-                    android:adjustViewBounds="true"
-                    android:background="@color/transparent"
-                    android:contentDescription="@string/toot_select_image"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/ic_insert_photo"
-                    android:tint="?attr/iconColor" />
-
-                <ImageButton
-                    android:id="@+id/poll_action"
-                    android:layout_width="28dp"
-                    android:layout_height="28dp"
-                    android:layout_gravity="center"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:adjustViewBounds="true"
-                    android:background="@color/transparent"
-                    android:contentDescription="@string/poll"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/ic_view_list_poll"
-                    android:tint="?attr/iconColor"
-                    android:visibility="gone" />
-
-                <ImageButton
-                    android:id="@+id/toot_visibility"
-                    android:layout_width="28dp"
-                    android:layout_height="28dp"
-                    android:layout_gravity="center"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:adjustViewBounds="true"
-                    android:background="@color/transparent"
-                    android:contentDescription="@string/toot_visibility_tilte"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/ic_public"
-                    android:tint="?attr/iconColor" />
-
-                <Button
-                    android:id="@+id/toot_cw"
-                    style="@style/Widget.AppCompat.Button.Small"
-                    android:layout_width="wrap_content"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center"
-                    android:text="@string/cw" />
-
-                <ImageButton
-                    android:id="@+id/toot_emoji"
-                    android:layout_width="28dp"
-                    android:layout_height="28dp"
-                    android:layout_gravity="center"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:adjustViewBounds="true"
-                    android:background="@color/transparent"
-                    android:contentDescription="@string/emoji_picker"
-                    android:minWidth="0dp"
-                    android:minHeight="0dp"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/ic_insert_emoticon"
-                    android:tint="?attr/iconColor" />
-
-                <TextView
-                    android:id="@+id/toot_space_left"
-                    android:layout_width="0dp"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:textColor="?colorAccent" />
-
-                <Button
-                    android:id="@+id/toot_it"
-                    style="@style/Widget.AppCompat.Button.Colored"
-                    android:layout_width="wrap_content"
-                    android:layout_height="45dp"
-                    android:layout_gravity="end"
-                    android:gravity="center"
-                    android:padding="0dp"
-                    android:text="@string/toot_it" />
-
-            </LinearLayout>
-
-            <CheckBox
-                android:id="@+id/toot_sensitive"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/toot_sensitive"
-                android:visibility="gone" />
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="5dp"
+                android:gravity="center_vertical"
+                android:text="@string/please_wait_compression"
+                android:textColor="?colorAccent"
+                android:textSize="12sp" />
         </LinearLayout>
-    </RelativeLayout>
-</ScrollView>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <ImageButton
+                android:id="@+id/toot_picture"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:layout_gravity="center"
+                android:layout_marginEnd="5dp"
+                android:adjustViewBounds="true"
+                android:background="@color/transparent"
+                android:contentDescription="@string/toot_select_image"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_insert_photo"
+                android:tint="?attr/iconColor" />
+
+            <ImageButton
+                android:id="@+id/poll_action"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:layout_gravity="center"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:adjustViewBounds="true"
+                android:background="@color/transparent"
+                android:contentDescription="@string/poll"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_view_list_poll"
+                android:tint="?attr/iconColor"
+                android:visibility="gone" />
+
+            <ImageButton
+                android:id="@+id/toot_visibility"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:layout_gravity="center"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:adjustViewBounds="true"
+                android:background="@color/transparent"
+                android:contentDescription="@string/toot_visibility_tilte"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_public"
+                android:tint="?attr/iconColor" />
+
+            <Button
+                android:id="@+id/toot_cw"
+                style="@style/Widget.AppCompat.Button.Small"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_gravity="center"
+                android:text="@string/cw" />
+
+            <ImageButton
+                android:id="@+id/toot_emoji"
+                android:layout_width="28dp"
+                android:layout_height="28dp"
+                android:layout_gravity="center"
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:adjustViewBounds="true"
+                android:background="@color/transparent"
+                android:contentDescription="@string/emoji_picker"
+                android:minWidth="0dp"
+                android:minHeight="0dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_insert_emoticon"
+                android:tint="?attr/iconColor" />
+
+            <TextView
+                android:id="@+id/toot_space_left"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textColor="?colorAccent" />
+
+            <Button
+                android:id="@+id/toot_it"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="45dp"
+                android:layout_gravity="end"
+                android:gravity="center"
+                android:padding="0dp"
+                android:text="@string/toot_it" />
+
+        </LinearLayout>
+
+        <CheckBox
+            android:id="@+id/toot_sensitive"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/toot_sensitive"
+            android:visibility="gone" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_who_to_follow.xml b/app/src/main/res/layout/activity_who_to_follow.xml
index 60364862c..29dd2abeb 100644
--- a/app/src/main/res/layout/activity_who_to_follow.xml
+++ b/app/src/main/res/layout/activity_who_to_follow.xml
@@ -38,7 +38,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?colorPrimary"
-                app:layout_scrollFlags="scroll|enterAlways" />
+                app:layout_scrollFlags="scroll|enterAlways"
+               />
         </com.google.android.material.appbar.AppBarLayout>
 
         <RelativeLayout
@@ -54,7 +55,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:divider="@null"
-                android:scrollbars="none"></ListView>
+                android:scrollbars="none"/>
 
             <RelativeLayout
                 android:id="@+id/no_action"
diff --git a/app/src/main/res/layout/add_playlist.xml b/app/src/main/res/layout/add_playlist.xml
index 0c8c0fde8..f4e0ad0cf 100644
--- a/app/src/main/res/layout/add_playlist.xml
+++ b/app/src/main/res/layout/add_playlist.xml
@@ -56,12 +56,12 @@
                 android:text="@string/channel"
                 android:textSize="16sp" />
 
-            <com.jaredrummler.materialspinner.MaterialSpinner
+            <Spinner
                 android:id="@+id/set_upload_channel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="14sp"
-                app:ms_background_color="?colorPrimaryDark" />
+               />
         </LinearLayout>
         <!-- Videos Privacy -->
         <LinearLayout
@@ -79,12 +79,12 @@
                 android:text="@string/action_privacy"
                 android:textSize="16sp" />
 
-            <com.jaredrummler.materialspinner.MaterialSpinner
+            <Spinner
                 android:id="@+id/set_upload_privacy"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="14sp"
-                app:ms_background_color="?colorPrimaryDark" />
+                />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/conversation_action_bar.xml b/app/src/main/res/layout/conversation_action_bar.xml
index 9927a4648..ee0a23427 100644
--- a/app/src/main/res/layout/conversation_action_bar.xml
+++ b/app/src/main/res/layout/conversation_action_bar.xml
@@ -29,7 +29,7 @@
     app:contentInsetLeft="0dp"
     app:contentInsetRight="0dp"
     app:contentInsetStart="0dp"
-
+    app:layout_scrollFlags="scroll|enterAlways"
     tools:ignore="UnusedAttribute">
 
     <ImageView
diff --git a/app/src/main/res/layout/drawer_identity_proofs.xml b/app/src/main/res/layout/drawer_identity_proofs.xml
new file mode 100644
index 000000000..c7e8103ba
--- /dev/null
+++ b/app/src/main/res/layout/drawer_identity_proofs.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2019 Thomas Schneider
+
+    This file is a part of Fedilab
+
+    This program is free software; you can redistribute it and/or modify it under the terms of the
+    GNU General Public License as published by the Free Software Foundation; either version 3 of the
+    License, or (at your option) any later version.
+
+    Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+    Public License for more details.
+
+    You should have received a copy of the GNU General Public License along with Fedilab; if not,
+    see <http://www.gnu.org/licenses>.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/proof_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="4dp"
+    android:background="@drawable/green_border"
+    android:padding="5dp">
+
+    <ImageView
+        android:id="@+id/proof_icon"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:layout_gravity="center"
+        android:contentDescription="@string/verified_user"
+        android:src="@drawable/ic_verified_user"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/proof_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:ellipsize="end"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toTopOf="@id/proof_name_network"
+        app:layout_constraintEnd_toStartOf="@id/proof_arrow"
+        app:layout_constraintStart_toEndOf="@id/proof_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+    <TextView
+        android:id="@+id/proof_name_network"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:ellipsize="end"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/proof_arrow"
+        app:layout_constraintStart_toEndOf="@id/proof_icon"
+        app:layout_constraintTop_toBottomOf="@id/proof_name" />
+
+    <ImageView
+        android:id="@+id/proof_arrow"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:src="@drawable/ic_keyboard_arrow_right"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:contentDescription="@string/identity_proofs" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_notification.xml b/app/src/main/res/layout/drawer_notification.xml
index 876a52cd2..9694dec1d 100644
--- a/app/src/main/res/layout/drawer_notification.xml
+++ b/app/src/main/res/layout/drawer_notification.xml
@@ -77,7 +77,6 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
                     android:layout_marginStart="2dp"
-                    android:layout_marginLeft="2dp"
                     android:gravity="end"
                     android:textSize="12sp" />
             </LinearLayout>
@@ -99,7 +98,7 @@
                     android:layout_centerHorizontal="true"
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
-                    android:contentDescription="@string/delete_notification"
+                    android:contentDescription="@string/remove_notification"
                     android:src="@drawable/ic_delete"
                     android:tint="?attr/iconColor" />
             </RelativeLayout>
@@ -128,7 +127,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:drawableStart="@drawable/ic_remove_red_eye"
-                        android:drawableLeft="@drawable/ic_remove_red_eye"
                         android:drawablePadding="5dp"
                         android:gravity="center"
                         android:maxLines="1"
@@ -189,7 +187,6 @@
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_marginStart="2dp"
-                            android:layout_marginLeft="2dp"
                             android:layout_weight="1"
                             android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/drawer_peertube.xml b/app/src/main/res/layout/drawer_peertube.xml
index bc73b16c6..a1f730668 100644
--- a/app/src/main/res/layout/drawer_peertube.xml
+++ b/app/src/main/res/layout/drawer_peertube.xml
@@ -42,9 +42,11 @@
         android:layout_width="match_parent"
         android:layout_height="200dp"
         android:gravity="center"
-        android:scaleType="centerCrop" />
+        android:scaleType="centerCrop"
+        android:contentDescription="@string/image_preview"/>
 
     <LinearLayout
+        android:id="@+id/bottom_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
@@ -55,13 +57,13 @@
             android:layout_height="40dp"
             android:layout_marginTop="10dp"
             android:gravity="center"
-            android:scaleType="fitCenter" />
+            android:scaleType="fitCenter"
+            android:contentDescription="@string/profile_picture" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:layout_marginLeft="10dp"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp"
             android:orientation="vertical">
@@ -95,16 +97,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
-                    android:layout_marginLeft="5dp" />
+                     />
 
                 <TextView
                     android:id="@+id/peertube_date"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="5dp"
-                    android:layout_marginLeft="5dp" />
+                    />
             </LinearLayout>
-
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 6d7b4a78b..aa530c0f0 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -99,10 +99,20 @@
                     android:maxLines="1"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="@id/status_account_profile_boost_by"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintEnd_toStartOf="@id/status_boosted_date"
                     app:layout_constraintStart_toEndOf="@id/status_account_profile_boost_by"
                     app:layout_constraintTop_toTopOf="@id/status_account_profile_boost_by" />
 
+                <TextView
+                    android:id="@+id/status_boosted_date"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dp"
+                    android:textSize="12sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.constraintlayout.widget.Guideline
@@ -280,7 +290,7 @@
                 android:layout_marginEnd="5dp"
                 android:contentDescription="@string/cached_status"
                 android:src="@drawable/ic_cached_black"
-                android:tint="?attr/iconColorMenu"
+                android:tint="?attr/textColor"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="@id/status_account_displayname_owner"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -543,7 +553,7 @@
                                 android:layout_centerInParent="true"
                                 android:contentDescription="@string/videos"
                                 android:src="@drawable/ic_play_arrow"
-                                android:tint="@color/white" />
+                               />
 
                         </RelativeLayout>
 
@@ -598,7 +608,6 @@
                                             android:layout_centerInParent="true"
                                             android:contentDescription="@string/play_video"
                                             android:src="@drawable/ic_play_arrow"
-                                            android:tint="@color/white"
                                             android:visibility="gone" />
                                     </RelativeLayout>
 
@@ -624,7 +633,6 @@
                                             android:layout_centerInParent="true"
                                             android:contentDescription="@string/play_video"
                                             android:src="@drawable/ic_play_arrow"
-                                            android:tint="@color/white"
                                             android:visibility="gone" />
                                     </RelativeLayout>
                                 </LinearLayout>
@@ -658,7 +666,6 @@
                                             android:layout_centerInParent="true"
                                             android:contentDescription="@string/play_video"
                                             android:src="@drawable/ic_play_arrow"
-                                            android:tint="@color/white"
                                             android:visibility="gone" />
                                     </RelativeLayout>
 
@@ -683,7 +690,6 @@
                                             android:layout_centerInParent="true"
                                             android:contentDescription="@string/play_video"
                                             android:src="@drawable/ic_play_arrow"
-                                            android:tint="@color/white"
                                             android:visibility="gone" />
                                     </RelativeLayout>
                                 </LinearLayout>
@@ -771,7 +777,6 @@
                                         android:layout_centerInParent="true"
                                         android:contentDescription="@string/play_video"
                                         android:src="@drawable/ic_play_arrow"
-                                        android:tint="@color/white"
                                         android:visibility="gone" />
                                 </RelativeLayout>
 
@@ -803,7 +808,6 @@
                                             android:layout_centerInParent="true"
                                             android:contentDescription="@string/play_video"
                                             android:src="@drawable/ic_play_arrow"
-                                            android:tint="@color/white"
                                             android:visibility="gone" />
                                     </RelativeLayout>
 
@@ -828,7 +832,6 @@
                                             android:layout_centerInParent="true"
                                             android:contentDescription="@string/play_video"
                                             android:src="@drawable/ic_play_arrow"
-                                            android:tint="@color/white"
                                             android:visibility="gone" />
                                     </RelativeLayout>
 
@@ -1007,6 +1010,7 @@
                     android:layout_height="25dp"
                     android:layout_marginEnd="15dp"
                     android:contentDescription="@string/toot_visibility_tilte"
+                    android:tint="?attr/iconColor"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@id/status_more"
                     app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/drawer_status_compact.xml b/app/src/main/res/layout/drawer_status_compact.xml
index 3e0c5353d..ff6c882e8 100644
--- a/app/src/main/res/layout/drawer_status_compact.xml
+++ b/app/src/main/res/layout/drawer_status_compact.xml
@@ -100,15 +100,16 @@
                     android:ellipsize="end"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@id/status_boosted_time"
+                    app:layout_constraintEnd_toStartOf="@id/status_boosted_date"
                     app:layout_constraintStart_toEndOf="@id/status_account_profile_boost_by"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
-                    android:id="@+id/status_boosted_time"
+                    android:id="@+id/status_boosted_date"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_margin="5dp"
+                    android:textSize="12sp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -246,7 +247,7 @@
                 android:layout_marginEnd="5dp"
                 android:contentDescription="@string/cached_status"
                 android:src="@drawable/ic_cached_black"
-                android:tint="?attr/iconColorMenu"
+                android:tint="?attr/textColor"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="@id/status_account_displayname_owner"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -477,7 +478,7 @@
                                 android:layout_centerInParent="true"
                                 android:contentDescription="@string/play_video"
                                 android:src="@drawable/ic_play_arrow"
-                                android:tint="@color/white" />
+                                />
                         </RelativeLayout>
 
                         <app.fedilab.android.webview.CustomWebview
@@ -531,7 +532,6 @@
                                             android:layout_centerInParent="true"
                                             android:contentDescription="@string/play_video"
                                             android:src="@drawable/ic_play_arrow"
-                                            android:tint="@color/white"
                                             android:visibility="gone" />
                                     </RelativeLayout>
 
@@ -556,7 +556,6 @@
                                             android:layout_centerInParent="true"
                                             android:contentDescription="@string/play_video"
                                             android:src="@drawable/ic_play_arrow"
-                                            android:tint="@color/white"
                                             android:visibility="gone" />
                                     </RelativeLayout>
                                 </LinearLayout>
@@ -590,7 +589,6 @@
                                             android:layout_centerInParent="true"
                                             android:contentDescription="@string/play_video"
                                             android:src="@drawable/ic_play_arrow"
-                                            android:tint="@color/white"
                                             android:visibility="gone" />
                                     </RelativeLayout>
 
@@ -614,7 +612,6 @@
                                             android:layout_centerInParent="true"
                                             android:contentDescription="@string/play_video"
                                             android:src="@drawable/ic_play_arrow"
-                                            android:tint="@color/white"
                                             android:visibility="gone" />
                                     </RelativeLayout>
                                 </LinearLayout>
@@ -659,7 +656,6 @@
                                     android:layout_centerInParent="true"
                                     android:contentDescription="@string/play_video"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
                                     android:visibility="gone" />
 
                                 <ImageView
@@ -701,7 +697,6 @@
                                         android:layout_centerInParent="true"
                                         android:contentDescription="@string/play_video"
                                         android:src="@drawable/ic_play_arrow"
-                                        android:tint="@color/white"
                                         android:visibility="gone" />
                                 </RelativeLayout>
 
@@ -732,7 +727,6 @@
                                             android:layout_centerInParent="true"
                                             android:contentDescription="@string/play_video"
                                             android:src="@drawable/ic_play_arrow"
-                                            android:tint="@color/white"
                                             android:visibility="gone" />
                                     </RelativeLayout>
 
@@ -756,7 +750,6 @@
                                             android:layout_centerInParent="true"
                                             android:contentDescription="@string/play_video"
                                             android:src="@drawable/ic_play_arrow"
-                                            android:tint="@color/white"
                                             android:visibility="gone" />
                                     </RelativeLayout>
 
@@ -850,6 +843,24 @@
                     android:textStyle="italic"
                     android:visibility="gone" />
 
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/status_action_container_twitter"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    android:layout_marginBottom="10dp"
+                    app:layout_constraintBottom_toBottomOf="parent">
+                    <ImageView
+                        android:id="@+id/status_share"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:src="@drawable/ic_share_peertube"
+                        android:tint="?attr/iconColor"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/status_action_container"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/drawer_status_console.xml b/app/src/main/res/layout/drawer_status_console.xml
index 1627318da..01aa578b5 100644
--- a/app/src/main/res/layout/drawer_status_console.xml
+++ b/app/src/main/res/layout/drawer_status_console.xml
@@ -193,7 +193,7 @@
                     android:layout_height="20dp"
                     android:contentDescription="@string/cached_status"
                     android:src="@drawable/ic_cached_black"
-                    android:tint="?attr/iconColorMenu"
+                    android:tint="?attr/textColor"
                     android:visibility="gone" />
 
                 <LinearLayout
@@ -431,7 +431,7 @@
                         android:layout_centerInParent="true"
                         android:contentDescription="@string/play_video"
                         android:src="@drawable/ic_play_arrow"
-                        android:tint="@color/white" />
+                         />
                 </RelativeLayout>
 
                 <app.fedilab.android.webview.CustomWebview
@@ -486,7 +486,6 @@
                                     android:layout_centerInParent="true"
                                     android:contentDescription="@string/play_video"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
                                     android:visibility="gone" />
                             </RelativeLayout>
 
@@ -495,7 +494,6 @@
                                 android:layout_width="0dp"
                                 android:layout_height="match_parent"
                                 android:layout_marginStart="1dp"
-                                android:layout_marginLeft="1dp"
                                 android:layout_weight="1">
 
                                 <ImageView
@@ -512,7 +510,6 @@
                                     android:layout_centerInParent="true"
                                     android:contentDescription="@string/play_video"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
                                     android:visibility="gone" />
                             </RelativeLayout>
                         </LinearLayout>
@@ -530,7 +527,6 @@
                                 android:layout_width="0dp"
                                 android:layout_height="match_parent"
                                 android:layout_marginStart="1dp"
-                                android:layout_marginLeft="1dp"
                                 android:layout_weight="1">
 
                                 <ImageView
@@ -547,7 +543,6 @@
                                     android:layout_centerInParent="true"
                                     android:contentDescription="@string/play_video"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
                                     android:visibility="gone" />
                             </RelativeLayout>
 
@@ -571,7 +566,6 @@
                                     android:layout_centerInParent="true"
                                     android:contentDescription="@string/play_video"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
                                     android:visibility="gone" />
                             </RelativeLayout>
                         </LinearLayout>
@@ -616,7 +610,6 @@
                             android:layout_centerInParent="true"
                             android:contentDescription="@string/play_video"
                             android:src="@drawable/ic_play_arrow"
-                            android:tint="@color/white"
                             android:visibility="gone" />
 
                         <ImageView
@@ -658,7 +651,6 @@
                                 android:layout_centerInParent="true"
                                 android:contentDescription="@string/play_video"
                                 android:src="@drawable/ic_play_arrow"
-                                android:tint="@color/white"
                                 android:visibility="gone" />
                         </RelativeLayout>
 
@@ -689,7 +681,6 @@
                                     android:layout_centerInParent="true"
                                     android:contentDescription="@string/play_video"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
                                     android:visibility="gone" />
                             </RelativeLayout>
 
@@ -714,7 +705,6 @@
                                     android:layout_centerInParent="true"
                                     android:contentDescription="@string/play_video"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
                                     android:visibility="gone" />
                             </RelativeLayout>
 
@@ -790,7 +780,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/new_toot"
-                android:tint="?attr/colorAccent"
+                android:backgroundTint="?attr/colorAccent"
                 android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml
index be758faa3..1be52b263 100644
--- a/app/src/main/res/layout/drawer_status_focused.xml
+++ b/app/src/main/res/layout/drawer_status_focused.xml
@@ -189,7 +189,7 @@
                         android:layout_height="20dp"
                         android:contentDescription="@string/cached_status"
                         android:src="@drawable/ic_cached_black"
-                        android:tint="?attr/iconColorMenu"
+                        android:tint="?attr/textColor"
                         android:visibility="gone" />
 
                     <TextView
@@ -258,7 +258,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:drawableStart="@drawable/ic_more_toot_content"
-                android:drawableLeft="@drawable/ic_more_toot_content"
                 android:drawablePadding="5dp"
                 android:gravity="center_vertical"
                 android:maxLines="1"
@@ -411,7 +410,7 @@
                         android:layout_centerInParent="true"
                         android:contentDescription="@string/play_video"
                         android:src="@drawable/ic_play_arrow"
-                        android:tint="@color/white" />
+                        />
 
                 </RelativeLayout>
 
@@ -465,7 +464,6 @@
                                     android:layout_centerInParent="true"
                                     android:contentDescription="@string/play_video"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
                                     android:visibility="gone" />
                             </RelativeLayout>
 
@@ -490,7 +488,6 @@
                                     android:layout_centerInParent="true"
                                     android:contentDescription="@string/play_video"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
                                     android:visibility="gone" />
                             </RelativeLayout>
                         </LinearLayout>
@@ -523,7 +520,6 @@
                                     android:layout_centerInParent="true"
                                     android:contentDescription="@string/play_video"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
                                     android:visibility="gone" />
                             </RelativeLayout>
 
@@ -547,7 +543,6 @@
                                     android:layout_centerInParent="true"
                                     android:contentDescription="@string/play_video"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
                                     android:visibility="gone" />
                             </RelativeLayout>
                         </LinearLayout>
@@ -592,7 +587,6 @@
                             android:layout_centerInParent="true"
                             android:contentDescription="@string/play_video"
                             android:src="@drawable/ic_play_arrow"
-                            android:tint="@color/white"
                             android:visibility="gone" />
 
                         <ImageView
@@ -634,7 +628,6 @@
                                 android:layout_centerInParent="true"
                                 android:contentDescription="@string/play_video"
                                 android:src="@drawable/ic_play_arrow"
-                                android:tint="@color/white"
                                 android:visibility="gone" />
                         </RelativeLayout>
 
@@ -665,7 +658,7 @@
                                     android:layout_centerInParent="true"
                                     android:contentDescription="@string/play_video"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
+
                                     android:visibility="gone" />
                             </RelativeLayout>
 
@@ -674,7 +667,6 @@
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="2dp"
-                                android:layout_marginLeft="2dp"
                                 android:layout_weight="1">
 
                                 <ImageView
@@ -690,7 +682,6 @@
                                     android:layout_centerInParent="true"
                                     android:contentDescription="@string/play_video"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:tint="@color/white"
                                     android:visibility="gone" />
                             </RelativeLayout>
 
diff --git a/app/src/main/res/layout/drawer_tag_trends.xml b/app/src/main/res/layout/drawer_tag_trends.xml
new file mode 100644
index 000000000..d969f87d9
--- /dev/null
+++ b/app/src/main/res/layout/drawer_tag_trends.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2019 Thomas Schneider
+
+    This file is a part of Fedilab
+
+    This program is free software; you can redistribute it and/or modify it under the terms of the
+    GNU General Public License as published by the Free Software Foundation; either version 3 of the
+    License, or (at your option) any later version.
+
+    Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+    Public License for more details.
+
+    You should have received a copy of the GNU General Public License along with Fedilab; if not,
+    see <http://www.gnu.org/licenses>.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/trends_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:divider="?android:dividerHorizontal"
+    android:orientation="vertical"
+    android:paddingTop="5dp"
+    android:paddingStart="@dimen/fab_margin"
+    android:paddingEnd="@dimen/fab_margin"
+    android:showDividers="end">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/tag_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:textSize="20sp" />
+
+        <TextView
+            android:id="@+id/tag_stats"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            />
+    </LinearLayout>
+    <TextView
+        android:id="@+id/count"
+        android:layout_gravity="center"
+        android:layout_width="40dp"
+        android:textSize="25sp"
+        android:layout_height="wrap_content"/>
+    <com.github.mikephil.charting.charts.LineChart
+        android:id="@+id/chart"
+        android:layout_width="100dp"
+        android:layout_height="50dp"
+        />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/editor_toolbar_linearlayout_horizontal.xml b/app/src/main/res/layout/editor_toolbar_linearlayout_horizontal.xml
new file mode 100644
index 000000000..ea0535c2f
--- /dev/null
+++ b/app/src/main/res/layout/editor_toolbar_linearlayout_horizontal.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:fadingEdge="horizontal"
+    android:fadingEdgeLength="20dp"
+    android:requiresFadingEdge="horizontal"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+
+    <TextView
+        android:id="@+id/action_h1"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:width="40dp"
+        android:height="40dp"
+        android:background="@android:color/transparent"
+        android:text="H1"
+        android:textColor="?iconColorMenu"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:gravity="center"
+        tools:ignore="HardcodedText" />
+
+    <TextView
+        android:id="@+id/action_h2"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:width="40dp"
+        android:height="40dp"
+        android:background="@android:color/transparent"
+        android:text="H2"
+        android:textColor="?iconColorMenu"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        android:gravity="center"
+        tools:ignore="HardcodedText" />
+
+    <TextView
+        android:id="@+id/action_h3"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:width="40dp"
+        android:height="40dp"
+        android:background="@android:color/transparent"
+        android:text="H3"
+        android:gravity="center"
+        android:textColor="?iconColorMenu"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        tools:ignore="HardcodedText" />
+
+    <ImageButton
+        android:id="@+id/action_bold"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@android:color/transparent"
+        android:maxHeight="20dp"
+        android:maxWidth="20dp"
+        android:tint="?attr/iconColor"
+        android:src="@drawable/icon_bold" />
+
+    <ImageButton
+        android:id="@+id/action_Italic"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@android:color/transparent"
+        android:maxHeight="20dp"
+        android:maxWidth="20dp"
+        android:tint="?attr/iconColor"
+        android:src="@drawable/icon_italic" />
+
+    <ImageButton
+        android:id="@+id/action_indent"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@android:color/transparent"
+        android:maxHeight="20dp"
+        android:maxWidth="20dp"
+        android:tint="?attr/iconColor"
+        android:src="@drawable/icon_indent" />
+
+    <ImageButton
+        android:id="@+id/action_outdent"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@android:color/transparent"
+        android:maxHeight="20dp"
+        android:maxWidth="20dp"
+        android:tint="?attr/iconColor"
+        android:src="@drawable/icon_outdent" />
+
+    <ImageButton
+        android:id="@+id/action_blockquote"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@android:color/transparent"
+        android:maxHeight="20dp"
+        android:maxWidth="20dp"
+        android:tint="?attr/iconColor"
+        android:src="@drawable/ic_blockquote" />
+
+
+    <ImageButton
+        android:id="@+id/action_color"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@android:color/transparent"
+        android:maxHeight="20dp"
+        android:padding="11dp"
+        android:scaleType="centerInside"
+        android:maxWidth="20dp"
+        android:tint="?attr/iconColor"
+        android:src="@drawable/highlight" />
+
+
+    <ImageButton
+        android:id="@+id/action_bulleted"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@android:color/transparent"
+        android:maxHeight="20dp"
+        android:maxWidth="20dp"
+        android:tint="?attr/iconColor"
+        android:src="@drawable/icon_bullet_list" />
+
+    <ImageButton
+        android:id="@+id/action_unordered_numbered"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@android:color/transparent"
+        android:maxHeight="20dp"
+        android:maxWidth="20dp"
+        android:tint="?attr/iconColor"
+        android:src="@drawable/icon_numbered_list" />
+
+    <ImageButton
+        android:id="@+id/action_hr"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@android:color/transparent"
+        android:maxHeight="20dp"
+        android:maxWidth="20dp"
+        android:tint="?attr/iconColor"
+        android:src="@drawable/icon_hr" />
+
+
+
+    <ImageButton
+        android:id="@+id/action_insert_image"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@android:color/transparent"
+        android:maxHeight="20dp"
+        android:maxWidth="20dp"
+        android:tint="?attr/iconColor"
+        android:src="@drawable/icon_image" />
+
+
+    <ImageButton
+        android:id="@+id/action_insert_link"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@android:color/transparent"
+        android:maxHeight="20dp"
+        android:maxWidth="20dp"
+        android:tint="?attr/iconColor"
+        android:src="@drawable/icon_link" />
+
+
+    <!--
+    <ImageButton
+        android:id="@+id/action_html"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@android:color/transparent"
+        android:maxHeight="20dp"
+        android:maxWidth="20dp"
+        android:tint="?attr/iconColor"
+        android:src="@drawable/terminal" />
+    -->
+    <ImageButton
+        android:id="@+id/action_erase"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:background="@android:color/transparent"
+        android:maxHeight="20dp"
+        android:maxWidth="20dp"
+        android:tint="?attr/iconColor"
+        android:src="@drawable/icon_erase" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search_tag.xml b/app/src/main/res/layout/fragment_search_tag.xml
index fc8e46b5c..d5afa4372 100644
--- a/app/src/main/res/layout/fragment_search_tag.xml
+++ b/app/src/main/res/layout/fragment_search_tag.xml
@@ -29,10 +29,11 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <androidx.recyclerview.widget.RecyclerView
+            <ListView
                 android:id="@+id/lv_search_tags"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:divider="@color/transparent"
                 android:scrollbars="none" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_settings_reveal.xml b/app/src/main/res/layout/fragment_settings_reveal.xml
index af45f762d..c4aaa8a71 100644
--- a/app/src/main/res/layout/fragment_settings_reveal.xml
+++ b/app/src/main/res/layout/fragment_settings_reveal.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.circularreveal.CircularRevealFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.circularreveal.CircularRevealFrameLayout xmlns:TagsEditText="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -9,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <ScrollView xmlns:TagsEditText="http://schemas.android.com/apk/res-auto"
+        <ScrollView
             android:id="@+id/swipeContainer"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -192,96 +193,6 @@
                             android:layout_gravity="center_vertical" />
                     </LinearLayout>
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/settings_option_margin"
-                        android:layout_marginBottom="@dimen/settings_option_margin"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="10dp"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/set_invidious"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/set_invidious_indication"
-                                android:textColor="@color/mastodonC2"
-                                android:textSize="12sp" />
-
-                        </LinearLayout>
-
-                        <androidx.appcompat.widget.SwitchCompat
-                            android:id="@+id/set_invidious"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
-
-                    <EditText
-                        android:id="@+id/set_invidious_host"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:hint="@string/set_invidious_host"
-                        android:inputType="textWebEditText" />
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/settings_option_margin"
-                        android:layout_marginBottom="@dimen/settings_option_margin"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="10dp"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/set_nitter"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/set_nitter_indication"
-                                android:textColor="@color/mastodonC2"
-                                android:textSize="12sp" />
-
-                        </LinearLayout>
-
-                        <androidx.appcompat.widget.SwitchCompat
-                            android:id="@+id/set_nitter"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
-
-
-                    <EditText
-                        android:id="@+id/set_nitter_host"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:hint="@string/set_nitter_host"
-                        android:inputType="textWebEditText" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -729,7 +640,8 @@
                         android:orientation="horizontal">
 
                         <TextView
-                            android:layout_width="wrap_content"
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
                             android:text="@string/set_notify"
@@ -745,616 +657,627 @@
                     </LinearLayout>
 
 
-                    <!-- Choose stream -->
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:orientation="horizontal">
-
-                        <Spinner
-                            android:id="@+id/set_live_type"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
-                    </LinearLayout>
-
-                    <TextView
-                        android:id="@+id/set_live_type_indication"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp"
-                        android:textColor="@color/mastodonC2" />
-
-                    <LinearLayout
-                        android:id="@+id/live_notif_per_account"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/settings_option_margin"
-                        android:layout_marginBottom="@dimen/settings_option_margin"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="10dp"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:id="@+id/set_allow_live_notifications_title"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/set_allow_live_notifications"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/set_allow_live_notifications_indication"
-                                android:textColor="@color/mastodonC2"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical">
-
-                            <androidx.appcompat.widget.SwitchCompat
-                                android:id="@+id/set_allow_live_notifications"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content" />
-
-                            <ImageButton
-                                android:id="@+id/set_allow_live_notifications_others"
-                                style="@style/Base.Widget.AppCompat.Button.Colored"
-                                android:layout_width="40dp"
-                                android:layout_height="40dp"
-                                android:layout_gravity="end"
-                                android:contentDescription="@string/live_notif"
-                                android:padding="5dp"
-                                android:src="@drawable/ic_account_circle_acct" />
-                        </LinearLayout>
-
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/set_hide_status_bar_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/settings_option_margin"
-                        android:layout_marginBottom="@dimen/settings_option_margin"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:visibility="gone">
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="10dp"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/set_hide_status_bar"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/set_hide_status_bar_indication"
-                                android:textColor="@color/mastodonC2"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-
-                        <ImageButton
-                            android:id="@+id/set_hide_status_bar"
-                            style="@style/Base.Widget.AppCompat.Button.Colored"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            android:contentDescription="@string/bookmark_add"
-                            android:padding="5dp"
-                            android:src="@drawable/ic_hide_status_bar" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/notification_settings"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical">
-
+                        android:orientation="vertical"
+                        android:id="@+id/notification_container">
+                        <!-- Choose stream -->
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="10dp"
                             android:orientation="horizontal">
 
-                            <View
-                                android:layout_width="0dp"
-                                android:layout_height="1dp"
-                                android:layout_margin="10dp"
-                                android:layout_weight="1"
-                                android:background="?colorAccent" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="center"
-                                android:text="@string/settings_category_notif_customize"
-                                android:textColor="?colorAccent"
-                                android:textSize="16sp" />
-
-                            <View
-                                android:layout_width="0dp"
-                                android:layout_height="1dp"
-                                android:layout_margin="10dp"
-                                android:layout_weight="1"
-                                android:background="?colorAccent" />
-                        </LinearLayout>
-
-                        <Button
-                            android:id="@+id/set_notif_sound"
-                            style="@style/Base.Widget.AppCompat.Button.Colored"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/settings_option_margin"
-                            android:layout_marginBottom="@dimen/settings_option_margin"
-                            android:gravity="center"
-                            android:text="@string/set_notif_sound"
-                            android:tint="@android:color/white" />
-
-                        <LinearLayout
-                            android:id="@+id/channels_container"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/settings_option_margin"
-                            android:layout_marginBottom="@dimen/settings_option_margin"
-                            android:orientation="vertical">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="horizontal">
-
-                                <Button
-                                    android:id="@+id/sound_mention"
-                                    style="@style/Base.Widget.AppCompat.Button.Colored"
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/channel_notif_mention"
-                                    android:tint="@android:color/white" />
-
-                                <Button
-                                    android:id="@+id/sound_follow"
-                                    style="@style/Base.Widget.AppCompat.Button.Colored"
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/channel_notif_follow"
-                                    android:tint="@android:color/white" />
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="horizontal">
-
-                                <Button
-                                    android:id="@+id/sound_boost"
-                                    style="@style/Base.Widget.AppCompat.Button.Colored"
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/channel_notif_boost"
-                                    android:tint="@android:color/white" />
-
-                                <Button
-                                    android:id="@+id/sound_fav"
-                                    style="@style/Base.Widget.AppCompat.Button.Colored"
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/channel_notif_fav"
-                                    android:tint="@android:color/white" />
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="horizontal">
-
-                                <Button
-                                    android:id="@+id/sound_poll"
-                                    style="@style/Base.Widget.AppCompat.Button.Colored"
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/channel_notif_poll"
-                                    android:tint="@android:color/white" />
-
-                                <Button
-                                    android:id="@+id/sound_media"
-                                    style="@style/Base.Widget.AppCompat.Button.Colored"
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/channel_notif_media"
-                                    android:tint="@android:color/white" />
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:orientation="horizontal">
-
-                                <Button
-                                    android:id="@+id/sound_backup"
-                                    style="@style/Base.Widget.AppCompat.Button.Colored"
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:gravity="center"
-                                    android:maxLines="1"
-                                    android:text="@string/channel_notif_backup"
-                                    android:tint="@android:color/white" />
-
-                                <Button
-                                    android:layout_width="0dp"
-                                    android:layout_height="wrap_content"
-                                    android:layout_weight="1"
-                                    android:visibility="invisible" />
-                            </LinearLayout>
-
-                        </LinearLayout>
-                        <!-- NOTIFICATIONS SETTINGS -->
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <View
-                                android:layout_width="0dp"
-                                android:layout_height="1dp"
-                                android:layout_margin="10dp"
-                                android:layout_weight="1"
-                                android:background="?colorAccent" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="center"
-                                android:text="@string/settings_category_notif_categories"
-                                android:textColor="?colorAccent"
-                                android:textSize="16sp" />
-
-                            <View
-                                android:layout_width="0dp"
-                                android:layout_height="1dp"
-                                android:layout_margin="10dp"
-                                android:layout_weight="1"
-                                android:background="?colorAccent" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/settings_option_margin"
-                            android:layout_marginBottom="@dimen/settings_option_margin"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="10dp"
-                                android:layout_weight="1"
-                                android:text="@string/set_notif_follow"
-                                android:textSize="16sp" />
-
-                            <androidx.appcompat.widget.SwitchCompat
-                                android:id="@+id/set_notif_follow"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/settings_option_margin"
-                            android:layout_marginBottom="@dimen/settings_option_margin"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="10dp"
-                                android:layout_weight="1"
-                                android:text="@string/set_notif_follow_add"
-                                android:textSize="16sp" />
-
-                            <androidx.appcompat.widget.SwitchCompat
-                                android:id="@+id/set_notif_follow_add"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/settings_option_margin"
-                            android:layout_marginBottom="@dimen/settings_option_margin"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="10dp"
-                                android:layout_weight="1"
-                                android:text="@string/set_notif_follow_mention"
-                                android:textSize="16sp" />
-
-                            <androidx.appcompat.widget.SwitchCompat
-                                android:id="@+id/set_notif_follow_mention"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/settings_option_margin"
-                            android:layout_marginBottom="@dimen/settings_option_margin"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="10dp"
-                                android:layout_weight="1"
-                                android:text="@string/set_notif_follow_share"
-                                android:textSize="16sp" />
-
-                            <androidx.appcompat.widget.SwitchCompat
-                                android:id="@+id/set_notif_follow_share"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/settings_option_margin"
-                            android:layout_marginBottom="@dimen/settings_option_margin"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="10dp"
-                                android:layout_weight="1"
-                                android:text="@string/set_notif_follow_poll"
-                                android:textSize="16sp" />
-
-                            <androidx.appcompat.widget.SwitchCompat
-                                android:id="@+id/set_notif_follow_poll"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content" />
-
-                        </LinearLayout>
-
-                        <!-- END NOTIFICATIONS SETTINGS -->
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <View
-                                android:layout_width="0dp"
-                                android:layout_height="1dp"
-                                android:layout_margin="10dp"
-                                android:layout_weight="1"
-                                android:background="?colorAccent" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="center"
-                                android:text="@string/settings_category_notif_time_slot"
-                                android:textColor="?colorAccent"
-                                android:textSize="16sp" />
-
-                            <View
-                                android:layout_width="0dp"
-                                android:layout_height="1dp"
-                                android:layout_margin="10dp"
-                                android:layout_weight="1"
-                                android:background="?colorAccent" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/settings_option_margin"
-                            android:layout_marginBottom="@dimen/settings_option_margin"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="10dp"
-                                android:layout_weight="1"
-                                android:text="@string/set_enable_time_slot"
-                                android:textSize="16sp" />
-
-                            <androidx.appcompat.widget.SwitchCompat
-                                android:id="@+id/set_enable_time_slot"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content" />
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/settings_time_from" />
-
-                            <Button
-                                android:id="@+id/settings_time_from"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:focusableInTouchMode="false" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/settings_time_to" />
-
-                            <Button
-                                android:id="@+id/settings_time_to"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:focusableInTouchMode="false" />
-
                             <Spinner
-                                android:id="@+id/action_notification"
+                                android:id="@+id/set_live_type"
                                 android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:entries="@array/action_notification" />
+                                android:layout_height="wrap_content" />
                         </LinearLayout>
 
                         <TextView
-                            android:layout_width="match_parent"
+                            android:id="@+id/set_live_type_indication"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:paddingBottom="10dp"
-                            android:text="@string/set_enable_time_slot_indication"
+                            android:layout_marginBottom="10dp"
                             android:textColor="@color/mastodonC2" />
-                        <!-- MORE OPTIONS SETTINGS -->
+
                         <LinearLayout
+                            android:id="@+id/live_notif_per_account"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/settings_option_margin"
+                            android:layout_marginBottom="@dimen/settings_option_margin"
+                            android:gravity="center_vertical"
                             android:orientation="horizontal">
 
-                            <View
+                            <LinearLayout
                                 android:layout_width="0dp"
-                                android:layout_height="1dp"
-                                android:layout_margin="10dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="10dp"
                                 android:layout_weight="1"
-                                android:background="?colorAccent" />
+                                android:orientation="vertical">
 
-                            <TextView
+                                <TextView
+                                    android:id="@+id/set_allow_live_notifications_title"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/set_allow_live_notifications"
+                                    android:textSize="16sp" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/set_allow_live_notifications_indication"
+                                    android:textColor="@color/mastodonC2"
+                                    android:textSize="12sp" />
+                            </LinearLayout>
+
+                            <LinearLayout
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:orientation="vertical">
+
+                                <androidx.appcompat.widget.SwitchCompat
+                                    android:id="@+id/set_allow_live_notifications"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content" />
+
+                                <ImageButton
+                                    android:id="@+id/set_allow_live_notifications_others"
+                                    style="@style/colored_button"
+                                    android:layout_width="40dp"
+                                    android:layout_height="40dp"
+                                    android:layout_gravity="end"
+                                    android:contentDescription="@string/live_notif"
+                                    android:padding="5dp"
+                                    android:src="@drawable/ic_account_circle_acct" />
+                            </LinearLayout>
+
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/set_hide_status_bar_container"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/settings_option_margin"
+                            android:layout_marginBottom="@dimen/settings_option_margin"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal"
+                            android:visibility="gone">
+
+                            <LinearLayout
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="10dp"
+                                android:layout_weight="1"
+                                android:orientation="vertical">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/set_hide_status_bar"
+                                    android:textSize="16sp" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/set_hide_status_bar_indication"
+                                    android:textColor="@color/mastodonC2"
+                                    android:textSize="12sp" />
+                            </LinearLayout>
+
+                            <ImageButton
+                                android:id="@+id/set_hide_status_bar"
+                                style="@style/colored_button"
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                android:contentDescription="@string/bookmark_add"
+                                android:padding="5dp"
+                                android:src="@drawable/ic_hide_status_bar" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/notification_settings"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="horizontal">
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="1dp"
+                                    android:layout_margin="10dp"
+                                    android:layout_weight="1"
+                                    android:background="?colorAccent" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:text="@string/settings_category_notif_customize"
+                                    android:textColor="?colorAccent"
+                                    android:textSize="16sp" />
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="1dp"
+                                    android:layout_margin="10dp"
+                                    android:layout_weight="1"
+                                    android:background="?colorAccent" />
+                            </LinearLayout>
+
+                            <Button
+                                android:id="@+id/set_notif_sound"
+                                style="@style/colored_button"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/settings_option_margin"
+                                android:layout_marginBottom="@dimen/settings_option_margin"
                                 android:gravity="center"
-                                android:text="@string/settings_category_notif_advanced"
-                                android:textColor="?colorAccent"
-                                android:textSize="16sp" />
+                                android:text="@string/set_notif_sound"
+                                android:tint="@android:color/white" />
 
-                            <View
-                                android:layout_width="0dp"
-                                android:layout_height="1dp"
-                                android:layout_margin="10dp"
-                                android:layout_weight="1"
-                                android:background="?colorAccent" />
-                        </LinearLayout>
+                            <LinearLayout
+                                android:id="@+id/channels_container"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/settings_option_margin"
+                                android:layout_marginBottom="@dimen/settings_option_margin"
+                                android:orientation="vertical">
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:orientation="horizontal">
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="horizontal">
+
+                                    <Button
+                                        android:id="@+id/sound_mention"
+                                        style="@style/colored_button"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:gravity="center"
+                                        android:maxLines="1"
+                                        android:text="@string/channel_notif_mention"
+                                        android:tint="@android:color/white" />
+
+                                    <Button
+                                        android:id="@+id/sound_follow"
+                                        style="@style/colored_button"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:gravity="center"
+                                        android:maxLines="1"
+                                        android:text="@string/channel_notif_follow"
+                                        android:tint="@android:color/white" />
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="horizontal">
+
+                                    <Button
+                                        android:id="@+id/sound_boost"
+                                        style="@style/colored_button"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:gravity="center"
+                                        android:maxLines="1"
+                                        android:text="@string/channel_notif_boost"
+                                        android:tint="@android:color/white" />
+
+                                    <Button
+                                        android:id="@+id/sound_fav"
+                                        style="@style/colored_button"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:gravity="center"
+                                        android:maxLines="1"
+                                        android:text="@string/channel_notif_fav"
+                                        android:tint="@android:color/white" />
+
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="horizontal">
+
+                                    <Button
+                                        android:id="@+id/sound_poll"
+                                        style="@style/colored_button"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:gravity="center"
+                                        android:maxLines="1"
+                                        android:text="@string/channel_notif_poll"
+                                        android:tint="@android:color/white" />
+
+                                    <Button
+                                        android:id="@+id/sound_media"
+                                        style="@style/colored_button"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:gravity="center"
+                                        android:maxLines="1"
+                                        android:text="@string/channel_notif_media"
+                                        android:tint="@android:color/white" />
+                                </LinearLayout>
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="horizontal">
+
+                                    <Button
+                                        android:id="@+id/sound_backup"
+                                        style="@style/colored_button"
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:gravity="center"
+                                        android:maxLines="1"
+                                        android:text="@string/channel_notif_backup"
+                                        android:tint="@android:color/white" />
+
+                                    <Button
+                                        android:layout_width="0dp"
+                                        android:layout_height="wrap_content"
+                                        android:layout_weight="1"
+                                        android:visibility="invisible" />
+                                </LinearLayout>
+
+                            </LinearLayout>
+                            <!-- NOTIFICATIONS SETTINGS -->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="horizontal">
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="1dp"
+                                    android:layout_margin="10dp"
+                                    android:layout_weight="1"
+                                    android:background="?colorAccent" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:text="@string/settings_category_notif_categories"
+                                    android:textColor="?colorAccent"
+                                    android:textSize="16sp" />
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="1dp"
+                                    android:layout_margin="10dp"
+                                    android:layout_weight="1"
+                                    android:background="?colorAccent" />
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/settings_option_margin"
+                                android:layout_marginBottom="@dimen/settings_option_margin"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginEnd="10dp"
+                                    android:layout_weight="1"
+                                    android:text="@string/set_notif_follow"
+                                    android:textSize="16sp" />
+
+                                <androidx.appcompat.widget.SwitchCompat
+                                    android:id="@+id/set_notif_follow"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content" />
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/settings_option_margin"
+                                android:layout_marginBottom="@dimen/settings_option_margin"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginEnd="10dp"
+                                    android:layout_weight="1"
+                                    android:text="@string/set_notif_follow_add"
+                                    android:textSize="16sp" />
+
+                                <androidx.appcompat.widget.SwitchCompat
+                                    android:id="@+id/set_notif_follow_add"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content" />
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/settings_option_margin"
+                                android:layout_marginBottom="@dimen/settings_option_margin"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginEnd="10dp"
+                                    android:layout_weight="1"
+                                    android:text="@string/set_notif_follow_mention"
+                                    android:textSize="16sp" />
+
+                                <androidx.appcompat.widget.SwitchCompat
+                                    android:id="@+id/set_notif_follow_mention"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content" />
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/settings_option_margin"
+                                android:layout_marginBottom="@dimen/settings_option_margin"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginEnd="10dp"
+                                    android:layout_weight="1"
+                                    android:text="@string/set_notif_follow_share"
+                                    android:textSize="16sp" />
+
+                                <androidx.appcompat.widget.SwitchCompat
+                                    android:id="@+id/set_notif_follow_share"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content" />
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/settings_option_margin"
+                                android:layout_marginBottom="@dimen/settings_option_margin"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginEnd="10dp"
+                                    android:layout_weight="1"
+                                    android:text="@string/set_notif_follow_poll"
+                                    android:textSize="16sp" />
+
+                                <androidx.appcompat.widget.SwitchCompat
+                                    android:id="@+id/set_notif_follow_poll"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content" />
+
+                            </LinearLayout>
+
+                            <!-- END NOTIFICATIONS SETTINGS -->
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="horizontal">
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="1dp"
+                                    android:layout_margin="10dp"
+                                    android:layout_weight="1"
+                                    android:background="?colorAccent" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:text="@string/settings_category_notif_time_slot"
+                                    android:textColor="?colorAccent"
+                                    android:textSize="16sp" />
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="1dp"
+                                    android:layout_margin="10dp"
+                                    android:layout_weight="1"
+                                    android:background="?colorAccent" />
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="@dimen/settings_option_margin"
+                                android:layout_marginBottom="@dimen/settings_option_margin"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginEnd="10dp"
+                                    android:layout_weight="1"
+                                    android:text="@string/set_enable_time_slot"
+                                    android:textSize="16sp" />
+
+                                <androidx.appcompat.widget.SwitchCompat
+                                    android:id="@+id/set_enable_time_slot"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content" />
+
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/settings_time_from" />
+
+                                <Button
+                                    style="@style/colored_button"
+                                    android:id="@+id/settings_time_from"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:focusableInTouchMode="false" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/settings_time_to" />
+
+                                <Button
+                                    style="@style/colored_button"
+                                    android:id="@+id/settings_time_to"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:focusableInTouchMode="false" />
+
+                                <Spinner
+                                    android:id="@+id/action_notification"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:entries="@array/action_notification" />
+                            </LinearLayout>
 
                             <TextView
-                                android:layout_width="wrap_content"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:paddingBottom="10dp"
+                                android:text="@string/set_enable_time_slot_indication"
+                                android:textColor="@color/mastodonC2" />
+                            <!-- MORE OPTIONS SETTINGS -->
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="horizontal">
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="1dp"
+                                    android:layout_margin="10dp"
+                                    android:layout_weight="1"
+                                    android:background="?colorAccent" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="center"
+                                    android:text="@string/settings_category_notif_advanced"
+                                    android:textColor="?colorAccent"
+                                    android:textSize="16sp" />
+
+                                <LinearLayout
+                                    android:layout_width="0dp"
+                                    android:layout_height="1dp"
+                                    android:layout_margin="10dp"
+                                    android:layout_weight="1"
+                                    android:background="?colorAccent" />
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center_vertical"
-                                android:text="@string/set_wifi_only"
-                                android:textSize="16sp" />
+                                android:orientation="horizontal">
 
-                            <androidx.appcompat.widget.SwitchCompat
-                                android:id="@+id/set_wifi_only"
-                                android:layout_width="wrap_content"
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:text="@string/set_wifi_only"
+                                    android:textSize="16sp" />
+
+                                <androidx.appcompat.widget.SwitchCompat
+                                    android:id="@+id/set_wifi_only"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_margin="10dp"
+                                    android:gravity="center" />
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center_vertical"
-                                android:layout_margin="10dp"
-                                android:gravity="center" />
-                        </LinearLayout>
+                                android:orientation="horizontal">
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:orientation="horizontal">
+                                <TextView
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:text="@string/set_notif_silent"
+                                    android:textSize="16sp" />
 
-                            <TextView
-                                android:layout_width="wrap_content"
+                                <androidx.appcompat.widget.SwitchCompat
+                                    android:id="@+id/set_silence"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:layout_margin="10dp"
+                                    android:gravity="center" />
+                            </LinearLayout>
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center_vertical"
-                                android:text="@string/set_notif_silent"
-                                android:textSize="16sp" />
+                                android:orientation="horizontal">
 
-                            <androidx.appcompat.widget.SwitchCompat
-                                android:id="@+id/set_silence"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="10dp"
-                                android:gravity="center" />
-                        </LinearLayout>
+                                <TextView
+                                    android:id="@+id/set_led_colour_label"
+                                    android:layout_width="0dp"
+                                    android:layout_weight="1"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center_vertical"
+                                    android:text="@string/set_led_colour"
+                                    android:textSize="16sp" />
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:id="@+id/set_led_colour_label"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:text="@string/set_led_colour"
-                                android:textSize="16sp" />
-
-                            <Spinner
-                                android:id="@+id/led_colour_spinner"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:entries="@array/led_colours" />
+                                <Spinner
+                                    android:id="@+id/led_colour_spinner"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:entries="@array/led_colours" />
+                            </LinearLayout>
                         </LinearLayout>
                     </LinearLayout>
                 </LinearLayout>
@@ -1508,7 +1431,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -1523,7 +1446,7 @@
                             android:textColor="?colorAccent"
                             android:textSize="16sp" />
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -1608,7 +1531,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -1623,7 +1546,7 @@
                             android:textColor="?colorAccent"
                             android:textSize="16sp" />
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -1672,7 +1595,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -1687,7 +1610,7 @@
                             android:textColor="?colorAccent"
                             android:textSize="16sp" />
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -1817,6 +1740,8 @@
 
                     <!-- Featured tags -->
                     <LinearLayout
+                        android:layout_marginTop="@dimen/settings_option_margin"
+                        android:layout_marginBottom="@dimen/settings_option_margin"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
@@ -1848,6 +1773,8 @@
                             android:textColor="@color/mastodonC2" />
                     </LinearLayout>
 
+
+
                     <!-- TRUNCATE LONG TOOTS -->
                     <TextView
                         android:layout_width="wrap_content"
@@ -1957,127 +1884,7 @@
                             android:textStyle="italic" />
                     </LinearLayout>
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/settings_option_margin"
-                        android:layout_marginBottom="@dimen/settings_option_margin"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
 
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="10dp"
-                            android:layout_weight="1"
-                            android:text="@string/embedded_browser"
-                            android:textSize="16sp" />
-
-                        <androidx.appcompat.widget.SwitchCompat
-                            android:id="@+id/set_embedded_browser"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
-
-                    <Button
-                        android:id="@+id/update_tracking_domains"
-                        style="@style/Base.Widget.AppCompat.Button.Colored"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:gravity="center"
-                        android:text="@string/update_tracking_domains"
-                        android:textSize="16sp" />
-
-                    <LinearLayout
-                        android:id="@+id/custom_tabs_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/settings_option_margin"
-                        android:layout_marginBottom="@dimen/settings_option_margin"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal">
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="10dp"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/custom_tabs"
-                                android:textSize="16sp" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/set_enable_crash_report_indication"
-                                android:textColor="@color/mastodonC2"
-                                android:textSize="12sp" />
-                        </LinearLayout>
-
-                        <androidx.appcompat.widget.SwitchCompat
-                            android:id="@+id/set_custom_tabs"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
-
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:id="@+id/set_javascript_container"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:orientation="vertical"
-                        android:visibility="gone">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:text="@string/use_javascript"
-                                android:textSize="16sp" />
-
-                            <androidx.appcompat.widget.SwitchCompat
-                                android:id="@+id/set_javascript"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="10dp"
-                                android:gravity="center" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/set_cookies_container"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:text="@string/use_cookies"
-                                android:textSize="16sp" />
-
-                            <androidx.appcompat.widget.SwitchCompat
-                                android:id="@+id/set_cookies"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="10dp"
-                                android:gravity="center" />
-                        </LinearLayout>
-                    </LinearLayout>
 
 
                     <!-- NSFW Timeout -->
@@ -2092,7 +1899,7 @@
 
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_gravity="center_vertical"
                         android:layout_marginBottom="10dp"
                         android:orientation="horizontal">
@@ -2111,6 +1918,38 @@
                             android:layout_gravity="center_vertical" />
                     </LinearLayout>
 
+                    <!-- Media Description Timeout -->
+                    <TextView
+                        android:id="@+id/textView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginBottom="10dp"
+                        android:gravity="center_vertical"
+                        android:text="@string/set_med_desc_timeout"
+                        android:textSize="16sp" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginBottom="10dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/set_med_desc_timeout_value"
+                            android:layout_width="20dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="10dp"
+                            android:textSize="16sp" />
+
+                        <SeekBar
+                            android:id="@+id/set_med_desc_timeout"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical" />
+                    </LinearLayout>
+
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -2128,7 +1967,7 @@
 
                         <ImageButton
                             android:id="@+id/btn_select_icon"
-                            style="@style/Base.Widget.AppCompat.Button.Colored"
+                            style="@style/colored_button"
                             android:layout_width="40dp"
                             android:layout_height="40dp"
                             android:layout_marginStart="20dp"
@@ -2474,7 +2313,7 @@
 
                         <ImageButton
                             android:id="@+id/set_toot_visibility"
-                            style="@style/Base.Widget.AppCompat.Button.Colored"
+                            style="@style/colored_button"
                             android:layout_width="40dp"
                             android:layout_height="40dp"
                             android:layout_marginStart="20dp"
@@ -2609,6 +2448,299 @@
 
                 </LinearLayout>
 
+                <!--  Privacy -->
+                <LinearLayout
+                    android:id="@+id/settings_privacy"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical"
+                    android:visibility="gone">
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/settings_option_margin"
+                        android:layout_marginBottom="@dimen/settings_option_margin"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="10dp"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/set_invidious"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/set_invidious_indication"
+                                android:textColor="@color/mastodonC2"
+                                android:textSize="12sp" />
+
+                        </LinearLayout>
+
+                        <androidx.appcompat.widget.SwitchCompat
+                            android:id="@+id/set_invidious"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+
+                    </LinearLayout>
+
+                    <EditText
+                        android:id="@+id/set_invidious_host"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:hint="@string/set_invidious_host"
+                        android:inputType="textWebEditText" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/settings_option_margin"
+                        android:layout_marginBottom="@dimen/settings_option_margin"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="10dp"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/set_nitter"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/set_nitter_indication"
+                                android:textColor="@color/mastodonC2"
+                                android:textSize="12sp" />
+
+                        </LinearLayout>
+
+                        <androidx.appcompat.widget.SwitchCompat
+                            android:id="@+id/set_nitter"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+
+                    </LinearLayout>
+
+
+                    <EditText
+                        android:id="@+id/set_nitter_host"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:hint="@string/set_nitter_host"
+                        android:inputType="textWebEditText" />
+
+                    <!-- utm parameters -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/settings_option_margin"
+                        android:layout_marginBottom="@dimen/settings_option_margin"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="10dp"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/set_utm_parameters"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/set_utm_parameters_indication"
+                                android:textColor="@color/mastodonC2"
+                                android:textSize="12sp" />
+
+                        </LinearLayout>
+
+                        <androidx.appcompat.widget.SwitchCompat
+                            android:id="@+id/set_utm_parameters"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+
+                    </LinearLayout>
+
+                    <!-- user agent  -->
+                    <LinearLayout
+                        android:layout_marginTop="@dimen/settings_option_margin"
+                        android:layout_marginBottom="@dimen/settings_option_margin"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:labelFor="@+id/set_user_agent"
+                            android:text="@string/set_user_agent"
+                            android:textSize="16sp" />
+
+                        <EditText
+                            android:id="@+id/set_user_agent"
+                            android:ellipsize="end"
+                            android:hint="@string/set_user_agent_hint"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="textMultiLine"
+                            android:lines="2"
+                            />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/set_user_agent_indication"
+                            android:textColor="@color/mastodonC2" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/settings_option_margin"
+                        android:layout_marginBottom="@dimen/settings_option_margin"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="10dp"
+                            android:layout_weight="1"
+                            android:text="@string/embedded_browser"
+                            android:textSize="16sp" />
+
+                        <androidx.appcompat.widget.SwitchCompat
+                            android:id="@+id/set_embedded_browser"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+
+                    </LinearLayout>
+
+                    <Button
+                        android:id="@+id/update_tracking_domains"
+                        style="@style/colored_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:gravity="center"
+                        android:text="@string/update_tracking_domains"
+                        android:textSize="16sp" />
+
+                    <LinearLayout
+                        android:id="@+id/custom_tabs_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/settings_option_margin"
+                        android:layout_marginBottom="@dimen/settings_option_margin"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <LinearLayout
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="10dp"
+                            android:layout_weight="1"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/custom_tabs"
+                                android:textSize="16sp" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/set_enable_crash_report_indication"
+                                android:textColor="@color/mastodonC2"
+                                android:textSize="12sp" />
+                        </LinearLayout>
+
+                        <androidx.appcompat.widget.SwitchCompat
+                            android:id="@+id/set_custom_tabs"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/set_javascript_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:orientation="vertical"
+                        android:visibility="gone">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:text="@string/use_javascript"
+                                android:textSize="16sp" />
+
+                            <androidx.appcompat.widget.SwitchCompat
+                                android:id="@+id/set_javascript"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:layout_margin="10dp"
+                                android:gravity="center" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:id="@+id/set_cookies_container"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:text="@string/use_cookies"
+                                android:textSize="16sp" />
+
+                            <androidx.appcompat.widget.SwitchCompat
+                                android:id="@+id/set_cookies"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                android:layout_margin="10dp"
+                                android:gravity="center" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+                </LinearLayout>
+
                 <!--  HIDE MENU -->
                 <LinearLayout
                     android:id="@+id/settings_hide_menu"
@@ -2622,7 +2754,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -2637,7 +2769,7 @@
                             android:textColor="?colorAccent"
                             android:textSize="16sp" />
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -2668,6 +2800,30 @@
 
                     </LinearLayout>
 
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/settings_option_margin"
+                        android:layout_marginBottom="@dimen/settings_option_margin"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="10dp"
+                            android:layout_weight="1"
+                            android:text="@string/action_trends"
+                            android:textSize="16sp" />
+
+                        <androidx.appcompat.widget.SwitchCompat
+                            android:id="@+id/nav_trends"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content" />
+
+                    </LinearLayout>
+
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -2835,12 +2991,12 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?colorAccent"/>
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -2850,12 +3006,12 @@
                             android:textColor="?colorAccent"
                             android:textSize="16sp" />
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?colorAccent"/>
                     </LinearLayout>
 
                     <LinearLayout
@@ -2933,12 +3089,12 @@
                         android:layout_height="wrap_content"
                         android:orientation="horizontal">
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
                             android:layout_weight="1"
-                            android:background="?colorAccent" />
+                            android:background="?colorAccent"/>
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -2948,7 +3104,7 @@
                             android:textColor="?colorAccent"
                             android:textSize="16sp" />
 
-                        <View
+                        <LinearLayout
                             android:layout_width="0dp"
                             android:layout_height="1dp"
                             android:layout_margin="10dp"
@@ -2982,7 +3138,7 @@
 
                     <Button
                         android:id="@+id/validate"
-                        style="@style/Base.Widget.AppCompat.Button.Colored"
+                        style="@style/colored_button"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -3067,7 +3223,7 @@
 
                         <Button
                             android:id="@+id/about_translation"
-                            style="@style/Base.Widget.AppCompat.Button.Colored"
+                            style="@style/colored_button"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="3"
diff --git a/app/src/main/res/layout/layout_poll.xml b/app/src/main/res/layout/layout_poll.xml
index 07747e304..0f3edbc6b 100644
--- a/app/src/main/res/layout/layout_poll.xml
+++ b/app/src/main/res/layout/layout_poll.xml
@@ -45,14 +45,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:visibility="gone"></LinearLayout>
+        android:visibility="gone"/>
 
     <LinearLayout
         android:id="@+id/rated"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:visibility="gone"></LinearLayout>
+        android:visibility="gone"/>
 
 
     <LinearLayout
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index d445c033d..311fe3aba 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -17,6 +17,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
+    android:background="?colorPrimaryDark"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height">
 
@@ -71,7 +72,7 @@
                 android:id="@+id/header_option_menu"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
-                android:contentDescription="@string/truncate_long_toots"
+                android:contentDescription="@string/display_more_options"
                 android:gravity="center_vertical|end"
                 android:src="@drawable/ic_more_vert"
                 android:tint="?attr/iconColorMenu" />
diff --git a/app/src/main/res/layout/popup_identity_proof.xml b/app/src/main/res/layout/popup_identity_proof.xml
new file mode 100644
index 000000000..caf3b1b6a
--- /dev/null
+++ b/app/src/main/res/layout/popup_identity_proof.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:id="@+id/identity_proofs_list"
+    android:layout_height="wrap_content"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/popup_quick_settings.xml b/app/src/main/res/layout/popup_quick_settings.xml
index 536681da9..0d1246065 100644
--- a/app/src/main/res/layout/popup_quick_settings.xml
+++ b/app/src/main/res/layout/popup_quick_settings.xml
@@ -15,7 +15,6 @@
     see <http://www.gnu.org/licenses>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/swipeContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -32,12 +31,12 @@
         android:text="@string/settings_popup_message" />
 
     <!-- Choose stream -->
-    <com.jaredrummler.materialspinner.MaterialSpinner
+    <Spinner
         android:id="@+id/set_live_type"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="20dp"
-        app:ms_background_color="?colorPrimaryDark" />
+        />
 
     <TextView
         android:id="@+id/set_live_type_indication"
diff --git a/app/src/main/res/layout/popup_release_notes.xml b/app/src/main/res/layout/popup_release_notes.xml
new file mode 100644
index 000000000..2346f3d5c
--- /dev/null
+++ b/app/src/main/res/layout/popup_release_notes.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2019 Thomas Schneider
+
+    This file is a part of Fedilab
+
+    This program is free software; you can redistribute it and/or modify it under the terms of the
+    GNU General Public License as published by the Free Software Foundation; either version 3 of the
+    License, or (at your option) any later version.
+
+    Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+    Public License for more details.
+
+    You should have received a copy of the GNU General Public License along with Fedilab; if not,
+    see <http://www.gnu.org/licenses>.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/release_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="10dp"
+            android:gravity="center_horizontal"
+            android:textSize="18sp" />
+        <TextView
+            android:id="@+id/release_notes"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:layout_marginTop="10dp"
+            android:gravity="start"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/dev_follow_title"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:layout_marginTop="10dp"
+            android:text="@string/follow_account_update"
+            android:gravity="start"
+            android:textSize="16sp" />
+        <app.fedilab.android.helper.ExpandableHeightListView
+            android:id="@+id/lv_developers"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:divider="@null"
+            android:scrollbars="none" />
+    </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/layout/search_instance.xml b/app/src/main/res/layout/search_instance.xml
index dad799b6b..edfa92163 100644
--- a/app/src/main/res/layout/search_instance.xml
+++ b/app/src/main/res/layout/search_instance.xml
@@ -48,5 +48,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/gnu_instance" />
+        <RadioButton
+            android:id="@+id/twitter_accounts"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/twitter_accounts" />
     </RadioGroup>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tab_badge.xml b/app/src/main/res/layout/tab_badge.xml
index 5060d0a14..eac2cd822 100644
--- a/app/src/main/res/layout/tab_badge.xml
+++ b/app/src/main/res/layout/tab_badge.xml
@@ -31,7 +31,6 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@+id/tab_icon"
         android:layout_alignEnd="@+id/tab_icon"
-        android:layout_alignRight="@+id/tab_icon"
         android:background="@drawable/shape_counter"
         android:paddingLeft="2dp"
         android:paddingRight="2dp"
diff --git a/app/src/main/res/layout/tablayout_toots.xml b/app/src/main/res/layout/tablayout_toots.xml
index ada6ad780..cee43b9b8 100644
--- a/app/src/main/res/layout/tablayout_toots.xml
+++ b/app/src/main/res/layout/tablayout_toots.xml
@@ -25,6 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?backgroundColor"
+        app:tabTextAppearance="@style/TabLayoutStyle"
         app:tabGravity="fill"
         app:tabMaxWidth="0dp"
         app:tabSelectedTextColor="?colorAccent" />
diff --git a/app/src/main/res/layout/toot_action_bar.xml b/app/src/main/res/layout/toot_action_bar.xml
index 9e3091ca4..e06a8aafc 100644
--- a/app/src/main/res/layout/toot_action_bar.xml
+++ b/app/src/main/res/layout/toot_action_bar.xml
@@ -14,7 +14,8 @@
     You should have received a copy of the GNU General Public License along with Fedilab; if not,
     see <http://www.gnu.org/licenses>.
 -->
-<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.Toolbar
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/toolbar"
@@ -23,6 +24,7 @@
     android:contentInsetStart="0dp"
     android:contentInsetLeft="0dp"
     android:contentInsetEnd="0dp"
+    android:background="?colorPrimary"
     android:contentInsetRight="0dp"
     app:contentInsetEnd="0dp"
     app:contentInsetLeft="0dp"
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 9b499ea2f..75f290601 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -17,6 +17,10 @@
                         android:icon="@drawable/ic_new_releases_black"
                         android:title="@string/action_news"
                         app:actionLayout="@layout/item_menu_news" />
+                    <item
+                        android:id="@+id/nav_trends"
+                        android:icon="@drawable/ic_trending_tags"
+                        android:title="@string/action_trends" />
                     <item
                         android:id="@+id/nav_list"
                         android:icon="@drawable/ic_list"
diff --git a/app/src/main/res/menu/links_popup.xml b/app/src/main/res/menu/links_popup.xml
new file mode 100644
index 000000000..8a8bfeb32
--- /dev/null
+++ b/app/src/main/res/menu/links_popup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+   >
+    <item
+        android:id="@+id/action_show_link"
+        android:title="@string/display_full_link"
+        />
+    <item
+        android:id="@+id/action_share_link"
+        android:title="@string/share_link"
+        />
+    <item
+        android:id="@+id/action_open_other_app"
+        android:title="@string/open_other_app"
+        />
+    <item
+        android:id="@+id/action_copy_link"
+        android:title="@string/copy_link"
+        />
+    <item
+        android:id="@+id/action_unshorten"
+        android:title="@string/check_redirect"
+        />
+</menu>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 17b548663..a1ded12cd 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -126,6 +126,38 @@
     <string name="date_minutes">%d د</string>
     <string name="date_hours">%d سا</string>
     <string name="date_day">%d يو</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="zero">لا ثانية</item>
+        <item quantity="one">ثانية واحدة</item>
+        <item quantity="two">ثانيتَيْن</item>
+        <item quantity="few">%d ثوانٍ</item>
+        <item quantity="many">%d ثوانٍ</item>
+        <item quantity="other">%d ثوانٍ</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="zero">صفر دقيقة</item>
+        <item quantity="one">دقيقة واحدة</item>
+        <item quantity="two">دقيقتَيْن</item>
+        <item quantity="few">%d دقائق</item>
+        <item quantity="many">%d دقائق</item>
+        <item quantity="other">%d دقائق</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="zero">صفر ساعة</item>
+        <item quantity="one">ساعة واحدة</item>
+        <item quantity="two">ساعتان</item>
+        <item quantity="few">%d ساعات</item>
+        <item quantity="many">%d ساعات</item>
+        <item quantity="other">%d ساعات</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="zero">لا يوم</item>
+        <item quantity="one">يوم واحد</item>
+        <item quantity="two">يومَيْن</item>
+        <item quantity="few">%d أيام</item>
+        <item quantity="many">%d أيام</item>
+        <item quantity="other">%d أيام</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">تحذير</string>
     <string name="toot_placeholder">فيم تفكر؟</string>
@@ -198,6 +230,7 @@
     <string name="notif_reblog">رقى تبويقك</string>
     <string name="notif_favourite">أُعجِب بتبويقك</string>
     <string name="notif_follow">يتابعك</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="zero">و اشعار آخَر</item>
         <item quantity="one">و إشعار آخر</item>
@@ -278,6 +311,7 @@
     <string name="set_notify">هل تود الإشعار؟</string>
     <string name="set_notif_silent">كتم الاشعارات</string>
     <string name="set_nsfw_timeout">مهلة عرض الـ NSFW (بالثواني، 0 يعني مُعطَّل)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">تعديل الملف الشخصي</string>
     <string name="settings_title_custom_sharing">المشاركة المخصصة</string>
     <string name="settings_custom_sharing_url">رابط المشاركة المعدل&#8230;</string>
@@ -300,11 +334,6 @@
     <string name="use_javascript">تفعيل الجافاسكريبت</string>
     <string name="expand_cw">توسيع نافذة التحذير عن المحتوى تلقائيًا</string>
     <string name="use_cookies">تقبُّل كعكات الطرف الثالث</string>
-    <string-array name="settings_translation">
-        <item>يانديكس</item>
-        <item>DeepL</item>
-        <item>لا</item>
-    </string-array>
     <string name="your_api_key">مفتاح API، يمكن تركه فارغا لاستخدام ياندكس</string>
     <string-array name="settings_theme">
         <item>مظلمة</item>
@@ -948,6 +977,14 @@
         <item quantity="many">%d أصوات</item>
         <item quantity="other">%d صوتا</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="zero">لا مصوّت</item>
+        <item quantity="one">مصوّت واحد</item>
+        <item quantity="two">مصوّتَيْن</item>
+        <item quantity="few">%d مصوّت</item>
+        <item quantity="many">%d مصوّت</item>
+        <item quantity="other">%d مصوّت</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>خيار واحد</item>
         <item>خيارات متعددة</item>
@@ -1016,10 +1053,12 @@
     <string name="order_by">ترتيب حسب</string>
     <string name="title_video_peertube">عنوان للفيديو</string>
     <string name="join_peertube">انظم إلى PeerTube</string>
-    <string name="agreement_check_peertube">أبلُغ مِن العُمر 16 سنة علئ الأقل وأوافق على %1$s لهذا الخادم</string>
+    <string name="agreement_check_peertube">أبلُغ مِن العُمر 16 سنة على الأقل وأوافق على %1$s هذا الخادم</string>
     <string name="link_color_title">الروابط</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">رأسية إعادات النشر</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">يغيّر لون الرأسية الخاصة بإعادة النشر</string>
     <string name="background_status_title">المنشورات</string>
     <string name="background_status">لون خلفية المنشورات على الخيوط</string>
@@ -1034,23 +1073,64 @@
     <string name="make_an_action">القيام بإجراء</string>
     <string name="translation">الترجمة</string>
     <string name="image_preview">معاينة الصورة</string>
-    <string name="text_color_title">Text color</string>
+    <string name="text_color_title">لون النص</string>
     <string name="text_color">Change the text color in pots</string>
-    <string name="apply_changes">Apply changes</string>
+    <string name="apply_changes">احفظ التعديلات</string>
     <string name="restart_message">You need to restart the application to apply changes</string>
-    <string name="restart">Restart</string>
-    <string name="pref_custom_theme">Use a custom theme</string>
+    <string name="restart">إعادة التشغيل</string>
+    <string name="pref_custom_theme">استخدم قالبا مخصصا</string>
     <string name="pref_custom_theme_summary">Allow to override colors of the  selected theme above</string>
-    <string name="theming">Theming</string>
-    <string name="store_before">Store before</string>
-    <string name="data_export_theme">The theme was exported</string>
+    <string name="theming">المظهر</string>
+    <string name="store_before">احتفظ به أولًا</string>
+    <string name="data_export_theme">تم تصدير القالب</string>
     <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
     <string name="pref_colored_status_bar_summary">Apply the primary color to the status bar</string>
-    <string name="pref_colored_status_bar_title">Status bar color</string>
-    <string name="restore_default_theme">Restore a default theme</string>
-    <string name="import_theme">Import a theme</string>
+    <string name="pref_colored_status_bar_title">لون شريط الحالة</string>
+    <string name="restore_default_theme">استرجاع القالب الإفتراضي</string>
+    <string name="import_theme">استيراد قالب</string>
     <string name="import_theme_title">Tap here to import a theme from a previous export</string>
-    <string name="export_theme">Export the theme</string>
+    <string name="export_theme">تصدير قالب</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">القوالب</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">لون شريط التصفّح</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">لون الخلفية</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">اللون الأساسي</string>
+    <string name="export_bookmarks">صدّر الفواصل المرجعية إلى مثيل الخادم</string>
+    <string name="import_bookmarks">استيراد الفواصل المرجعية مِن مثيل الخادم</string>
+    <string name="user_count">عدد المستخدمين</string>
+    <string name="status_count">عدد المنشورات</string>
+    <string name="instance_count">عدد مثيلات الخوادم</string>
+    <string name="blocked">تم حجبه</string>
+    <string name="poll_finish_in">ينتهي في %s</string>
+    <string name="release_note_title">ما الجديد في %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">اظهر الرابط كاملًا</string>
+    <string name="share_link">شارك الرابط</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">افتح في تطبيق آخر</string>
+    <string name="check_redirect">تحقّق مِن التوجيه</string>
+    <string name="no_redirect">هذا العنوان لا يحوّل إلى عنوان آخر</string>
+    <string name="redirect_detected">%1$s \n\nيُحوّل إلى\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">أزل معلّمات UTM</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">المتداوَلة</string>
+    <string name="trending_now">المتداوَلة الآن</string>
+    <string name="talking_about">%d أشخاص يتحدثون عن ذلك</string>
+    <string name="twitter_accounts">حسابات تويتر (عبر Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">دلائل الهوية</string>
+    <string name="verified_user">هوية مُتحقّق منها</string>
+    <string name="verified_by">تم التحقق منه عبر %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 81fd469d3..38ee64df1 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -84,7 +84,7 @@
     <string name="live_notif">লাইভ বিজ্ঞপ্তিগুলি</string>
     <!-- Status -->
     <string name="no_status">প্রদর্শনের জন্য কোন টুট নেই</string>
-    <string name="reblog_by">Boosted by %1$s</string>
+    <string name="reblog_by">%1$s দ্বারা সমর্থন</string>
     <string name="favourite_add">এই টুটটি আপনার পছন্দসইয়ের সাথে যুক্ত করবেন?</string>
     <string name="favourite_remove">আপনার পছন্দসই থেকে এই টুট সরাবেন?</string>
     <string name="reblog_add">এই টুট টি সমর্থন করবেন?</string>
@@ -113,58 +113,74 @@
     </string-array>
     <string-array name="more_action_owner_confirm">
         <item>এই টুট টি মুছে ফেলবেন?</item>
-        <item>Delete &amp; re-draft this toot?</item>
+        <item>এই টুট টি মুছে &amp; পুনঃসংশ্লিষ্ট করবেন?</item>
     </string-array>
-    <string name="bookmarks">Bookmarks</string>
-    <string name="bookmark_add">Add to bookmarks</string>
-    <string name="bookmark_remove">Remove bookmark</string>
-    <string name="bookmarks_empty">No bookmarks to display</string>
-    <string name="status_bookmarked">Status has been added to bookmarks!</string>
-    <string name="status_unbookmarked">Status was removed from bookmarks!</string>
+    <string name="bookmarks">বুকমার্কগুলি</string>
+    <string name="bookmark_add">বুকমার্ক তালিকা এ যোগ করুন</string>
+    <string name="bookmark_remove">বুকমার্ক মুছে ফেলুন</string>
+    <string name="bookmarks_empty">প্রদর্শনের জন্য কোনও বুকমার্ক নেই</string>
+    <string name="status_bookmarked">বুকমার্কগুলিতে স্ট্যাটাস যুক্ত হয়েছে!</string>
+    <string name="status_unbookmarked">বুকমার্কগুলি থেকে স্থিতি সরানো হয়েছিল!</string>
     <!-- Date -->
-    <string name="date_seconds">%d s</string>
-    <string name="date_minutes">%d m</string>
-    <string name="date_hours">%d h</string>
-    <string name="date_day">%d d</string>
+    <string name="date_seconds">%d সেকেন্ড</string>
+    <string name="date_minutes">%d মিনিট</string>
+    <string name="date_hours">%d ঘন্টা</string>
+    <string name="date_day">%d দিন</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d সেকেন্ড</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d মিনিট</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d ঘণ্টা</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d দিন</item>
+    </plurals>
     <!-- TOOT -->
-    <string name="toot_cw_placeholder">Warning</string>
-    <string name="toot_placeholder">What is on your mind?</string>
-    <string name="toot_it">TOOT!</string>
-    <string name="queet_it">QUEET!</string>
-    <string name="cw">cw</string>
-    <string name="toot_title">Write a toot</string>
-    <string name="toot_title_reply">Reply to a toot</string>
-    <string name="queet_title">Write a queet</string>
-    <string name="queet_title_reply">Reply to a queet</string>
-    <string name="toot_select_image">Select a media</string>
-    <string name="toot_select_image_error">An error occurred while selecting the media!</string>
-    <string name="toot_delete_media">Delete this media?</string>
-    <string name="toot_error_no_content">Your toot is empty!</string>
-    <string name="toot_visibility_tilte">Visibility of the toot</string>
-    <string name="toots_visibility_tilte">Visibility of the toots by default: </string>
-    <string name="toot_sent">The toot has been sent!</string>
-    <string name="toot_reply_content_title">You are replying to this toot:</string>
-    <string name="toot_sensitive">Sensitive content?</string>
+    <string name="toot_cw_placeholder">সতর্কতা</string>
+    <string name="toot_placeholder">আপনার মনে কি আছে?</string>
+    <string name="toot_it">টুট!</string>
+    <string name="queet_it">ক্যুইট!</string>
+    <string name="cw">সঃবঃ</string>
+    <string name="toot_title">একটি টুট লিখুন</string>
+    <string name="toot_title_reply">একটি টুট এ উত্তর দিন</string>
+    <string name="queet_title">একটি ক্যুইট লিখুন</string>
+    <string name="queet_title_reply">একটি ক্যুইট এ উত্তর দিন</string>
+    <string name="toot_select_image">একটি মিডিয়া নির্বাচন করুন</string>
+    <string name="toot_select_image_error">মিডিয়া নির্বাচন করার সময় একটি ত্রুটি ঘটেছে!</string>
+    <string name="toot_delete_media">এই মিডিয়া মুছবেন?</string>
+    <string name="toot_error_no_content">আপনার টুট ফাঁকা!</string>
+    <string name="toot_visibility_tilte">টুটের দৃশ্যমানতা</string>
+    <string name="toots_visibility_tilte">ডিফল্টরূপে টুটগুলির দৃশ্যমানতা: </string>
+    <string name="toot_sent">টুট পাঠানো হয়েছে!</string>
+    <string name="toot_reply_content_title">আপনি এই টুটের উত্তর দিচ্ছেন:</string>
+    <string name="toot_sensitive">সংবেদনশীল কন্টেন্ট?</string>
     <string-array name="toot_visibility">
-        <item>Post to public timelines</item>
-        <item>Do not post to public timelines</item>
-        <item>Post to followers only</item>
-        <item>Post to mentioned users only</item>
+        <item>জনসাধারণের টাইমলাইনে পোস্ট করুন</item>
+        <item>জনসাধারণের টাইমলাইনে পোস্ট করবেন না</item>
+        <item>শুধুমাত্র অনুসরণকারীদের পোস্ট করুন</item>
+        <item>শুধুমাত্র উল্লিখিত ব্যবহারকারীদের জন্য পোস্ট করুন</item>
     </string-array>
-    <string name="no_draft">No drafts!</string>
-    <string name="choose_toot">Choose a toot</string>
-    <string name="choose_accounts">Choose an account</string>
-    <string name="select_accounts">Select some accounts</string>
-    <string name="remove_draft">Remove draft?</string>
-    <string name="show_reply">Tap on the button to display the original toot</string>
-    <string name="upload_form_description">Describe for the visually impaired</string>
+    <string name="no_draft">কোন খসড়া নেই!</string>
+    <string name="choose_toot">একটি টুট চয়ন করুন</string>
+    <string name="choose_accounts">একটি অ্যাকাউন্ট চয়ন করুন</string>
+    <string name="select_accounts">কিছু অ্যাকাউন্টগুলি নির্বাচন করুন</string>
+    <string name="remove_draft">খসড়া সরান?</string>
+    <string name="show_reply">আসল টুটটি প্রদর্শন করতে বোতামে আলতো চাপুন</string>
+    <string name="upload_form_description">দৃষ্টি প্রতিবন্ধীদের জন্য বর্ণনা করুন</string>
     <!-- Instance -->
-    <string name="instance_no_description">No description available!</string>
+    <string name="instance_no_description">কোন বর্ণনা নাই!</string>
     <!-- About -->
-    <string name="about_vesrion">Release %1$s</string>
-    <string name="about_developer">Developer:</string>
-    <string name="about_license">License: </string>
-    <string name="about_license_action">GNU GPL V3</string>
+    <string name="about_vesrion">রিলিজ %1$s</string>
+    <string name="about_developer">বিকাশকারী:</string>
+    <string name="about_license">লাইসেন্স: </string>
+    <string name="about_license_action">জিএনইউ জিপিএল ভার্সন ৩</string>
     <string name="about_code">Source code: </string>
     <string name="about_yandex">Translation of toots:</string>
     <string name="about_thekinrar">Search instances:</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">boosted your status</string>
     <string name="notif_favourite">favourited your status</string>
     <string name="notif_follow">followed you</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">and another notification</item>
         <item quantity="other">and %d other notifications</item>
@@ -228,21 +245,21 @@
     <string name="toast_unreblog">The toot is no longer boosted!</string>
     <string name="toast_favourite">The toot was added to your favourites!</string>
     <string name="toast_unfavourite">The toot was removed from your favourites!</string>
-    <string name="toast_report">The toot was reported!</string>
-    <string name="toast_unstatus">The toot was deleted!</string>
-    <string name="toast_pin">The toot was pinned!</string>
-    <string name="toast_unpin">The toot was unpinned!</string>
-    <string name="toast_error">Oops ! An error occurred!</string>
-    <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
-    <string name="toast_error_instance">The instance domain does not seem to be valid!</string>
-    <string name="toast_error_loading_account">An error occurred while switching between accounts!</string>
-    <string name="toast_error_search">An error occurred while searching!</string>
-    <string name="toast_update_credential_ok">The profile data have been saved!</string>
-    <string name="nothing_to_do">No action can be taken</string>
-    <string name="toast_saved">The media has been saved!</string>
-    <string name="toast_error_translate">An error occurred while translating!</string>
-    <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
-    <string name="toast_toot_saved">Draft saved!</string>
+    <string name="toast_report">টুটটির প্রতিবেদন করা হয়েছে!</string>
+    <string name="toast_unstatus">টুটটি মুছে ফেলা হয়েছে!</string>
+    <string name="toast_pin">টুটটি পিন করা হয়েছে!</string>
+    <string name="toast_unpin">টুটটি আনপিন করা হয়েছে!</string>
+    <string name="toast_error">উফফফফ! একটি ত্রুটি ঘটেছে!</string>
+    <string name="toast_code_error">একটি ত্রুটি ঘটেছে! ইনস্ট্যান্স একটি অনুমোদন কোড ফেরায় নি!</string>
+    <string name="toast_error_instance">ইনস্ট্যান্স এর ডোমেনটি বৈধ বলে মনে হচ্ছে না!</string>
+    <string name="toast_error_loading_account">অ্যাকাউন্টগুলির মধ্যে স্যুইচ করার সময় একটি ত্রুটি ঘটেছে!</string>
+    <string name="toast_error_search">অনুসন্ধানের সময় একটি ত্রুটি ঘটেছে!</string>
+    <string name="toast_update_credential_ok">প্রোফাইল তথ্য সংরক্ষণ করা হয়েছে!</string>
+    <string name="nothing_to_do">কোনও পদক্ষেপ নেওয়া যাবে না</string>
+    <string name="toast_saved">মিডিয়া রক্ষা পেয়েছে!</string>
+    <string name="toast_error_translate">অনুবাদ করার সময় একটি ত্রুটি ঘটেছে!</string>
+    <string name="toast_error_translations_disabled">অনুবাদসমূহ সেটিংসে অক্ষম রয়েছে</string>
+    <string name="toast_toot_saved">খসড়া সংরক্ষিত করা হয়েছে!</string>
     <string name="toast_error_char_limit">Are you sure this instance allows this number of characters? Usually, this value is close to 500 characters.</string>
     <string name="toast_visibility_changed">Visibility of the toots has been changed for the account %1$s</string>
     <!-- Settings -->
@@ -270,6 +287,7 @@
     <string name="set_notify">Notify?</string>
     <string name="set_notif_silent">Silent Notifications</string>
     <string name="set_nsfw_timeout">NSFW view timeout (seconds, 0 means off)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Edit profile</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Enable Javascript</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="use_cookies">Allow third-party cookies</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>No</item>
-    </string-array>
     <string name="your_api_key">Your API key, you can leave blank for Yandex</string>
     <string-array name="settings_theme">
         <item>Dark</item>
@@ -937,6 +950,10 @@
         <item quantity="one">%d vote</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1009,6 +1026,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1042,4 +1061,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml
index 8c9e339fc..ad1994539 100644
--- a/app/src/main/res/values-br/strings.xml
+++ b/app/src/main/res/values-br/strings.xml
@@ -126,6 +126,34 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="two">%d seconds</item>
+        <item quantity="few">%d seconds</item>
+        <item quantity="many">%d seconds</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="two">%d minutes</item>
+        <item quantity="few">%d minutes</item>
+        <item quantity="many">%d minutes</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="two">%d hours</item>
+        <item quantity="few">%d hours</item>
+        <item quantity="many">%d hours</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="two">%d days</item>
+        <item quantity="few">%d days</item>
+        <item quantity="many">%d days</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Warning</string>
     <string name="toot_placeholder">What is on your mind?</string>
@@ -198,6 +226,7 @@
     <string name="notif_reblog">boosted your status</string>
     <string name="notif_favourite">favourited your status</string>
     <string name="notif_follow">followed you</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">and another notification</item>
         <item quantity="two">and %d other notifications</item>
@@ -276,6 +305,7 @@
     <string name="set_notify">Notify?</string>
     <string name="set_notif_silent">Silent Notifications</string>
     <string name="set_nsfw_timeout">NSFW view timeout (seconds, 0 means off)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Edit profile</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -298,11 +328,6 @@
     <string name="use_javascript">Enable Javascript</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="use_cookies">Allow third-party cookies</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>No</item>
-    </string-array>
     <string name="your_api_key">Your API key, you can leave blank for Yandex</string>
     <string-array name="settings_theme">
         <item>Dark</item>
@@ -946,6 +971,13 @@
         <item quantity="many">%d votes</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="two">%d voters</item>
+        <item quantity="few">%d voters</item>
+        <item quantity="many">%d voters</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1018,6 +1050,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1051,4 +1085,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 47fe9d68a..51eae166a 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com-->
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
     <string name="navigation_drawer_open">Obre el menú</string>
     <string name="navigation_drawer_close">Tanca el menú</string>
@@ -20,24 +21,24 @@
     <string name="password">Contrasenya</string>
     <string name="email">Adreça electrònica</string>
     <string name="accounts">Comptes</string>
-    <string name="toots">Toots</string>
+    <string name="toots">Brams</string>
     <string name="tags">Etiquetes</string>
     <string name="save">Desa</string>
     <string name="restore">Restaura</string>
     <string name="no_result">No hi ha cap resultat!</string>
     <string name="instance">Instància</string>
-    <string name="instance_example">Intància: mastodon.social</string>
+    <string name="instance_example">Instància: mastodon.social</string>
     <string name="toast_account_changed" formatted="false">Ara funciona amb el compte %1$s</string>
     <string name="add_account">Afegeix un compte</string>
-    <string name="clipboard">El contingut del toot s\'ha copiat al porta-retalls</string>
-    <string name="clipboard_url">L\'adreça web del toot s\'ha copiat al porta-retalls</string>
+    <string name="clipboard">El contingut del bram s\'ha copiat al porta-retalls</string>
+    <string name="clipboard_url">L\'adreça web del bram s\'ha copiat al porta-retalls</string>
     <string name="change">Canvia</string>
-    <string name="choose_picture">Seleccioneu una imatge…</string>
+    <string name="choose_picture">Selecciona una imatge…</string>
     <string name="clear">Neteja</string>
     <string name="camera">Càmera</string>
     <string name="delete_all">Suprimeix-ho tot</string>
-    <string name="translate_toot">Tradueix aquest toot.</string>
-    <string name="schedule">Temporalitza</string>
+    <string name="translate_toot">Tradueix aquest bram.</string>
+    <string name="schedule">Temporitza</string>
     <string name="text_size">Mides de text i icones</string>
     <string name="text_size_change">Canvia la mida del text actual:</string>
     <string name="icon_size_change">Canvia la mida de la icona actual:</string>
@@ -49,10 +50,10 @@
     <string name="share_with">Comparteix amb</string>
     <string name="shared_via">Compartit via Fedilab</string>
     <string name="replies">Respostes</string>
-    <string name="username">Nom d\'usuari</string>
+    <string name="username">Nom d\'usuària</string>
     <string name="drafts">Esborranys</string>
     <string name="favourite">Preferits</string>
-    <string name="follow">Seguidors nous</string>
+    <string name="follow">Noves seguidores</string>
     <string name="mention">Mencions</string>
     <string name="reblog">Difusions</string>
     <string name="show_boosts">Mostrar difusions</string>
@@ -62,13 +63,13 @@
     <string name="please_wait">Si us plau, espereu uns segons abans de fer aquesta acció.</string>
     <!--- Menu -->
     <string name="home_menu">Inici</string>
-    <string name="local_menu">Cronologia local</string>
+    <string name="local_menu">Pissarra local</string>
     <string name="global_menu">Pissarra federada</string>
     <string name="neutral_menu_title">Opcions</string>
     <string name="favorites_menu">Preferits</string>
     <string name="communication_menu_title">Comunicació</string>
-    <string name="muted_menu">Usuaris silenciats</string>
-    <string name="blocked_menu">Usuaris blocats</string>
+    <string name="muted_menu">Usuàries silenciades</string>
+    <string name="blocked_menu">Usuàries blocades</string>
     <string name="notifications">Notificacions</string>
     <string name="follow_request">Peticions de seguiment</string>
     <string name="settings">Configuració</string>
@@ -77,20 +78,20 @@
     <string name="send_email">Envia un correu electrònic</string>
     <string name="click_to_change">Feu clic en a la ruta per canviar-la</string>
     <string name="failed">Ha fallat!</string>
-    <string name="scheduled_toots">Toots temporalitzats</string>
-    <string name="disclaimer_full">Aquesta informació d\'usuari pot estar incompleta.</string>
-    <string name="insert_emoji">Insereix un emoji</string>
+    <string name="scheduled_toots">Brams temporitzats</string>
+    <string name="disclaimer_full">Aquesta informació d\'usuària pot estar incompleta.</string>
+    <string name="insert_emoji">Inserir emoji</string>
     <string name="no_emoji">L\'app no ha recollit emojis personalitzats de moment.</string>
     <string name="live_notif">Notificacions en directe</string>
     <!-- Status -->
-    <string name="no_status">Cap toot per mostrar</string>
+    <string name="no_status">Cap bram per mostrar</string>
     <string name="reblog_by">Difós per %1$s</string>
-    <string name="favourite_add">Afegir aquest toot als favorits?</string>
-    <string name="favourite_remove">Esborrar aquest toot dels favorits?</string>
-    <string name="reblog_add">Vols difondre aquest toot?</string>
-    <string name="reblog_remove">Desdifondre el toot?</string>
-    <string name="pin_add">Vols fixar aquest toot?</string>
-    <string name="pin_remove">Desfixar aquest toot?</string>
+    <string name="favourite_add">Afegir aquest bram als preferits?</string>
+    <string name="favourite_remove">Esborrar aquest bram dels preferits?</string>
+    <string name="reblog_add">Vols difondre aquest bram?</string>
+    <string name="reblog_remove">Desdifondre el bram?</string>
+    <string name="pin_add">Vols fixar aquest bram?</string>
+    <string name="pin_remove">Desfixar aquest bram?</string>
     <string name="more_action_1">Silencia</string>
     <string name="more_action_2">Bloca</string>
     <string name="more_action_3">Denuncia</string>
@@ -98,12 +99,12 @@
     <string name="more_action_5">Copia</string>
     <string name="more_action_6">Comparteix</string>
     <string name="more_action_7">Menciona</string>
-    <string name="more_action_8">Silencia temporalment</string>
+    <string name="more_action_8">Silenciar temporalment</string>
     <string name="more_action_9">Suprimir &amp; tornar a redactar</string>
     <string-array name="more_action_confirm">
         <item>Vols silenciar aquest compte?</item>
         <item>Vols blocar aquest compte?</item>
-        <item>Vols denunciar aquest toot?</item>
+        <item>Vols denunciar aquest bram?</item>
         <item>Vols blocar el domini?</item>
         <item>Desilenciar aquest compte?</item>
     </string-array>
@@ -112,8 +113,8 @@
         <item>Silenciar</item>
     </string-array>
     <string-array name="more_action_owner_confirm">
-        <item>Vols suprimir aquest toot?</item>
-        <item>Suprimir &amp; tornar a redactar aquest toot?</item>
+        <item>Vols suprimir aquest bram?</item>
+        <item>Suprimir &amp; tornar a redactar aquest bram?</item>
     </string-array>
     <string name="bookmarks">Marcadors</string>
     <string name="bookmark_add">Afegeix als marcadors</string>
@@ -126,37 +127,53 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d.</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d segon</item>
+        <item quantity="other">%d segons</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minut</item>
+        <item quantity="other">%d minuts</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hora</item>
+        <item quantity="other">%d hores</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d dia</item>
+        <item quantity="other">%d dies</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Alerta</string>
     <string name="toot_placeholder">Què et passa pel cap?</string>
-    <string name="toot_it">TOOT!</string>
+    <string name="toot_it">BRAMULA!</string>
     <string name="queet_it">Quita!</string>
     <string name="cw">ac</string>
-    <string name="toot_title">Escriu un toot</string>
+    <string name="toot_title">Escriu un bram</string>
     <string name="toot_title_reply">Respon a un toot</string>
     <string name="queet_title">Escriu un quit</string>
     <string name="queet_title_reply">Respon a un quit</string>
     <string name="toot_select_image">Escull un recurs multimèdia</string>
-    <string name="toot_select_image_error">S\'ha produït un error en seleccionar el recurs multimèdia!</string>
+    <string name="toot_select_image_error">S\'ha produït un error en seleccionar el mèdia!</string>
     <string name="toot_delete_media">Vols suprimir aquest mèdia?</string>
-    <string name="toot_error_no_content">El toot és buit!</string>
-    <string name="toot_visibility_tilte">Visibilitat del toot</string>
-    <string name="toots_visibility_tilte">Visibilitat predeterminada dels toots: </string>
-    <string name="toot_sent">S\'ha enviat el toot!</string>
-    <string name="toot_reply_content_title">Estàs responent a aquest toot:</string>
-    <string name="toot_sensitive">Això és contingut sensible?</string>
+    <string name="toot_error_no_content">El bram és buit!</string>
+    <string name="toot_visibility_tilte">Visibilitat del bram</string>
+    <string name="toots_visibility_tilte">Visibilitat predeterminada dels brams: </string>
+    <string name="toot_sent">S\'ha enviat el bram!</string>
+    <string name="toot_reply_content_title">Estàs responent a aquest bram:</string>
+    <string name="toot_sensitive">És contingut sensible?</string>
     <string-array name="toot_visibility">
         <item>Penja\'l a les pissarres públiques</item>
         <item>No el pengis en pissarres públiques</item>
         <item>Penja\'l només per als seguidors</item>
-        <item>Penja\'l només per a usuaris amb mencions</item>
+        <item>Penja\'l només per a usuàries amb mencions</item>
     </string-array>
     <string name="no_draft">No hi ha esborranys!</string>
-    <string name="choose_toot">Escull un toot</string>
+    <string name="choose_toot">Escull un bram</string>
     <string name="choose_accounts">Escull un compte</string>
     <string name="select_accounts">Seleccionar comptes</string>
     <string name="remove_draft">Vols suprimir l\'esborrany?</string>
-    <string name="show_reply">Fes clic al botó per mostrar el toot original</string>
+    <string name="show_reply">Fes clic al botó per mostrar el bram original</string>
     <string name="upload_form_description">Descriu-ho per a disminuïts visuals</string>
     <!-- Instance -->
     <string name="instance_no_description">No hi ha descripció disponible!</string>
@@ -166,54 +183,55 @@
     <string name="about_license">Llicència: </string>
     <string name="about_license_action">GNU GPL V3</string>
     <string name="about_code">Codi font: </string>
-    <string name="about_yandex">Traducció dels toots:</string>
+    <string name="about_yandex">Traducció dels brams:</string>
     <string name="about_thekinrar">Cerca instàncies:</string>
     <string name="thanks_text_logo">Disseny d\'icones:</string>
     <!-- Conversation -->
     <string name="conversation">Conversa</string>
     <!-- Accounts -->
     <string name="no_accounts">No hi ha comptes per mostrar</string>
-    <string name="no_follow_request">No hi ha cap petició de seguiment</string>
-    <string name="status_cnt">Toots \n %1$s</string>
+    <string name="no_follow_request">No hi ha peticions de seguiment</string>
+    <string name="status_cnt">Brams \n %1$s</string>
     <string name="following_cnt">A qui segueixo \n %1$s</string>
-    <string name="followers_cnt">Seguidors \n %1$s</string>
-    <string name="pins_cnt">Fixat \n %d</string>
+    <string name="followers_cnt">Seguidores \n %1$s</string>
+    <string name="pins_cnt">Fixats \n %d</string>
     <string name="authorize">Autoritza</string>
     <string name="reject">Rebutja</string>
     <!-- Scheduled toots -->
-    <string name="no_scheduled_toots">No hi ha toots programats per mostrar!</string>
-    <string name="no_scheduled_toots_indications">Escriu un tot i seleccionar <b>Temporització</b> al menú de dalt.</string>
-    <string name="remove_scheduled">Suprimir tot programat?</string>
+    <string name="no_scheduled_toots">No hi ha brams programats per mostrar!</string>
+    <string name="no_scheduled_toots_indications">Escriu un bram i selecciona <b>Temporització</b> al menú de dalt.</string>
+    <string name="remove_scheduled">Suprimir bram programat?</string>
     <string name="media_count">Mèdia: %d</string>
-    <string name="toot_scheduled">S\'ha guardat la temporització d\'un toot!</string>
+    <string name="toot_scheduled">S\'ha temporitzat el bram!</string>
     <string name="toot_scheduled_date">La data programada ha de ser posterior al moment actual!</string>
     <string name="warning_battery">L\'estalvi de bateria està activat! Això pot no rutllar com està previst.</string>
     <!-- timed mute -->
     <string name="timed_mute_date_error">El silenciament ha de durar més d\'un minut.</string>
     <string name="timed_mute_date">%1$s s\'ha silenciat fins a %2$s.\n Pots desilenciar el compte des de la seva pàgina de perfil.</string>
-    <string name="timed_mute_profile">%1$s està silenciat fins a %2$s.\n Feu clic aquí per desactivar el silenciament.</string>
+    <string name="timed_mute_profile">%1$s està silenciada fins a %2$s.\n Feu clic aquí per desactivar el silenciament.</string>
     <!-- Notifications -->
-    <string name="no_notifications">No hi ha cap notificació per mostrar</string>
-    <string name="notif_mention">et menciona</string>
-    <string name="notif_reblog">ha difós el teu estatus</string>
-    <string name="notif_favourite">ha marcat com a preferit el teu estatus</string>
+    <string name="no_notifications">No hi ha notificacions per mostrar</string>
+    <string name="notif_mention">t\'ha mencionat</string>
+    <string name="notif_reblog">ha difós el teu missatge</string>
+    <string name="notif_favourite">ha marcat com a preferit el teu missatge</string>
     <string name="notif_follow">t\'ha començat a seguir</string>
+    <string name="notif_follow_request">ha demanat de seguir-te</string>
     <plurals name="other_notifications">
         <item quantity="one">i un altra notificació</item>
-        <item quantity="other">i %d altres notificacions</item>
+        <item quantity="other">i %d notificacions més</item>
     </plurals>
     <plurals name="likes">
-        <item quantity="one">%d agradament</item>
-        <item quantity="other">%d agradament</item>
+        <item quantity="one">%d agradaments</item>
+        <item quantity="other">%d agradaments</item>
     </plurals>
-    <string name="delete_notification_ask">Vols suprimir la notificació?</string>
-    <string name="delete_notification_ask_all">Vols suprimir totes les notificacions?</string>
+    <string name="delete_notification_ask">Suprimir una notificació?</string>
+    <string name="delete_notification_ask_all">Suprimir totes les notificacions?</string>
     <string name="delete_notification">La notificació s\'ha suprimit!</string>
     <string name="delete_notification_all">S\'han suprimit totes les notificacions!</string>
     <!-- HEADER -->
-    <string name="following">Seguits</string>
-    <string name="followers">Seguidors</string>
-    <string name="pinned_toots">Fixat</string>
+    <string name="following">Seguides</string>
+    <string name="followers">Seguidores</string>
+    <string name="pinned_toots">Fixats</string>
     <!-- TOAST -->
     <string name="client_error">No s\'ha pogut obtenir la id del client!</string>
     <string name="connect_error">No s\'ha pogut fer connexió al domini de la instància!</string>
@@ -224,14 +242,14 @@
     <string name="toast_unmute">El compte ja no està silenciat!</string>
     <string name="toast_follow">Seguiment del compte confirmat!</string>
     <string name="toast_unfollow">Ja no estàs seguint el compte!</string>
-    <string name="toast_reblog">El toot ha estat difós!</string>
-    <string name="toast_unreblog">El toot ja no està difós!</string>
-    <string name="toast_favourite">S\'ha afegit el toot als teus preferits!</string>
-    <string name="toast_unfavourite">S\'ha eliminat el toot dels teus preferits!</string>
-    <string name="toast_report">S\'ha denunciat el toot!</string>
-    <string name="toast_unstatus">S\'ha suprimit el toot!</string>
-    <string name="toast_pin">S\'ha fixat el toot!</string>
-    <string name="toast_unpin">S\'ha desfixat el toot!</string>
+    <string name="toast_reblog">El bram s\'ha difós!</string>
+    <string name="toast_unreblog">El bram ja no està difós!</string>
+    <string name="toast_favourite">S\'ha afegit el bram als teus preferits!</string>
+    <string name="toast_unfavourite">S\'ha eliminat el bram dels teus preferits!</string>
+    <string name="toast_report">S\'ha denunciat el bram!</string>
+    <string name="toast_unstatus">S\'ha suprimit el bram!</string>
+    <string name="toast_pin">S\'ha fixat el bram!</string>
+    <string name="toast_unpin">S\'ha desfixat el bram!</string>
     <string name="toast_error">Ep! S\'ha produït un error!</string>
     <string name="toast_code_error">Hi ha un error! La instància no ha generat cap codi d\'autorització!</string>
     <string name="toast_error_instance">El domini de la instància no sembla vàlid!</string>
@@ -244,13 +262,13 @@
     <string name="toast_error_translations_disabled">Tens l\'opció de traducció deshabilitada</string>
     <string name="toast_toot_saved">S\'ha desat l\'esborrany!</string>
     <string name="toast_error_char_limit">Estàs segur que aquesta instància permet tants caràcters? El valor usual s\'aproxima a 500 caràcters.</string>
-    <string name="toast_visibility_changed">S\'ha canviat la visibilitat dels toots d\'aquest compte %1$s</string>
+    <string name="toast_visibility_changed">S\'ha canviat la visibilitat dels brams d\'aquest compte %1$s</string>
     <!-- Settings -->
-    <string name="set_toots_page">Nombre de toots per càrrega</string>
+    <string name="set_toots_page">Nombre de brams per càrrega</string>
     <string name="set_attachment_always">Sempre</string>
     <string name="set_attachment_wifi">Wi-Fi</string>
     <string name="set_attachment_ask">Demana</string>
-    <string name="set_attachment_action">Carrega el mèdia</string>
+    <string name="set_attachment_action">Carrega els mèdia... </string>
     <string name="load_attachment">Carrega les imatges</string>
     <string name="load_attachment_spoiler">Mostra\'n més...</string>
     <string name="load_attachment_spoiler_less">Mostra\'n menys...</string>
@@ -258,27 +276,28 @@
     <string name="set_disable_gif">Desactiva els avatars GIF</string>
     <string name="set_folder_title">Camí: </string>
     <string name="set_auto_store_toot">Desa els esborrany automàticament</string>
-    <string name="set_auto_add_media_url">Afegeix als toots els URL dels mèdia</string>
+    <string name="set_auto_add_media_url">Afegeix als brams els URL dels mèdia</string>
     <string name="set_notif_follow">Avisa quan algú et comenci a seguir</string>
-    <string name="set_notif_follow_share">Avisa quan algú difongui el teu estatus</string>
-    <string name="set_notif_follow_add">Avisa quan algú marqui el teu estatus com a preferit</string>
+    <string name="set_notif_follow_share">Avisa quan algú difongui el teu missatge</string>
+    <string name="set_notif_follow_add">Avisa quan algú marqui el teu missatge com a preferit</string>
     <string name="set_notif_follow_mention">Avisa quan algú et mencioni</string>
     <string name="set_notif_follow_poll">Avisar quan una enquesta finalitzi</string>
     <string name="set_share_validation">Demana confirmació abans de difondre</string>
     <string name="set_share_validation_fav">Demana confirmació abans d\'afegir a preferits</string>
-    <string name="set_wifi_only">Enviar avisos només per WIFI</string>
+    <string name="set_wifi_only">Enviar avisos només amb WIFI</string>
     <string name="set_notify">Avisar?</string>
     <string name="set_notif_silent">Notificacions silencioses</string>
     <string name="set_nsfw_timeout">Límit per mostrar material ofensiu (en segons, 0 és desactivat)</string>
+    <string name="set_med_desc_timeout">Temps d\'espera de la descripció dels mèdia (en segons, 0 vol dir desactivat)</string>
     <string name="settings_title_profile">Edita el perfil</string>
     <string name="settings_title_custom_sharing">Personalitza el compartir</string>
     <string name="settings_custom_sharing_url">Personalització del que comparteixo a URL&#8230;</string>
     <string name="set_profile_description">Biografia...</string>
     <string name="set_lock_account">Fes el compte privat</string>
     <string name="set_save_changes">Desa els canvis</string>
-    <string name="set_header_picture_overlay">Escull una foto per l\'encapçalament</string>
+    <string name="set_header_picture_overlay">Escull una foto de capçalera</string>
     <string name="set_fit_preview">Ajusta la previsualització d\'imatges</string>
-    <string name="set_automatically_split_toot">Per sobre de 500 caràcters, separa automàticament els toots de resposta</string>
+    <string name="set_automatically_split_toot">A partir de quants caràcters es divideixen automàticament els brams de resposta:</string>
     <string name="note_no_space">Has assolit el màxim permès de 160 caràcters!</string>
     <string name="username_no_space">Has assolit el màxim permès de 30 caràcters!</string>
     <string name="settings_time_from">Entre</string>
@@ -286,17 +305,12 @@
     <string name="settings_time_greater">Ha d\'haver passat més de %1$s</string>
     <string name="settings_time_lower">Ha d\'haver passat menys de %1$s</string>
     <string name="settings_hour_init">Hora d\'inici</string>
-    <string name="settings_hour_end">Hora d\'acabament</string>
-    <string name="embedded_browser">Utilitzar el navegador predefinit</string>
+    <string name="settings_hour_end">Hora final</string>
+    <string name="embedded_browser">Utilitzar el navegador incorporat</string>
     <string name="custom_tabs">Pestanyes personalitzades</string>
     <string name="use_javascript">Habilita el Javascript</string>
-    <string name="expand_cw">Expandir automàticament el ca</string>
-    <string name="use_cookies">Permetre galetes de tercers</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>No</item>
-    </string-array>
+    <string name="expand_cw">Expandir automàticament el ac</string>
+    <string name="use_cookies">Permetre galetes de terceres</string>
     <string name="your_api_key">Per a Yandex, pots deixar en blanc la clau de l\'API</string>
     <string-array name="settings_theme">
         <item>Fosc</item>
@@ -313,7 +327,7 @@
         <item>Groc</item>
         <item>Blanc</item>
     </string-array>
-    <string name="action_follow">Segueix</string>
+    <string name="action_follow">Seguir</string>
     <string name="action_unblock">Deixa de blocar</string>
     <string name="action_mute">Silencia</string>
     <string name="action_unmute">Deixa de silenciar</string>
@@ -340,8 +354,8 @@ Pots habilitar o deshabilitar les notificacions més endavant als ajustaments (P
     <string name="keywords_hint_custom_sharing">Paraules clau&#8230;</string>
     <!-- ACTIVITY CACHE -->
     <string name="action_sync">Sincronitza</string>
-    <string name="action_filter">Filtre</string>
-    <string name="owner_cached_toots">Els teus toots</string>
+    <string name="action_filter">Filtra</string>
+    <string name="owner_cached_toots">Els teus brams</string>
     <string name="owner_cached_notifications">Les teves notificacions</string>
     <string name="v_public">Públic</string>
     <string name="v_unlisted">No llistats</string>
@@ -350,10 +364,10 @@ Pots habilitar o deshabilitar les notificacions més endavant als ajustaments (P
     <string name="v_keywords">Algunes paraules clau…</string>
     <string name="show_media">Mostra els mèdia</string>
     <string name="show_pinned">Mostra els fixats</string>
-    <string name="filter_no_result">No s`han trobat textos coincidents!</string>
-    <string name="data_backup_toots">Còpia de seguretat dels toots per %1$s</string>
-    <string name="data_backup_success">S\'han importat %1$s toots nous</string>
-    <string name="data_backup_notification_success">%1$s notificacions noves s\'han importat</string>
+    <string name="filter_no_result">No s\'han trobat resultats!</string>
+    <string name="data_backup_toots">Còpia de seguretat dels brams per %1$s</string>
+    <string name="data_backup_success">S\'han importat %1$s brams nous</string>
+    <string name="data_backup_notification_success">%1$s s\'han importat noves notificacions</string>
     <string-array name="filter_order">
         <item>Dates en ordre descendent</item>
         <item>Dates en ordre ascendent</item>
@@ -363,25 +377,25 @@ Pots habilitar o deshabilitar les notificacions més endavant als ajustaments (P
         <item>Només</item>
         <item>Tots dos</item>
     </string-array>
-    <string name="owner_cached_toots_empty">No s\'han trobat toots a la base de dades. Sisplau, feu ús del botó de sincronitzar del menú per recobrar-los.</string>
+    <string name="owner_cached_toots_empty">No s\'han trobat brams a la base de dades. Sisplau, pitgeu el botó de sincronitzar al menú per recobrar-los.</string>
     <!-- PRIVACY -->
     <string name="privacy_data_title">Dades gravades</string>
     <string name="privacy_data">Només es guarda al dispositiu la informació bàsica dels comptes.
 Aquestes dades són estrictament confidencials i només les pot usar l\'aplicació.
 Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
-&#9888; Els noms d\'usuari i contrasenyes no s\'emmagatzemen mai. Només s\'utilitzen durant una autentificació segura (SSL) en una instància.    </string>
+&#9888; Els noms d\'usuària i contrasenyes no s\'emmagatzemen mai. Només s\'utilitzen durant una autentificació segura (SSL) en una instància.    </string>
     <string name="privacy_authorizations_title">Permisos:</string>
     <string name="privacy_authorizations">- <b>ESTAT_ACCES_XARXA</b>: Usat per detectar si el dispositiu està connectat a una xarxa WIFI.\n
          - <b>INTERNET</b>: Usat per a requeriments a una instància.\n
          - <b>ESCRIURE_MAGATZEM_EXTERN</b>: Usat per emmagatzemar mèdia o moure l\'app a una tarja SD.\n
          - <b>LLEGIR_MAGATZEM_EXTERN</b>: Usat per afegir mèdia als toots.\n
-         - <b>BOOT_COMPLET</b>: Usat per iniciar el servei de notificació.\n
-         - <b>DESPERTA_BLOCATGE</b>: Usat durant el servei de notificació.    </string>
+         - <b>BOOT_COMPLET</b>: Usat per iniciar el servei de notificacions.\n
+         - <b>DESPERTA_BLOCATGE</b>: Usat durant el servei de notificacions.    </string>
     <string name="privacy_API_authorizations_title">Permisos d\'API:</string>
     <string name="privacy_API_authorizations">        - <b>Lectura</b>: Lectura de dades.\n
-        - <b>Escriptura</b>: Defineix els estatus i carrega mèdia per a estatus.\n
+        - <b>Escriptura</b>: Publica missatges  i carrega mèdia per a missatges.\n
         - <b>Seguiments</b>: segueix, desegueix, bloca, desbloca.\n\n
-        <b>&#9888; Aquestes accions es realitzen només a petició de l\'usuari.</b>
+        <b>&#9888; Aquestes accions es realitzen només a petició de la usuària.</b>
     </string>
     <string name="privacy_API_title">Rastreig i llibreries</string>
     <string name="privacy_API">        L\' aplicació <b>no fa ús d\'eines de rastreig</b> (mesures d\'audiència, informes d\'errors, etc.) i no conté publicitat.\n\n
@@ -390,8 +404,8 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
         - <b>Tasques-Android</b>: Per gestionar serveis\n
         - <b>FotoVista</b>: Per gestionar imatges\n
     </string>
-    <string name="privacy_API_yandex_title">Traducció dels toots</string>
-    <string name="privacy_API_yandex_authorizations">        L\'aplicació permet la traducció de toots a través de la configuració regional del dispositiu i l\'API Yandex.\n
+    <string name="privacy_API_yandex_title">Traducció dels brams</string>
+    <string name="privacy_API_yandex_authorizations">        L\'aplicació permet la traducció de bramss a través de la configuració regional del dispositiu i l\'API Yandex.\n
         Yandex té la seva pròpia política de privacitat, disponible aquí: https://yandex.ru/legal/confidential/?lang=en
     </string>
     <string name="thanks_text_dev">        Agraïments:
@@ -399,12 +413,12 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="filter_regex">Filtratge mitjançant expressions regulars</string>
     <string name="search">Cerca</string>
     <string name="delete">Suprimeix</string>
-    <string name="fetch_more_toots">Arreplega més toots…</string>
+    <string name="fetch_more_toots">Arreplega més brams…</string>
     <!-- About lists -->
     <string name="action_lists">Llistes</string>
     <string name="action_lists_confirm_delete">Segur que vols suprimir permanentment la llista?</string>
-    <string name="action_lists_empty_content">No hi ha encara res a la llista. Quan els membres de la llista pengin nous estatus, apareixeran aquí.</string>
-    <string name="action_lists_add_to">Afegeix a una llista</string>
+    <string name="action_lists_empty_content">No hi ha encara res a la llista. Quan els membres de la llista pengin nous missatges, apareixeran aquí.</string>
+    <string name="action_lists_add_to">Afegeix a la llista</string>
     <string name="action_lists_create">Afegeix una llista</string>
     <string name="action_lists_delete">Suprimeix la llista</string>
     <string name="action_lists_update">Edita la llista</string>
@@ -416,12 +430,12 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="issue_login_title">L\'autenticació falla?</string>
     <string name="issue_login_message">        <b>Aquí hi ha algunes comprovacions potencialment útils:</b>\n\n         
 - Comprova que no hi hagi errors de picatge en el nom de la instància\n\n         - Comprova que no tinguis la instància inactiva\n\n         - Si tens l\'autenticació de dos factors (2FA), prova l\'enllaç de la part inferior  (després d\'entrar el nom de la instància)\n\n         - L\'enllaç el pots fer servir encara que no tinguis la 2FA\n\n         - Si encara no rutlla, sisplau obre fil del Framagit a https://framagit.org/tom79/fedilab/issues    </string>
-    <string name="media_ready">S\'ha carregat el mèdia. Clica aquí per mostrar-lo.</string>
+    <string name="media_ready">S\'ha carregat el mèdia. Toca aquí per mostrar-lo.</string>
     <string name="data_export_start">Aquesta acció pot durar temps. Rebràs un avís quan estigui enllestida.</string>
     <string name="data_export_running">Segueix processant, espereu sisplau…</string>
     <string name="data_export">Exporta missatges</string>
     <string name="data_export_toots">Exporta els missatges de %1$s</string>
-    <string name="data_export_success">S\'han exportat %1$s toots d\'un total de %2$s.</string>
+    <string name="data_export_success">S\'han exportat %1$s brams d\'un total de %2$s.</string>
     <string name="data_export_error">Ha fallat alguna cosa durant l\'exportació de dades de %1$s</string>
     <string name="data_export_error_simple">Ha fallat alguna cosa mentre s\'exportaven dades!</string>
     <string name="data_import_error_simple">Ha fallat alguna cosa mentre s\'importaven dades!</string>
@@ -432,7 +446,7 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="poxy_port">Port</string>
     <string name="poxy_login">Iniciar Sessió</string>
     <string name="poxy_password">Contrasenya</string>
-    <string name="set_share_details">Inclou detalls del toot en compartir-lo</string>
+    <string name="set_share_details">Inclou detalls del bram en compartir-lo</string>
     <string name="support_the_app_on_liberapay">Dona suport a l\'App al Liberapay</string>
     <string name="alert_regex">Hi ha un error en l\'expressió regular!</string>
     <string name="toast_instance_unavailable">En aquesta instància no hi hem trobat pissarres!</string>
@@ -441,7 +455,7 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="follow_instance">Segueix la instància</string>
     <string name="toast_instance_already_added">Ja estàs seguint aquesta instància!</string>
     <string name="toast_instance_followed">Confirmat, ja segueixes la instància!</string>
-    <string name="action_partnership">Socis</string>
+    <string name="action_partnership">Sòcies</string>
     <string name="neutral_menu_information">Informació</string>
     <string name="hide_boost">Amaga les difusions de %s</string>
     <string name="endorse">Incloure al perfil</string>
@@ -451,7 +465,7 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="toast_unendorse">El compte ja no s\'inclou al perfil</string>
     <string name="toast_show_boost">Les difusions estan visibles!</string>
     <string name="toast_hide_boost">Les difusions estan amagades!</string>
-    <string name="direct_message">Missatge directe</string>
+    <string name="direct_message">Missatges directes</string>
     <string name="filters">Filtres</string>
     <string name="action_filters_empty_content">No hi ha filtres per mostrar. En podeu crear fent clic al botó \"+\".</string>
     <string name="filter_keyword">Frase o paraula clau</string>
@@ -459,9 +473,9 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="context_public">Pissarres públiques</string>
     <string name="context_notification">Notificacions</string>
     <string name="context_conversation">Converses</string>
-    <string name="filter_keyword_explanations">S\'associaran a textos dels toots encara que vagin en cursiva o negreta o associats a alertes de contingut</string>
+    <string name="filter_keyword_explanations">Es detectaran independentment de les majúscules dins el text o avís de contingut d\'un bram</string>
     <string name="context_drop">Descarta enlloc d\'amagar</string>
-    <string name="context_drop_explanations">Els toots filtrats desapareixeran del tot, encara que després s\'elimini el filtre</string>
+    <string name="context_drop_explanations">Els brams filtrats desapareixeran del tot, encara que després s\'elimini el filtre</string>
     <string name="context_whole_word_explanations">Quan les frases o les paraules clau siguin alfanumèriques, només s\'aplicaran a les coincidències de mots sencers</string>
     <string name="context_whole_word">Mot sencer</string>
     <string name="filter_context">Contexts de filtre</string>
@@ -474,83 +488,83 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="action_who_to_follow_empty_content">No hi ha comptes llistats de moment!</string>
     <string name="follow_account">Segueix</string>
     <string name="select_all">Seleccionar-ho tot</string>
-    <string name="unselect_all">Seleccionar-ho tot</string>
+    <string name="unselect_all">Deseleccionar-ho tot</string>
     <string name="follow_trunk">%s és seguit!</string>
     <string name="create_list_trunk">La llista s\'està creant %s</string>
     <string name="add_account_list_trunk">Afegint comptes a la llista</string>
     <string name="account_added_list_trunk">S\'han afegit els comptes a la llista</string>
     <string name="adding_account_list_trunk">Afegint comptes a la llista</string>
-    <string name="action_list_add">No has creat cap llista encara. Clica el botó \"+\" per afegir-ne una.</string>
+    <string name="action_list_add">No has creat cap llista encara. Clica el botó \"+\" per afegir-n\'hi una.</string>
     <string name="about_trunk">A qui seguir</string>
     <string name="about_trunk_action">API troncal</string>
     <string name="toast_impossible_to_follow">No es pot seguir el(s) compte(s)</string>
     <string name="retrieve_remote_account">Arreplegant compte remot</string>
     <string name="expand_image">Expandeix automàticament els mèdia amagats</string>
-    <string name="channel_notif_follow">Nou seguidor</string>
+    <string name="channel_notif_follow">Nou seguiment</string>
     <string name="channel_notif_boost">Nova difusió</string>
     <string name="channel_notif_fav">Nou preferit</string>
     <string name="channel_notif_mention">Nova menció</string>
     <string name="channel_notif_poll">Enquesta finalitzada</string>
-    <string name="channel_notif_toot">Toot nou</string>
-    <string name="channel_notif_backup">Còpia de seguretat de toots</string>
+    <string name="channel_notif_toot">Bram nou</string>
+    <string name="channel_notif_backup">Còpia de seguretat de brams</string>
     <string name="channel_notif_media">Baixada de mèdia</string>
     <string name="set_notif_sound">Canvi del so d\'avís</string>
     <string name="select_sound">Selecciona el so</string>
     <string name="set_enable_time_slot">Activa interval de temps</string>
-    <string name="how_to_videos">Indicacions per als Vídeos</string>
+    <string name="how_to_videos">Tutorials en vídeo</string>
     <string name="retrieve_remote_conversation">Arreplegant el fil remot!</string>
     <string name="no_blocked_domain">No hi ha dominis blocats!</string>
     <string name="unblock_domain_confirm">Desbloca el domini</string>
     <string name="unblock_domain_confirm_message">Segur que vols desblocar %s?</string>
-    <string name="block_domain_confirm_message">Segur que vols blocar %s\n\nJa no veuràs cap contingut del domini en cap pissarra pública ni en les notificacions. S\'eliminaran els teus seguidors provinents del domini.</string>
+    <string name="block_domain_confirm_message">Segur que vols blocar %s?\n\nJa no veuràs cap contingut del domini en cap pissarra pública ni en les notificacions. S\'eliminaran els teus seguidors provinents del domini.</string>
     <string name="blocked_domains">Dominis blocats</string>
     <string name="block_domain">Bloca el domini</string>
     <string name="toast_block_domain">El domini està blocat</string>
     <string name="toast_unblock_domain">El domini ja no està blocat!</string>
-    <string name="retrieve_remote_status">Arreplegant l\'estatus remot</string>
+    <string name="retrieve_remote_status">Arreplegant missatge remot</string>
     <string name="comment">Comentari</string>
-    <string name="peertube_instance">Instància de Peertube</string>
+    <string name="peertube_instance">Instància de Paertub</string>
     <string name="no_comments">Estrena els comentaris a aquest vídeo amb el botó de dalt a la dreta!</string>
     <string name="number_view_video">%s visites</string>
     <string name="duration_video">Durada: %s</string>
     <string name="add_remote_instance">Afegeix-hi una instància</string>
     <string name="comment_no_allowed_peertube">Aquest vídeo no acull comentaris!</string>
-    <string name="pickup_resolution">Tria una solució</string>
-    <string name="peertube_favorites">Favorits de Peertube</string>
+    <string name="pickup_resolution">Tria una resolució</string>
+    <string name="peertube_favorites">Preferits del Paertub</string>
     <string name="bookmark_add_peertube">S\'ha afegit el vídeo als marcadors!</string>
-    <string name="bookmark_remove_peertube">S\'ha eliminat el vídeo d\'entre els marcadors!</string>
-    <string name="bookmark_peertube_empty">No tens vídeos de Peertube als preferits!</string>
+    <string name="bookmark_remove_peertube">S\'ha eliminat el vídeo dels marcadors!</string>
+    <string name="bookmark_peertube_empty">No tens vídeos de Paertub als preferits!</string>
     <string name="channel">Canal</string>
     <string name="videos">Vídeos</string>
     <string name="channels">Canals</string>
     <string name="set_display_emoji">Fer ús d\' Emoji One</string>
     <string name="information">Informació</string>
-    <string name="set_display_card">Mostra la vista preliminar de tots els toots</string>
+    <string name="set_display_card">Mostra la vista preliminar de tots els brams</string>
     <string name="thanks_text_ux">Nou dissenyador UX/UI</string>
     <string name="set_display_video_preview">Mostrar les vistes preliminars dels vídeos</string>
     <string name="account_id_clipbloard">S\'ha copiat la id del compte al portapapers!</string>
     <string name="set_change_locale">Canvi d\'idioma</string>
     <string name="default_language">Idioma per defecte</string>
-    <string name="truncate_long_toots">Truncar els toots llargs</string>
-    <string name="set_truncate_toot">Truncar els toots per sobre de les \'x\' línies. El zero vol dir inactiu.</string>
-    <string name="display_toot_truncate">Mostra més</string>
-    <string name="hide_toot_truncate">Mostra menys</string>
+    <string name="truncate_long_toots">Truncar els brams llargs</string>
+    <string name="set_truncate_toot">Truncar els brams per sobre de les \'x\' línies. El zero vol dir inactiu.</string>
+    <string name="display_toot_truncate">Mostra\'n més</string>
+    <string name="hide_toot_truncate">Mostra\'n menys</string>
     <string name="manage_tags">Gestionar etiquetes</string>
     <string name="tags_already_stored">L\'etiqueta ja existeix!</string>
     <string name="tags_stored">L\'etiqueta s\'ha guardat!</string>
     <string name="tags_renamed">S\'ha canviat l\'etiqueta!</string>
     <string name="tags_deleted">S\'ha eliminat l\'etiqueta!</string>
-    <string name="schedule_boost">Temporalitza difusió</string>
-    <string name="boost_scheduled">Aquesta difusió s\'ha temporalitzat!</string>
-    <string name="no_scheduled_boosts">No hi ha temporalitzacions de difusió per mostrar!</string>
-    <string name="no_scheduled_boosts_indications"><![CDATA[Obre el menú d\'un toot i selecciona <b>Temporalitza la difusió</b>.]]></string>
-    <string name="art_menu">Pissarra de l\'art</string>
+    <string name="schedule_boost">Temporitza difusió</string>
+    <string name="boost_scheduled">Aquesta difusió s\'ha temporitzat!</string>
+    <string name="no_scheduled_boosts">No hi ha temporitzacions de difusió per mostrar!</string>
+    <string name="no_scheduled_boosts_indications">Obre el menú d\'un bram i selecciona <b>Temporitza la difusió</b></string>
+    <string name="art_menu">Pissarra d\'art</string>
     <string name="open_menu">Obrir menú</string>
     <string name="go_back">Torna</string>
     <string name="app_logo">Logo de l\'aplicació</string>
     <string name="profile_picture">Foto de perfil</string>
     <string name="profile_banner">Bànner de perfil</string>
-    <string name="contact_instance_admin">Contacteu l\'administrador de la instància</string>
+    <string name="contact_instance_admin">Contacta l\'administradora de la instància</string>
     <string name="add_new">Afegir nou</string>
     <string name="mastohost_logo">Logo del MastoServidor</string>
     <string name="emoji_picker">Tria d\'emojis</string>
@@ -560,11 +574,11 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="delete_domain">Esborra el domini blocat</string>
     <string name="custom_emoji_picker">Personalització de la tria d\'emojis</string>
     <string name="play_video">Reproduir vídeo</string>
-    <string name="new_toot">Toot nou</string>
+    <string name="new_toot">Bram nou</string>
     <string name="card_view_image">Imatge de la targeta</string>
     <string name="hide_media">Amaga els mèdia</string>
     <string name="favicon">Icona de preferits</string>
-    <string name="media_description">Mèdia per afegir una descripció</string>
+    <string name="media_description">Afegir descripció del mèdia (per a disminuïdes visuals)</string>
     <string-array name="filter_expire">
         <item>Mai</item>
         <item>30 minuts</item>
@@ -583,16 +597,16 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="languages">Idiomes</string>
     <string name="show_media_only">Només mèdia</string>
     <string name="show_media_nsfw">Mostra contingut sensible</string>
-    <string name="crowdin_translations">Traduccions crowdin</string>
-    <string name="crowdin_manager">Director de crowdin</string>
+    <string name="crowdin_translations">Traduccions Crowdin</string>
+    <string name="crowdin_manager">Gestor de Crowdin</string>
     <string name="translation_app">Traducció de l\'aplicació</string>
     <string name="about_crowdin">Sobre Crowdin</string>
     <string name="bot">Bot</string>
     <string name="pixelfed_instance">Instància Pixelfed</string>
-    <string name="mastodon_instance">Instància de mastodont</string>
-    <string name="any_tags">Qualsevol d\'aquests</string>
-    <string name="all_tags">Tots aquests</string>
-    <string name="none_tags">Cap d\'aquests</string>
+    <string name="mastodon_instance">Instància de Mastodont</string>
+    <string name="any_tags">Qualsevol d\'aquestes</string>
+    <string name="all_tags">Totes aquestes</string>
+    <string name="none_tags">Cap d\'aquestes</string>
     <string name="some_words_any">Qualsevol d\'aquestes paraules (separades-per-espais)</string>
     <string name="some_words_all">Totes aquestes paraules (separades-per-espais)</string>
     <string name="some_tags">Afegir paraules al filtre (separades per espais)</string>
@@ -600,7 +614,7 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="misskey_instance">Instància Misskey</string>
     <string name="toast_no_apps">No tens instal·lada cap app que gestioni aquest tipus d\'enllaç.</string>
     <string name="subscriptions">Subscripcions</string>
-    <string name="overview">Resum</string>
+    <string name="overview">Visió general</string>
     <string name="trending">Tendències</string>
     <string name="recently_added">Afegits recentment</string>
     <string name="local">Local</string>
@@ -610,7 +624,7 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="delete_comment_confirm">Estàs segur d\'esborrar aquest comentari?</string>
     <string name="fullscreen">Vídeo a pantalla completa</string>
     <string name="set_video_mode">Mode per a vídeos</string>
-    <string name="file_to_upload">Seleccioneu el document per carregar</string>
+    <string name="file_to_upload">Seleccioneu el document per pujar</string>
     <string name="my_videos">Els meus vídeos</string>
     <string name="title">Títol</string>
     <string name="license">Llicència</string>
@@ -621,9 +635,9 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="update_video">Actualitza el vídeo</string>
     <string name="description">Descripció</string>
     <string name="toast_peertube_video_updated">S\'ha actualitzat el vídeo!</string>
-    <string name="toast_cancelled">S\'ha cancel·lat la càrrega!</string>
-    <string name="upload_video_success">S\'ha carregat el vídeo!</string>
-    <string name="uploading">Carregant, espera sisplau…</string>
+    <string name="toast_cancelled">S\'ha cancel·lat la pujada!</string>
+    <string name="upload_video_success">S\'ha pujat el vídeo!</string>
+    <string name="uploading">S\'està pujant, espera sisplau…</string>
     <string name="video_uploaded_action">Feu clic aquí per editar les dades de vídeo.</string>
     <string name="delete_video">Eliminar vídeo</string>
     <string name="delete_video_confirmation">Segur que vols suprimir aquest vídeo?</string>
@@ -634,10 +648,10 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="choose_schedule">Tria un mode de temporització</string>
     <string name="device_schedule">Des del dispositiu</string>
     <string name="server_schedule">Des del servidor</string>
-    <string name="toots_server">Toots (servidor)</string>
-    <string name="toots_client">Toots (al meu dispositiu)</string>
+    <string name="toots_server">Brams (servidor)</string>
+    <string name="toots_client">Brams (al meu dispositiu)</string>
     <string name="modify">Modifica</string>
-    <string name="set_display_content_after_fetch_more">Mostra nous toots per damunt del botó \"Arreplegar-ne més\"</string>
+    <string name="set_display_content_after_fetch_more">Mostra nous brams per damunt del botó \"Arreplegar-ne més\"</string>
     <string name="settings_category_label_timelines">Pissarres</string>
     <string name="settings_category_label_interface">Interfícies</string>
     <string name="contact">Contactes</string>
@@ -662,15 +676,15 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="action_markdown">Assenyala</string>
     <string name="action_logout_account">Sortir de la sessió</string>
     <string name="all">Tot</string>
-    <string name="about_opencollective">Dona suport a l\'app</string>
+    <string name="about_opencollective">Fes un donatiu a l\'app</string>
     <string name="more_about_opencollective">Open Collective facilita a grups de crear ràpidament un col·lectiu, recollir diners i gestionar-los amb transparència.</string>
     <string name="copy_link">Copia l\'enllaç</string>
     <string name="connect_instance">Connectar</string>
-    <string name="set_normal">Nomal</string>
+    <string name="set_normal">Normal</string>
     <string name="set_compact">Compactar</string>
     <string name="set_console">Consola</string>
     <string name="set_mode">Tria mode de presentació</string>
-    <string name="set_security_provider">Pedaços de seguretat</string>
+    <string name="set_security_provider">Proveïdora de pedaços de seguretat</string>
     <string name="update_tracking_domains">Actualitzar el rastreig de dominis</string>
     <string name="tracking_db_updated">S\'ha actualitzat la base de dades de rastreig!</string>
     <string name="calls_blocked">trucades http blocades per l\'aplicació</string>
@@ -690,7 +704,7 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="poll_choice_2">Opció 2</string>
     <string name="poll_choice_s">Opció %d</string>
     <string name="poll_invalid_choices">Per a una enquesta, cal que hi hagi almenys dues opcions!</string>
-    <string name="done">Fet</string>
+    <string name="done">Enllestit</string>
     <string name="poll_finish_at">acaba a %s</string>
     <string name="refresh_poll">Actualitza l\'enquesta</string>
     <string name="vote">Vota</string>
@@ -701,19 +715,19 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="settings_category_notif_time_slot">Franja horària</string>
     <string name="settings_category_notif_advanced">Avançat</string>
     <string name="set_display_new_badge">Mostra el senyal \'nou\' en brams no llegits</string>
-    <string name="peertube_menu">Canal de paers</string>
+    <string name="peertube_menu">Paertub</string>
     <string name="move_timeline">Mou la pissarra</string>
-    <string name="hide_timeline">Amaga el cronograma</string>
-    <string name="reorder_timelines">Reordenar els cronogrames</string>
+    <string name="hide_timeline">Amaga la pissarra</string>
+    <string name="reorder_timelines">Reordenar pissarres</string>
     <string name="reorder_list_deleted">Llista eliminada definitivament</string>
     <string name="reorder_instance_removed">La instància s\'ha deixat de seguir</string>
     <string name="reorder_tag_removed">L\'etiqueta ja no està fixada</string>
     <string name="undo">Desfés</string>
     <string name="visible_tabs_needed">Cal que restin visibles dues pestanyes!</string>
-    <string name="action_reorder_timeline">Reordenar les pissarres</string>
+    <string name="action_reorder_timeline">Reordenar pissarres</string>
     <string name="warning_main_timeline">Les pissarres principals només es poden amagar!</string>
     <string name="action_bbcode">Codi-BB</string>
-    <string name="set_sensitive_content">Tots els mèdia són material sensible</string>
+    <string name="set_sensitive_content">Marcar tots els mèdia com a material sensible</string>
     <string name="gnu_instance">Instància de GNU</string>
     <string name="cached_status">Estatus en memòria cau</string>
     <string name="set_forward_tags">Incloure etiquetes a les respostes</string>
@@ -736,7 +750,7 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="gallery">Galeria</string>
     <string name="label_emoji">Emoticones</string>
     <string name="label_sticker">Enganxina</string>
-    <string name="label_eraser">Goma d\'esborrar</string>
+    <string name="label_eraser">Esborrador</string>
     <string name="label_text">Text</string>
     <string name="label_filter">Filtre</string>
     <string name="label_brush">Pinzell</string>
@@ -757,14 +771,14 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="timed_mute">Silenciament programat</string>
     <string name="mention_account">Esmenta el compte</string>
     <string name="refresh_cache">Refrescar la memòria cau</string>
-    <string name="mention_status">Esmenta l\'estatus</string>
+    <string name="mention_status">Esmenta el missatge</string>
     <string name="action_news">Notícies</string>
     <string name="category_general">General</string>
     <string name="category_regional">Regional</string>
     <string name="category_art">Art</string>
     <string name="category_journalism">Periodisme</string>
     <string name="category_activism">Activisme</string>
-    <string name="category_games">Jocs multimèdia</string>
+    <string name="category_games">Jocs</string>
     <string name="category_tech">Tecnologia</string>
     <string name="category_adult">Contingut per a adults</string>
     <string name="category_furry">Peluts</string>
@@ -774,34 +788,32 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="join_mastodon">Uneix-te a Mastodont</string>
     <string name="pickup_instance_category">Tria una instància mitjançant una categoria, i després clica un botó de comprovació.</string>
     <string name="pickup_instance_peertube">Per triar instància, activa el quadret corresponent.</string>
-    <string name="users">%1$s usuaris</string>
+    <string name="users">%1$s usuàries</string>
     <string name="password_confirm">Confirma contrasenya</string>
     <string name="agreement_check">Estic d\'acord amb %1$s i %2$s</string>
     <string name="server_rules">normes del servidor</string>
     <string name="tos">condicions del servei</string>
-    <string name="sign_up">Registra\'t</string>
-    <string name="validation_needed">Aquesta instància va per invitació. Caldrà que un administrador aprovi el teu compte manualment abans de poder-lo usar.</string>
+    <string name="sign_up">Inscriu-te</string>
+    <string name="validation_needed">Aquesta instància va per invitació. Caldrà que una administradora aprovi el teu compte manualment abans de poder-lo usar.</string>
     <string name="all_field_filled">Cal que ompliu tots els camps!</string>
     <string name="password_error">Les contrasenyes no coincideixen!</string>
     <string name="email_error">El correu electrònic no sembla ser vàlid!</string>
-    <string name="username_indicator">El teu nom d\'usuari serà únic a %1$s</string>
+    <string name="username_indicator">El teu nom d\'usuària serà únic a %1$s</string>
     <string name="email_indicator">Se t\'enviarà un correu de confirmació</string>
     <string name="password_indicator">Cal un mínim de 8 caràcters</string>
     <string name="password_too_short">La contrasenya hauria de tenir almenys 8 caràcters</string>
-    <string name="username_error">El nom d\'usuari només pot contenir lletres, números i guions baixos</string>
+    <string name="username_error">El nom d\'usuària només pot contenir lletres, números i guions baixos</string>
     <string name="account_created">Compte creat!</string>
-    <string name="account_created_message">        El vostre compte ja s\'ha creat!\n\n
-        Pensa de validar el correu electrònic dins les properes 48 hores.\n\n
-        Ara ja pots connectar el teu compte escrivint <b>%1$s</b> en el primer camp i fent clic a <b>Connectar</b>.\n\n
-        <b>Important</b>: Si la teva instància requereix validació, rebràs un correu electrònic un cop validat!
-    </string>
+    <string name="account_created_message">Ja s\'ha creat el teu compte ja s\'ha!\n\n
+Pensa de validar el correu electrònic dins les properes 48 hores.\n\n
+Ara ja pots connectar-te al compte escrivint <b>%1$s</b> en el primer camp i fent clic a <b>Connectar</b>.\n\n <b>Important</b>: Si la teva instància requereix validació, rebràs un correu electrònic un cop validada!    </string>
     <string name="save_draft">Desar el missatge entre els esborranys?</string>
     <string name="administration">Administració</string>
     <string name="reports">Informes</string>
     <string name="no_reports">No hi ha informes per mostrar!</string>
     <string name="reconnect_account">Reconnectar el compte</string>
-    <string name="reconnect_account_message">L\'aplicació no ha pogut accedir a les característiques d\'administrador. Pot ser que calgui reconnectar amb el compte per tenir totes les funcions.</string>
-    <string name="unresolved">No està resolt</string>
+    <string name="reconnect_account_message">L\'aplicació no ha pogut accedir a les característiques d\'administradora. Pot ser que calgui reconnectar amb el compte per tenir totes les funcions.</string>
+    <string name="unresolved">No s\'ha resolt</string>
     <string name="remote">Remot</string>
     <string name="active">Actiu</string>
     <string name="pending">Pendent</string>
@@ -816,15 +828,15 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="warn">Advertir</string>
     <string name="disable">Deshabilita</string>
     <string name="silence">Silenciar</string>
-    <string name="email_user">Notificar usuari per correu-e</string>
+    <string name="email_user">Notificar usuària per correu-e</string>
     <string name="custom_warning">Advertiment personalitzat</string>
-    <string name="user">Usuari</string>
-    <string name="moderator">Moderador</string>
-    <string name="administrator">Administrador</string>
+    <string name="user">Usuària</string>
+    <string name="moderator">Moderadora</string>
+    <string name="administrator">Administradora</string>
     <string name="confirmed">Confirmat</string>
     <string name="unconfirmed">No confirmat</string>
-    <string name="list_reported_statuses">Estats informats</string>
-    <string name="account">Compte d\'usuari</string>
+    <string name="list_reported_statuses">Missatges denunciats</string>
+    <string name="account">Compte d\'usuària</string>
     <string name="unsilence">Desactivar silenciador</string>
     <string name="undisable">Desfer desactivar</string>
     <string name="suspend">Suspendre</string>
@@ -832,41 +844,41 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="account_silenced">El compte està silenciat!</string>
     <string name="account_unsilenced">El compte ja no està silenciat!</string>
     <string name="account_suspended">Aquest compte està suspès!</string>
-    <string name="account_unsuspended">El compte ja no està silenciat!</string>
+    <string name="account_unsuspended">El compte ja no està suspès!</string>
     <string name="account_disabled">El compte està desactivat!</string>
     <string name="account_undisabled">El compte ja no està desactivat!</string>
     <string name="account_warned">El compte té un advertiment!</string>
-    <string name="set_display_admin_menu">Mostrar el menú d\'administració</string>
-    <string name="set_display_admin_toot">Mostra la característica d\'administració en els estats</string>
+    <string name="set_display_admin_menu">Mostrar el menú d\'administradora</string>
+    <string name="set_display_admin_toot">Mostra la característica d\'administradora en els missatges</string>
     <string name="allow">Permet</string>
     <string name="account_approved">El compte està aprovat!</string>
     <string name="account_rejected">El compte ha estat rebutjat!</string>
     <string name="assign_to_me">Assigna-m\'ho a mi</string>
-    <string name="unassign">Desasigna</string>
+    <string name="unassign">Desassigna</string>
     <string name="mark_resolved">Marca com a resolt</string>
-    <string name="mark_unresolved">Marcar com a no resolt</string>
+    <string name="mark_unresolved">Marca com a no resolt</string>
     <string name="toast_empty_content">Buida el contingut!</string>
     <string name="set_display_fedilab_features_button">Mostrar el botó de funcionalitats de Fedilab</string>
     <string name="audio">A l\'aplicació li cal accedir a la gravadora d\'àudio</string>
     <string name="voice_message">Missatge de veu</string>
     <string name="set_quick_reply">Activa resposta ràpida</string>
     <string name="reply_might_be_useless">El compte a qui respons pot ser que no pugui veure el teu missatge!</string>
-    <string name="set_remember_position_indication">Quan està desactivat, l\'app carrega sempre els últims estats</string>
+    <string name="set_remember_position_indication">Quan està desactivada, l\'app carrega sempre els últims missatges</string>
     <string name="set_blur_sensitive_indication">Quan està desactivat, els mèdia senzills resten amagats amb un botó</string>
     <string name="set_long_press_media_indication">Guarda els mèdia a mida completa pitjant les previsualitzacions durant un segon</string>
-    <string name="set_display_timeline_in_list_indication">Afegeix un botó el·lipse a dalt a la dreta per llistar totes les etiquetes/instàncies/llistes</string>
-    <string name="live_notif_indication">Mantenir connexió oberta a l\'API de streaming per a rebre notificacions contínuament.</string>
+    <string name="set_display_timeline_in_list_indication">Afegeix un botó el·líptic a dalt a la dreta per llistar totes les etiquetes/instàncies/llistes</string>
+    <string name="live_notif_indication">Mantenir connexió oberta a l\'API de streaming per a rebre notificacions m directe.</string>
     <string name="set_enable_time_slot_indication">Dins el període definit, l\'app enviarà notificacions. Pots revertir (p. e. silenciar) aquest període amb el spinner adequat.</string>
     <string name="set_display_fedilab_features_button_indication">Mostrar un botó de Fedilab sota la imatge de perfil. És una drecera per accedir a funcions de l\'app.</string>
     <string name="set_quick_reply_indication">Permet de respondre directament dins les pissarres sota les infos d\'estat</string>
     <string name="set_fit_preview_indication">Les previsualitzacions de les pissarres no es retallaran</string>
     <string name="set_display_video_preview_indication">Permet reproduir vídeos incrustats dins les pissarres</string>
-    <string name="set_display_content_after_fetch_more_indication">Permet de revertir la forma de llegir els estats que es mostren al clicar el botó de veure més</string>
+    <string name="set_display_content_after_fetch_more_indication">Permet de revertir la forma de llegir els missatges que es mostren al clicar el botó de veure més</string>
     <string name="set_security_provider_indication">Aquesta opció permet donar suport als recursos de xifratge més recents. És últil per als dispositius Android més antics o per si no et pots connectar a la teva instància.</string>
-    <string name="set_video_mode_indication">Exclusivament per a vídeos de Peertube. Canvia el mode en cas de què nos els puguis llegir.</string>
-    <string name="featured_hashtags_indication">Aquestes etiquetes permetran de filtrar els estatus dels perfils. Hauràs de fer servir el menú conceptual per veure\'ls.</string>
-    <string name="set_capitalize_indication">Inserir automàticament un salt de línia després de la menció de primera lletra en majúscula</string>
-    <string name="settings_title_custom_sharing_indication">Permet als creadors de continguts de compartir estatus en els seus RSS</string>
+    <string name="set_video_mode_indication">Exclusivament per a vídeos de Paertub. Canvia el mode en cas de què no els puguis reproduir.</string>
+    <string name="featured_hashtags_indication">Aquestes etiquetes permetran de filtrar els estatus dels perfils. Hauràs de fer servir el menú contextual per veure\'ls.</string>
+    <string name="set_capitalize_indication">Inserir automàticament un salt de línia després de la menció per posar la primera lletra en majúscula</string>
+    <string name="settings_title_custom_sharing_indication">Permet als creadors de continguts de compartir missatges en els seus RSS</string>
     <string name="compose">Redactar</string>
     <string name="upload_image_maximum_retry_times">Màxim d\'intents quan es penja un mèdia</string>
     <string name="new_folder">Crear una carpeta nova aquí</string>
@@ -892,23 +904,23 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="action_stats">Estadí­stiques</string>
     <string name="total_statuses">Missatges totals</string>
     <string name="number_boosts">Nombre de difusions</string>
-    <string name="number_favourites">Nombre de preferits rebuts</string>
+    <string name="number_favourites">Nombre de preferits</string>
     <string name="number_mentions">Nombre de mencions</string>
     <string name="number_follows">Nombre de seguiments</string>
     <string name="number_polls">Nombre d\'enquestes</string>
     <string name="number_replies">Nombre de respostes</string>
-    <string name="number_statuses">Nombre d\'estats</string>
+    <string name="number_statuses">Nombre de missatges</string>
     <string name="statuses">Missatges</string>
     <string name="visibility">Visibilitat</string>
     <string name="number_with_media">Nombre d\'ítems amb mèdia</string>
     <string name="number_with_sensitive_media">Nombre d\'ítems amb mèdia sensibles</string>
-    <string name="number_with_cw">Nombre amb CW</string>
+    <string name="number_with_cw">Nombre amb AC</string>
     <string name="first_toot_date">Data del primer missatge</string>
     <string name="last_toot_date">Data del darrer missatge</string>
     <string name="first_notification_date">Data de la primera notificació</string>
     <string name="last_notification_date">Data de l\'última notificació</string>
     <string name="frequency">Freqüència</string>
-    <string name="toot_per_day">%s estats per dia</string>
+    <string name="toot_per_day">%s missatges per dia</string>
     <string name="notification_per_day">%s notificacions per dia</string>
     <string name="date_range">Interval de dates</string>
     <string name="action_groups">Grups</string>
@@ -918,9 +930,9 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="display_charts">Mostra les gràfiques</string>
     <string name="collecting_data_wait">L\'aplicació està recollint les dades locals, cal esperar...</string>
     <string name="set_backup">Còpia de seguretat</string>
-    <string name="set_auto_backup">Estatus de còpia de seguretat automàtica</string>
-    <string name="set_auto_backup_indication">Aquesta opció s\'aplica a un sol compte. Posarà en marxa un servei que guardarà localment els teus estatus de forma automàtica a la base de dades. Això permet obtenir estadístiques i gràfiques</string>
-    <string name="set_auto_backup_notifications">Notificacions de còpia de seguretat</string>
+    <string name="set_auto_backup">Missatges de la còpia de seguretat automàtica</string>
+    <string name="set_auto_backup_indication">Aquesta opció s\'aplica a un sol compte. Posarà en marxa un servei que guardarà localment els teus missatges de forma automàtica a la base de dades. Això permet obtenir estadístiques i gràfiques</string>
+    <string name="set_auto_backup_notifications">Notificacions de còpia de seguretat automática</string>
     <string name="set_auto_backup_notifications_indication">Opció lligada a cada compte. Activa un servei que guarda automàticament les notificacions a la base de dades local. Això permet obtenir estadístiques i gràfiques</string>
     <string name="report_account">Denuncia el compte</string>
     <string name="send_invitation">Envia una invitació</string>
@@ -929,6 +941,10 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
         <item quantity="one">%d vot</item>
         <item quantity="other">%d vots</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d votant</item>
+        <item quantity="other">%d votants</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Elecció única</item>
         <item>Elecció múltiple</item>
@@ -957,39 +973,39 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="file_cache">Arxius de la cau</string>
     <string name="total_notifications">Notificacions totals</string>
     <string name="hide_menu_items">Amaga els ítems del menú</string>
-    <string name="top_notification">Fedilab té actives les notificacions instantànies</string>
+    <string name="top_notification">Fedilab té actives les notificacions en directe</string>
     <string name="top_notification_message">Per %1$s comptes amb %2$s esdeveniments</string>
-    <string name="set_allow_live_notifications">Notificacions instantànies per %1$s</string>
-    <string name="set_allow_live_notifications_indication">Es desactivaran les notificacions instantànies només d\'aquest compte.</string>
+    <string name="set_allow_live_notifications">Notificacions en directe per %1$s</string>
+    <string name="set_allow_live_notifications_indication">Es desactivaran les notificacions en directe només d\'aquest compte.</string>
     <string name="set_clear_cache_exit">Esborra la memòria cau en sortir</string>
     <string name="set_clear_cache_exit_indication">La memòria cau (mèdia, missatges registrats, dades del navegador incorporat) s\'esborraran automàticament en sortir de l\'aplicació.</string>
-    <string name="unfollow_confirm">Do you want to unfollow this account?</string>
-    <string name="set_unfollow_validation">Show confirmation dialog before unfollowing</string>
+    <string name="unfollow_confirm">Vols deixar de seguir aquest compte?</string>
+    <string name="set_unfollow_validation">Mostra diàleg de confirmació abans de deixar de seguir</string>
     <string name="set_invidious">Substituir Youtube amb Invidio.us</string>
     <string name="set_invidious_indication">Invidious és una alternativa a YouTube en funcions de frontal</string>
-    <string name="set_invidious_host">Escriu aquí el teu hoste particular o deixa-ho buit i s\'usarà invidio.us</string>
+    <string name="set_invidious_host">Escriu aquí el teu servidor particular o deixa-ho buit i s\'usarà invidio.us</string>
     <string name="set_nitter">Substitueix Twitter amb Nitter</string>
     <string name="set_nitter_indication">Nitter és una alternativa de codi obert que fa de frontal per Twitter i protegeix la privacitat.</string>
-    <string name="set_nitter_host">Introdueix aquí el teu hoste personalitzat o deixa-ho en blanc i s\'usarà nitter.net</string>
-    <string name="set_hide_status_bar">Hide Fedilab notification bar</string>
-    <string name="set_hide_status_bar_indication">For hiding the remaining notification in the status bar, tap on the eye icon button then uncheck: \"Display in status bar\"</string>
+    <string name="set_nitter_host">Introdueix aquí el teu servidor personalitzat o deixa-ho en blanc i s\'usarà nitter.net</string>
+    <string name="set_hide_status_bar">Amaga la barra de notificacions de Fedilab</string>
+    <string name="set_hide_status_bar_indication">Per amagar la notificació que queda a la barra d\'estat, toca la icona de l\'ull i després desactiva: \"Mostra a la barra d\'estat\"</string>
     <string name="set_live_type_indication">S\'ajornaran les notificacions cada 30 segons. Això permet gastar menys la pila.</string>
     <string name="live_delayed">Notificacions ajornades</string>
-    <string name="no_live_notif">Notificacions instantànies desactivades</string>
+    <string name="no_live_notif">Notificacions en directe desactivades</string>
     <string name="no_live_indication">Les notificacions es recolliran cada 15 minuts.</string>
     <string name="action_add_notes">Afegeix-hi notes</string>
     <string name="note_for_account">Notes per al compte</string>
-    <string name="set_resize_picture_indication">Permet la compressió de fotos grans en més petites amb una pèrduda mínima o negligible de qualitat d\'imatge.</string>
+    <string name="set_resize_picture_indication">Permet la compressió de fotos grans en més petites amb una pèrdua mínima o negligible de qualitat d\'imatge.</string>
     <string name="set_resize_video_indication">Permet de comprimir els vídeos tot mantenint-ne la qualitat.</string>
-    <string name="please_wait_compression">The app is compressing the media, it can be quite long…</string>
-    <string name="change_app_icon_experimental">Canvia la icona de l\'app</string>
-    <string name="click_to_change_the_app_icon">Clica per canviar la icona de l\'app</string>
+    <string name="please_wait_compression">L\'app està comprimint els mèdia, no trigarà gaire…</string>
+    <string name="change_app_icon_experimental">Canviar la icona de l\'aplicació</string>
+    <string name="click_to_change_the_app_icon">Toca per canviar la icona de l\'aplicació</string>
     <string name="post">Publica</string>
-    <string name="post_visibility_tilte">Visibilitat del toot</string>
-    <string name="add_photo_pixelfed">Clica aquí per afegir fotos</string>
+    <string name="post_visibility_tilte">Visibilitat de la publicació</string>
+    <string name="add_photo_pixelfed">Toca aquí per afegir fotos</string>
     <string name="add_photo_indication_pixelfed">Formats acceptats: jpeg, png, gif  \n\nMida Màxima: 15 MB  \n\nCada àlbum pot incloure fins a 4 fotos o vídeos</string>
-    <string name="upload_media">Carregar mèdia</string>
-    <string name="pixelfed_compose_placeholder">Add an optional caption</string>
+    <string name="upload_media">Pujar mèdia</string>
+    <string name="pixelfed_compose_placeholder">Afegeix llegenda opcional</string>
     <string name="long_api_error">L\'aplicació ha rebut un missatge d\'error molt llarg des de l\'API %1$s</string>
     <string name="message_preview">Previsualització de missatge</string>
     <string name="report_mention">Afegeix mencions en cada missatge</string>
@@ -1001,9 +1017,11 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="link_color_title">Enllaços</string>
     <string name="link_color">Canviar el color dels enllaços (Url, mencions, etiquetes, etc.) en els missatges</string>
     <string name="boost_header_color_title">Capçalera de difusions</string>
+    <string name="displayname_title">Canviar el color del nom que es mostra al capdamunt dels missatges</string>
+    <string name="username_title">Canviar el color del nom d\'usuària al capdamunt dels missatges</string>
     <string name="boost_header_color">Canviar el color de la capçalera en les difusions</string>
-    <string name="background_status_title">Apunts</string>
-    <string name="background_status">Color de fons dels apunts en les pissarres</string>
+    <string name="background_status_title">Publicacions</string>
+    <string name="background_status">Color de fons de les publicacions en les pissarres</string>
     <string name="reset_color">Restablir el colors</string>
     <string name="clik_reset">Pitja aquí per restablir tot els colors personalitzats</string>
     <string name="reset">Reiniciar</string>
@@ -1015,23 +1033,64 @@ Quan s\'esborra l\'aplicació s\'eliminen les dades immediatament.\n
     <string name="make_an_action">Endega un acció</string>
     <string name="translation">Traducció</string>
     <string name="image_preview">Previsualització d\'imatge</string>
-    <string name="text_color_title">Text color</string>
-    <string name="text_color">Change the text color in pots</string>
-    <string name="apply_changes">Apply changes</string>
-    <string name="restart_message">You need to restart the application to apply changes</string>
-    <string name="restart">Restart</string>
-    <string name="pref_custom_theme">Use a custom theme</string>
-    <string name="pref_custom_theme_summary">Allow to override colors of the  selected theme above</string>
-    <string name="theming">Theming</string>
-    <string name="store_before">Store before</string>
-    <string name="data_export_theme">The theme was exported</string>
-    <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
-    <string name="pref_colored_status_bar_summary">Apply the primary color to the status bar</string>
-    <string name="pref_colored_status_bar_title">Status bar color</string>
-    <string name="restore_default_theme">Restore a default theme</string>
-    <string name="import_theme">Import a theme</string>
-    <string name="import_theme_title">Tap here to import a theme from a previous export</string>
-    <string name="export_theme">Export the theme</string>
-    <string name="export_theme_title">Tap here to export the current theme</string>
-    <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="text_color_title">Color del text</string>
+    <string name="text_color">Canvia el color del text en les publicacions</string>
+    <string name="apply_changes">Aplicar els canvis</string>
+    <string name="restart_message">Cal que reiniciïs l\'aplicació per activar els canvis</string>
+    <string name="restart">Reinicia</string>
+    <string name="pref_custom_theme">Usa un tema personalitzat</string>
+    <string name="pref_custom_theme_summary">Autoritza a canviar colors del tema seleccionat</string>
+    <string name="theming">Gestió de temes</string>
+    <string name="store_before">Arxivar prèviament</string>
+    <string name="data_export_theme">S\'ha exportat el tema</string>
+    <string name="data_export_theme_success">S\'ha exportat el tema en format CSV</string>
+    <string name="pref_colored_status_bar_summary">Assigna el color primari a la barra d\'estat</string>
+    <string name="pref_colored_status_bar_title">Color de la barra d\'estat</string>
+    <string name="restore_default_theme">Recobra el tema de fàbrica</string>
+    <string name="import_theme">Importar un tema</string>
+    <string name="import_theme_title">Toca aquí per importar un tema prèviament exportat</string>
+    <string name="export_theme">Exporta el tema</string>
+    <string name="export_theme_title">Toca aquí per exportar el tema actual</string>
+    <string name="theme_file_error">Hi ha hagut un error en la selecció del document del tema</string>
+    <string name="label_theme_picker">Selector de temes</string>
+    <string name="pref_theme_summary">Tria un tema pre-instal·lat</string>
+    <string name="pref_theme_title">Temes</string>
+    <string name="pref_colored_navigation_bar_summary">Aplica el color primari a la barra de navegació</string>
+    <string name="pref_colored_navigation_bar_title">Color de la barra de navegació</string>
+    <string name="pref_background_color_summary">Color subjacent del contingut de l\'aplicació.</string>
+    <string name="pref_background_color_title">Color de fons</string>
+    <string name="pref_accent_color_summary">Ressalta cromàticament parts de la IU.</string>
+    <string name="pref_accent_color_title">Color d\'èmfasi</string>
+    <string name="pref_primary_color_summary">Els mostrats amb més freqüència en la teva aplicació.</string>
+    <string name="pref_primary_color_title">Color primari</string>
+    <string name="export_bookmarks">Exporta els marcadors de la instància</string>
+    <string name="import_bookmarks">Importa els marcadors de la instància</string>
+    <string name="user_count">Nombre d\'usuàries</string>
+    <string name="status_count">Nombre de missatges</string>
+    <string name="instance_count">Nombre d\'instàncies</string>
+    <string name="blocked">Blocat</string>
+    <string name="poll_finish_in">Finalitza en %s</string>
+    <string name="release_note_title">Novetats de %s</string>
+    <string name="follow_account_update">Pots seguir el meu compte per mantenir-te informada</string>
+    <string name="no_instance_reccord">La instància no figura a https://instances.social</string>
+    <string name="display_full_link">Mostra l\'enllaç sencer</string>
+    <string name="share_link">Compartir enllaç</string>
+    <string name="link_copy">S\'ha copiat l\'URL al porta-retalls</string>
+    <string name="open_other_app">Obre amb una altra aplicació</string>
+    <string name="check_redirect">Comprova la redirecció</string>
+    <string name="no_redirect">El redireccionament de la URL no funciona</string>
+    <string name="redirect_detected">%1$s \n\nredireccions a\n\n %2$s</string>
+    <string name="set_user_agent">Canvieu l\'agent d\'usuari</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Eliminar seguiments de màrketing (UTM)</string>
+    <string name="set_utm_parameters_indication">L\'aplicació eliminarà automàticament els seguiments de màrketing (UTM) dels URL abans de seguir un enllaç.</string>
+    <string name="action_trends">Tendències</string>
+    <string name="trending_now">Tendències ara</string>
+    <string name="talking_about">%d persones parlant</string>
+    <string name="twitter_accounts">Comptes de Twitter (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Usuaris de Twitter separats per espais</string>
+    <string name="identity_proofs">Proves d\'identitat</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 480522c86..06a59b12c 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -126,6 +126,30 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="few">%d seconds</item>
+        <item quantity="many">%d seconds</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="few">%d minutes</item>
+        <item quantity="many">%d minutes</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="few">%d hours</item>
+        <item quantity="many">%d hours</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="few">%d days</item>
+        <item quantity="many">%d days</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Varování</string>
     <string name="toot_placeholder">Co se vám honí hlavou?</string>
@@ -198,6 +222,7 @@
     <string name="notif_reblog">boostnul/a váš toot</string>
     <string name="notif_favourite">si oblíbil/a váš toot</string>
     <string name="notif_follow">vás sleduje</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">and další upozornění</item>
         <item quantity="few">and %d další upozornění</item>
@@ -274,6 +299,7 @@
     <string name="set_notify">Oznámení?</string>
     <string name="set_notif_silent">Tichá oznámení</string>
     <string name="set_nsfw_timeout">NSFW prodleva (vteřiny, 0 znamená vypnuto)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Upravit profil</string>
     <string name="settings_title_custom_sharing">Vlastní sdílení</string>
     <string name="settings_custom_sharing_url">Vaše vlastní sdílecí URL&#8230;</string>
@@ -296,11 +322,6 @@
     <string name="use_javascript">Povolit JavaScript</string>
     <string name="expand_cw">Automaticky ukázat cw</string>
     <string name="use_cookies">Povolit soubory cookie třetích stran</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Ne</item>
-    </string-array>
     <string name="your_api_key">Váš API klíč, prázdné pro Yandex</string>
     <string-array name="settings_theme">
         <item>Tmavé</item>
@@ -941,6 +962,12 @@ Uživatelské jméno a heslo nejsou nikdy ukládány. Jsou použity pouze během
         <item quantity="many">%d hlasu</item>
         <item quantity="other">%d hlasů</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="few">%d voters</item>
+        <item quantity="many">%d voters</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Jediná volba</item>
         <item>Více voleb</item>
@@ -1013,6 +1040,8 @@ Uživatelské jméno a heslo nejsou nikdy ukládány. Jsou použity pouze během
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1046,4 +1075,45 @@ Uživatelské jméno a heslo nejsou nikdy ukládány. Jsou použity pouze během
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index be4959dcf..8da3a52a2 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -126,6 +126,38 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="zero">%d seconds</item>
+        <item quantity="one">%d second</item>
+        <item quantity="two">%d seconds</item>
+        <item quantity="few">%d seconds</item>
+        <item quantity="many">%d seconds</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="zero">%d minutes</item>
+        <item quantity="one">%d minute</item>
+        <item quantity="two">%d minutes</item>
+        <item quantity="few">%d minutes</item>
+        <item quantity="many">%d minutes</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="zero">%d hours</item>
+        <item quantity="one">%d hour</item>
+        <item quantity="two">%d hours</item>
+        <item quantity="few">%d hours</item>
+        <item quantity="many">%d hours</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="zero">%d days</item>
+        <item quantity="one">%d day</item>
+        <item quantity="two">%d days</item>
+        <item quantity="few">%d days</item>
+        <item quantity="many">%d days</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Rhybudd</string>
     <string name="toot_placeholder">Beth sydd ar eich meddwl?</string>
@@ -198,6 +230,7 @@
     <string name="notif_reblog">wedi hybu\'ch tŵt</string>
     <string name="notif_favourite">wedi nodi\'ch tŵt yn ffefryn</string>
     <string name="notif_follow">wedi\'ch dilyn chi</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="zero">ac hysbysiad arall</item>
         <item quantity="one">ac %d hysbysiad arall</item>
@@ -278,6 +311,7 @@
     <string name="set_notify">Hsybysu?</string>
     <string name="set_notif_silent">Hysbysiadau distaw</string>
     <string name="set_nsfw_timeout">Terfyn amser golwg deunydd anaddas i\'r gweithle (eiliadau, ystyr 0 yw ei fod wedi ei ddiffodd)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Golygu proffil</string>
     <string name="settings_title_custom_sharing">Rhannu dethol</string>
     <string name="settings_custom_sharing_url">Eich URL&#8230; rhannu dethol</string>
@@ -300,11 +334,6 @@
     <string name="use_javascript">Caniatau Javascript</string>
     <string name="expand_cw">Ehangu cw yn awtomataidd</string>
     <string name="use_cookies">Caniatau cwcis trydydd parti</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Na</item>
-    </string-array>
     <string name="your_api_key">Eich allwedd API, mae modd ei adael yn wag i Yandex</string>
     <string-array name="settings_theme">
         <item>Tywyll</item>
@@ -948,6 +977,14 @@
         <item quantity="many">%d votes</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="zero">%d voters</item>
+        <item quantity="one">%d voter</item>
+        <item quantity="two">%d voters</item>
+        <item quantity="few">%d voters</item>
+        <item quantity="many">%d voters</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1020,6 +1057,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1053,4 +1092,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index aad8b503b..34bf43f5d 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d t</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d sekund</item>
+        <item quantity="other">%d sekunder</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minut</item>
+        <item quantity="other">%d minutter</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d time</item>
+        <item quantity="other">%d timer</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d dag</item>
+        <item quantity="other">%d dage</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Advarsel</string>
     <string name="toot_placeholder">Hvad har du i tankerne?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">boostede din status</string>
     <string name="notif_favourite">favoriserede din status</string>
     <string name="notif_follow">fulgte dig</string>
+    <string name="notif_follow_request">bad om at måtte følge dig</string>
     <plurals name="other_notifications">
         <item quantity="one">og en anden notifikation</item>
         <item quantity="other">og %d andre notifikationer</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Notificér?</string>
     <string name="set_notif_silent">Tavse Notifikationer</string>
     <string name="set_nsfw_timeout">NSFW-visningstimeout (sekunder, 0 betyder slået fra)</string>
+    <string name="set_med_desc_timeout">Mediebeskrivelses-timeout (sekunder, 0 = Fra)</string>
     <string name="settings_title_profile">Redigér profil</string>
     <string name="settings_title_custom_sharing">Tilpasset deling</string>
     <string name="settings_custom_sharing_url">Din tilpassede delings-URL&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Aktivér JavaScript</string>
     <string name="expand_cw">Udvid automatisk cw</string>
     <string name="use_cookies">Tillad tredjeparts-cookies</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Nej</item>
-    </string-array>
     <string name="your_api_key">Din API-nøgle, kan være tom for Yandex</string>
     <string-array name="settings_theme">
         <item>Mørk</item>
@@ -937,6 +950,10 @@
         <item quantity="one">%d stemme</item>
         <item quantity="other">%d stemmer</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d stemmeafgiver</item>
+        <item quantity="other">%d stemmeafgivere</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Enkeltvalg</item>
         <item>Multivalg</item>
@@ -1009,6 +1026,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Skift farven på links (URL\'er, omtaler, tags mv.) i beskeder</string>
     <string name="boost_header_color_title">Overskrift på genblogninger</string>
+    <string name="displayname_title">Skift navnevisningsfarven øverst i beskeder</string>
+    <string name="username_title">Skift brugernavnsfarven øverst i beskeder</string>
     <string name="boost_header_color">Skift farven på overskriften på genblogninger</string>
     <string name="background_status_title">Indlæg</string>
     <string name="background_status">Baggrundsfarve på indlæg på tidslinjer</string>
@@ -1028,18 +1047,59 @@
     <string name="apply_changes">Effektuér ændringer</string>
     <string name="restart_message">Appen skal genstartes for at effektuere ændringerne</string>
     <string name="restart">Genstart</string>
-    <string name="pref_custom_theme">Use a custom theme</string>
-    <string name="pref_custom_theme_summary">Allow to override colors of the  selected theme above</string>
-    <string name="theming">Theming</string>
-    <string name="store_before">Store before</string>
-    <string name="data_export_theme">The theme was exported</string>
-    <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
-    <string name="pref_colored_status_bar_summary">Apply the primary color to the status bar</string>
-    <string name="pref_colored_status_bar_title">Status bar color</string>
-    <string name="restore_default_theme">Restore a default theme</string>
-    <string name="import_theme">Import a theme</string>
-    <string name="import_theme_title">Tap here to import a theme from a previous export</string>
-    <string name="export_theme">Export the theme</string>
-    <string name="export_theme_title">Tap here to export the current theme</string>
-    <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="pref_custom_theme">Benyt et tilpasset tema</string>
+    <string name="pref_custom_theme_summary">Tillader farvetilsidesættelse for det ovenfor valgte tema</string>
+    <string name="theming">Tematisering</string>
+    <string name="store_before">Gem inden</string>
+    <string name="data_export_theme">Temaet er eksporteret</string>
+    <string name="data_export_theme_success">Temaet er eksporteret til CSV</string>
+    <string name="pref_colored_status_bar_summary">Anvend den primære farve på statusbjælken</string>
+    <string name="pref_colored_status_bar_title">Statusbjælkefarve</string>
+    <string name="restore_default_theme">Gendan et standardtema</string>
+    <string name="import_theme">Importér et tema</string>
+    <string name="import_theme_title">Tryk hér for at importere et tema fra en tidligere eksport</string>
+    <string name="export_theme">Eksportér dette tema</string>
+    <string name="export_theme_title">Tryk hér for at eksportere det aktuelle tema</string>
+    <string name="theme_file_error">En fejl opstod under valg af temafilen</string>
+    <string name="label_theme_picker">Temavælger</string>
+    <string name="pref_theme_summary">Vælg et præinstalleret tema</string>
+    <string name="pref_theme_title">Temaer</string>
+    <string name="pref_colored_navigation_bar_summary">Anvend primærfarven på navigeringsbjælken</string>
+    <string name="pref_colored_navigation_bar_title">Navigeringsbjælkefarve</string>
+    <string name="pref_background_color_summary">Den underliggende farve for appens indhold.</string>
+    <string name="pref_background_color_title">Baggrundsfarve</string>
+    <string name="pref_accent_color_summary">Markeringsfarver vælger dele af UI\'en.</string>
+    <string name="pref_accent_color_title">Markeringsfarve</string>
+    <string name="pref_primary_color_summary">Vist hyppigst i hele din app.</string>
+    <string name="pref_primary_color_title">Primærfarve</string>
+    <string name="export_bookmarks">Eksportér bogmærker til denne instans</string>
+    <string name="import_bookmarks">Importér bogmærker fra denne instans</string>
+    <string name="user_count">Brugerantal</string>
+    <string name="status_count">Statusantal</string>
+    <string name="instance_count">Instansantal</string>
+    <string name="blocked">Blokeret</string>
+    <string name="poll_finish_in">Slutter om %s</string>
+    <string name="release_note_title">Nyheder i %s</string>
+    <string name="follow_account_update">Du kan følge min konto for opdateringer</string>
+    <string name="no_instance_reccord">Denne instans er ikke tilgængelig på https://instances.social</string>
+    <string name="display_full_link">Vis fuldt link</string>
+    <string name="share_link">Del link</string>
+    <string name="link_copy">URL\'en er blevet kopieret til udklipsholderen</string>
+    <string name="open_other_app">Åbn med en anden app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">Denne URL omdirigerer ikke</string>
+    <string name="redirect_detected">%1$s\n\nomdirigerer til\n\n%2$s</string>
+    <string name="set_user_agent">Skift brugeragenten</string>
+    <string name="set_user_agent_hint">Angive en tilpasset brugeragent eller lad stå tom</string>
+    <string name="set_user_agent_indication">Muliggør tilpasning af brugeragenten, der benyttes til API-kald eller med den indbyggede browser.</string>
+    <string name="set_utm_parameters">Fjern UTM-parametre</string>
+    <string name="set_utm_parameters_indication">Appen fjerner automatisk UTM-parametre fra URL\'er, inden du følger et link.</string>
+    <string name="action_trends">Tendenser</string>
+    <string name="trending_now">Hot lige nu</string>
+    <string name="talking_about">%d folk omtaler</string>
+    <string name="twitter_accounts">Twitter-konti (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter-brugernavne, adskilt af mellemrum</string>
+    <string name="identity_proofs">Identitetsbeviser</string>
+    <string name="verified_user">Bekræftet identitet</string>
+    <string name="verified_by">Bekræftet af %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6e3acd398..e3b74059b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com-->
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
     <string name="navigation_drawer_open">Menü öffnen</string>
     <string name="navigation_drawer_close">Menü schließen</string>
@@ -126,6 +127,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d Sekunde</item>
+        <item quantity="other">%d Sekunden</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d Minute</item>
+        <item quantity="other">%d Minuten</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d Stunde</item>
+        <item quantity="other">%d Stunden</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d Tag</item>
+        <item quantity="other">%d Tage</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Warnung</string>
     <string name="toot_placeholder">Was beschäftigt dich?</string>
@@ -198,6 +215,7 @@
     <string name="notif_reblog">hat deinen Beitrag geteilt</string>
     <string name="notif_favourite">hat deinen Status favorisiert</string>
     <string name="notif_follow">folgt dir</string>
+    <string name="notif_follow_request">fragte, dir zu folgen</string>
     <plurals name="other_notifications">
         <item quantity="one">und eine weitere Benachrichtigung</item>
         <item quantity="other">und %d weitere Benachrichtigungen</item>
@@ -270,6 +288,7 @@
     <string name="set_notify">Benachrichtigen?</string>
     <string name="set_notif_silent">Leise Benachrichtigungen</string>
     <string name="set_nsfw_timeout">NSFW Anzeigedauer (in Sekunden, 0 ≙ deaktiviert)</string>
+    <string name="set_med_desc_timeout">Timeout der Medienbeschreibung (Sekunden, 0 bedeutet aus)</string>
     <string name="settings_title_profile">Ändere Profil</string>
     <string name="settings_title_custom_sharing">Benutzerdefiniertes Teilen</string>
     <string name="settings_custom_sharing_url">Ihre benutzerdefinierte Freigabeadresse &#8230;</string>
@@ -292,11 +311,6 @@
     <string name="use_javascript">Javascript aktivieren</string>
     <string name="expand_cw">Inhaltswarnungen (CWs) automatisch einblenden</string>
     <string name="use_cookies">Erlaube Cookies von Drittanbietern</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Nein</item>
-    </string-array>
     <string name="your_api_key">Dein API-Schlüssel; für Yandex kannst du ihn leer lassen</string>
     <string-array name="settings_theme">
         <item>Dunkel</item>
@@ -773,7 +787,7 @@ Sobald du die ersten Buchstaben eintippst, werden Namensvorschläge angezeigt\n\
     <string name="toast_error_instance_reg">Bei der Überprüfung der verfügbaren Instanzen ist ein Problem aufgetreten!</string>
     <string name="join_mastodon">Mastodon beitreten</string>
     <string name="pickup_instance_category">Instanz durch Anklicken einer Kategorie auswählen und dann auf eine Schaltfläche klicken.</string>
-    <string name="pickup_instance_peertube">Choose an instance by tapping on a check button.</string>
+    <string name="pickup_instance_peertube">Wähle eine Instanz aus, indem du auf eine Check-Schaltfläche tippst.</string>
     <string name="users">%1$s Nutzer</string>
     <string name="password_confirm">Passwort bestätigen</string>
     <string name="agreement_check">Ich akzeptiere %1$s und %2$s</string>
@@ -925,6 +939,10 @@ Sobald du die ersten Buchstaben eintippst, werden Namensvorschläge angezeigt\n\
         <item quantity="one">%d Stimme</item>
         <item quantity="other">%d Stimmen</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d Stimme</item>
+        <item quantity="other">%d Stimmen</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Einfachauswahl</item>
         <item>Mehrfachauswahl</item>
@@ -992,42 +1010,85 @@ Sobald du die ersten Buchstaben eintippst, werden Namensvorschläge angezeigt\n\
     <string name="fetch_conversation">Unterhaltung wird abgerufen</string>
     <string name="order_by">Sortieren nach</string>
     <string name="title_video_peertube">Titel für das Video</string>
-    <string name="join_peertube">Join Peertube</string>
-    <string name="agreement_check_peertube">I am at least 16 years old and agree to the %1$s of this instance</string>
+    <string name="join_peertube">Peertube beitreten</string>
+    <string name="agreement_check_peertube">Ich bin mindestens 16 Jahre alt und stimme den %1$s dieser Instanz zu</string>
     <string name="link_color_title">Links</string>
-    <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
-    <string name="boost_header_color_title">Reblogs header</string>
-    <string name="boost_header_color">Change the color of the header for reblogs</string>
-    <string name="background_status_title">Posts</string>
-    <string name="background_status">Background color of posts in timelines</string>
-    <string name="reset_color">Reset colors</string>
-    <string name="clik_reset">Tap here to reset all your custom colors</string>
-    <string name="reset">Reset</string>
-    <string name="icons_color_title">Icons</string>
-    <string name="icons_color">Color of bottom icons in timelines</string>
-    <string name="pin_tag">Pin this tag</string>
-    <string name="logo_of_the_instance">Logo of the instance</string>
-    <string name="edit_profile">Edit profile</string>
-    <string name="make_an_action">Make an action</string>
-    <string name="translation">Translation</string>
-    <string name="image_preview">Image preview</string>
-    <string name="text_color_title">Text color</string>
-    <string name="text_color">Change the text color in pots</string>
-    <string name="apply_changes">Apply changes</string>
-    <string name="restart_message">You need to restart the application to apply changes</string>
-    <string name="restart">Restart</string>
-    <string name="pref_custom_theme">Use a custom theme</string>
-    <string name="pref_custom_theme_summary">Allow to override colors of the  selected theme above</string>
+    <string name="link_color">Ändern Sie die Farbe der Links (URLs, Erwähnungen, Tags, etc.) in Nachrichten</string>
+    <string name="boost_header_color_title">Reblogs Titel</string>
+    <string name="displayname_title">Ändern der Farbe des Anzeigenamens oben in den Nachrichten</string>
+    <string name="username_title">Ändern der Farbe des Benutzernamens am Anfang von Nachrichten</string>
+    <string name="boost_header_color">Ändern der Farbe der Kopfzeile für Reblogs</string>
+    <string name="background_status_title">Beiträge</string>
+    <string name="background_status">Hintergrundfarbe der posts in den timelines</string>
+    <string name="reset_color">Farben zurücksetzen</string>
+    <string name="clik_reset">Tippen Sie hier, um alle Ihre benutzerdefinierten Farben zurückzusetzen</string>
+    <string name="reset">Zurücksetzen</string>
+    <string name="icons_color_title">Symbole</string>
+    <string name="icons_color">Farbe der unteren Symbole in Zeitleisten</string>
+    <string name="pin_tag">Diesen Tag anheften</string>
+    <string name="logo_of_the_instance">Logo der Instanz</string>
+    <string name="edit_profile">Profil bearbeiten</string>
+    <string name="make_an_action">Aktion ausführen</string>
+    <string name="translation">Übersetzung</string>
+    <string name="image_preview">Bildvorschau</string>
+    <string name="text_color_title">Textfarbe</string>
+    <string name="text_color">Ändern Sie die Textfarbe in posts</string>
+    <string name="apply_changes">Änderungen übernehmen</string>
+    <string name="restart_message">Sie müssen die Anwendung neu starten, um die Änderungen zu übernehmen</string>
+    <string name="restart">Neustarten</string>
+    <string name="pref_custom_theme">Verwenden Sie ein benutzerdefiniertes Design</string>
+    <string name="pref_custom_theme_summary">Erlaubt es, die Farben des ausgewählten Themas oben zu überschreiben</string>
     <string name="theming">Theming</string>
-    <string name="store_before">Store before</string>
-    <string name="data_export_theme">The theme was exported</string>
-    <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
-    <string name="pref_colored_status_bar_summary">Apply the primary color to the status bar</string>
-    <string name="pref_colored_status_bar_title">Status bar color</string>
-    <string name="restore_default_theme">Restore a default theme</string>
-    <string name="import_theme">Import a theme</string>
-    <string name="import_theme_title">Tap here to import a theme from a previous export</string>
-    <string name="export_theme">Export the theme</string>
-    <string name="export_theme_title">Tap here to export the current theme</string>
-    <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="store_before">Vorher speichern</string>
+    <string name="data_export_theme">Das Theme wurde exportiert</string>
+    <string name="data_export_theme_success">Das Design wurde erfolgreich als CSV exportiert</string>
+    <string name="pref_colored_status_bar_summary">Die primäre Farbe auf die Statusleiste anwenden</string>
+    <string name="pref_colored_status_bar_title">Statusleistenfarbe</string>
+    <string name="restore_default_theme">Standard-Theme wiederherstellen</string>
+    <string name="import_theme">Theme importieren</string>
+    <string name="import_theme_title">Hier tippen, um ein Theme aus einem vorherigen Export zu importieren</string>
+    <string name="export_theme">Exportieren des Designs</string>
+    <string name="export_theme_title">Hier tippen, um das aktuelle Theme zu exportieren</string>
+    <string name="theme_file_error">Bei der Auswahl der Designdatei ist ein Fehler aufgetreten</string>
+    <string name="label_theme_picker">Theme-Auswahl</string>
+    <string name="pref_theme_summary">Vorinstalliertes Theme auswählen</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Navigationsleiste mit der Primärfarbe einfärben</string>
+    <string name="pref_colored_navigation_bar_title">Farbe der Navigationsleiste</string>
+    <string name="pref_background_color_summary">Die dem Inhalt der App zugrunde liegende Farbe.</string>
+    <string name="pref_background_color_title">Hintergrundfarbe</string>
+    <string name="pref_accent_color_summary">Akzente innerhalb der Oberfläche.</string>
+    <string name="pref_accent_color_title">Akzentfarbe</string>
+    <string name="pref_primary_color_summary">Am häufigsten in Ihrer App angezeigt.</string>
+    <string name="pref_primary_color_title">Primärfarbe</string>
+    <string name="export_bookmarks">Lesezeichen zur Instanz exportieren</string>
+    <string name="import_bookmarks">Lesezeichen von der Instanz importieren</string>
+    <string name="user_count">Benutzeranzahl</string>
+    <string name="status_count">Statusanzahl</string>
+    <string name="instance_count">Instanzanzahl</string>
+    <string name="blocked">Blockiert</string>
+    <string name="poll_finish_in">Endet in %s</string>
+    <string name="release_note_title">Was ist neu in %s</string>
+    <string name="follow_account_update">Du kannst meinem Konto für Updates folgen</string>
+    <string name="no_instance_reccord">Diese Instanz ist auf https://instances.social nicht verfügbar</string>
+    <string name="display_full_link">Vollständigen Link anzeigen</string>
+    <string name="share_link">Link teilen</string>
+    <string name="link_copy">Der Link wurde in die Zwischenablage kopiert</string>
+    <string name="open_other_app">Mit anderer App öffnen</string>
+    <string name="check_redirect">Weiterleitung prüfen</string>
+    <string name="no_redirect">Diese URL wird nicht weitergeleitet</string>
+    <string name="redirect_detected">%1$s \n\nweitergeleitet zu\n\n %2$s</string>
+    <string name="set_user_agent">User-Agent auswählen</string>
+    <string name="set_user_agent_hint">Eigenen User-Agent setzen oder leer lassen</string>
+    <string name="set_user_agent_indication">Ermöglicht es, den User-Agent für Api-Anrufe oder mit dem integrierten Browser anzupassen.</string>
+    <string name="set_utm_parameters">UTM-Parameter entfernen</string>
+    <string name="set_utm_parameters_indication">Die App wird UTM-Parameter automatisch von URLs entfernen, bevor sie einen Link besucht.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Gerade im Trend</string>
+    <string name="talking_about">%d Leute sprechen</string>
+    <string name="twitter_accounts">Twitter-Konten (über Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter-Benutzernamen durch ein Leerzeichen getrennt</string>
+    <string name="identity_proofs">Identitätsnachweise</string>
+    <string name="verified_user">Verifizierte Identität</string>
+    <string name="verified_by">Verifiziert von %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index f17843efc..4e0c4ddcb 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d λεπ.</string>
     <string name="date_hours">%d ώρ.</string>
     <string name="date_day">%d ημ.</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d δευτερόλεπτο</item>
+        <item quantity="other">%d δευτερόλεπτα</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d λεπτό</item>
+        <item quantity="other">%d λεπτά</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d ώρα</item>
+        <item quantity="other">%d ώρες</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d ημέρα</item>
+        <item quantity="other">%d ημέρες</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Προειδοποίηση</string>
     <string name="toot_placeholder">Τι συλλογιέσαι;</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">ενίσχυσε την κατάστασή σου</string>
     <string name="notif_favourite">έδειξε προτίμηση στην κατάστασή σου</string>
     <string name="notif_follow">άρχισε να σε παρακολουθεί</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">και ακόμη μία ειδοποίηση</item>
         <item quantity="other">και %d άλλες ειδοποιήσεις</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Ειδοποιήσεις;</string>
     <string name="set_notif_silent">Άηχες Ειδοποιήσεις</string>
     <string name="set_nsfw_timeout">Χρόνος λήξης της προβολής των Ακατάλληλων (σε δευτερόλεπτα· το 0 σημαίνει ανενεργό)</string>
+    <string name="set_med_desc_timeout">Χρόνος λήξης της Περιγραφής των Πολυμέσων (σε δευτερόλεπτα, το 0 σημαίνει ανενεργό)</string>
     <string name="settings_title_profile">Επεξεργασία του προσώπου</string>
     <string name="settings_title_custom_sharing">Προσαρμοσμένη κοινοποίηση</string>
     <string name="settings_custom_sharing_url">Η διεύθυνση URL&#8230; τς προσαρμοσμένης μοιρασιάς</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Ενεργοποίηση των Σεναρίων της Τζάβα</string>
     <string name="expand_cw">Αυτόματη επέκταση της Προειδοποίησης Περιεχομένου</string>
     <string name="use_cookies">Να επιτρέπονται τα κουλουράκια τρίτων</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Καθόλου</item>
-    </string-array>
     <string name="your_api_key">Το API κλειδί σου· μπορείς να το αφήσεις κενό για το Yandex</string>
     <string-array name="settings_theme">
         <item>Σκοτεινό</item>
@@ -862,7 +875,7 @@
     <string name="set_remember_position_indication">Αν απενεργοποιηθεί, η εφαρμογή θα φορτώνει, πάντα, τις τελευταίες καταστάσεις</string>
     <string name="set_blur_sensitive_indication">Αν απενεργοποιηθεί, τα πολυμέσα με ευαίσθητο περιεχόμενο θα αποκρύπτονται με ένα πλήκτρο</string>
     <string name="set_long_press_media_indication">Αποθήκευση των πολυμέσων, στις πλήρης διαστάσεις τους, με πάτημα διαρκείας στην προ-επισκόπηση</string>
-    <string name="set_display_timeline_in_list_indication">Add an ellipse button at the top right for listing all tags/instances/lists</string>
+    <string name="set_display_timeline_in_list_indication">Προσθήκη ενός πλήκτρου αποσιωπητικών, πάνω δεξιά, για την παράθεση όλων των ετικετών/υποστάσεων/κατάστιχων</string>
     <string name="live_notif_indication">Διατήρηση συνεχής της σύνδεσης στην API, που παρέχει τη ροή, για ζωντανές ειδοποιήσεις.</string>
     <string name="set_enable_time_slot_indication">During the time slot, the app will send notifications. You can reverse (ie: silent) this time slot with the right spinner.</string>
     <string name="set_display_fedilab_features_button_indication">Προβολή ενός Φενδιλάμπιου πλήκτρου κάτω από την εικόνα του προσώπου. Είναι μια συντόμευση, η οποία επιτρέπει την πρόσβαση σε λειτουργίες της εφαρμογής.</string>
@@ -937,6 +950,10 @@
         <item quantity="one">%d ψήφος</item>
         <item quantity="other">%d ψήφοι</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d ψηφοφόρος</item>
+        <item quantity="other">%d ψηφοφόροι</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Μονή επιλογή</item>
         <item>Πολλαπλές επιλογές</item>
@@ -1009,6 +1026,8 @@
     <string name="link_color_title">Σύνδεσμοι</string>
     <string name="link_color">Αλλαγή των χρωμάτων των συνδέσμων (URL, μνημονεύσεις, ετικέτες, κλπ) στα μηνύματα</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Αλλαγή του χρώματος, του προβαλλόμενου ονόματος, στην κορυφή των μηνυμάτων</string>
+    <string name="username_title">Αλλαγή του χρώματος, του ονόματος χρήστη, στην κορυφή των μηνυμάτων</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Δημοσιεύσεις</string>
     <string name="background_status">Χρώμα παρασκηνίου των δημοσιεύσεων στις χρονοστήλες</string>
@@ -1020,26 +1039,67 @@
     <string name="pin_tag">Καρφίτσωμα αυτής της ετικέτας</string>
     <string name="logo_of_the_instance">Το λογότυπο της υπόστασης</string>
     <string name="edit_profile">Επεξεργασία του προσώπου</string>
-    <string name="make_an_action">Make an action</string>
+    <string name="make_an_action">Επέλεξε μία κίνηση</string>
     <string name="translation">Μετάφραση</string>
     <string name="image_preview">Προεπισκόπηση εικόνας</string>
-    <string name="text_color_title">Text color</string>
+    <string name="text_color_title">Χρώμα κειμένου</string>
     <string name="text_color">Change the text color in pots</string>
-    <string name="apply_changes">Apply changes</string>
-    <string name="restart_message">You need to restart the application to apply changes</string>
-    <string name="restart">Restart</string>
-    <string name="pref_custom_theme">Use a custom theme</string>
-    <string name="pref_custom_theme_summary">Allow to override colors of the  selected theme above</string>
-    <string name="theming">Theming</string>
-    <string name="store_before">Store before</string>
-    <string name="data_export_theme">The theme was exported</string>
-    <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
-    <string name="pref_colored_status_bar_summary">Apply the primary color to the status bar</string>
-    <string name="pref_colored_status_bar_title">Status bar color</string>
-    <string name="restore_default_theme">Restore a default theme</string>
-    <string name="import_theme">Import a theme</string>
-    <string name="import_theme_title">Tap here to import a theme from a previous export</string>
-    <string name="export_theme">Export the theme</string>
-    <string name="export_theme_title">Tap here to export the current theme</string>
-    <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="apply_changes">Εφαρμογή των αλλαγών</string>
+    <string name="restart_message">Θα πρέπει να επανεκκινήσεις την εφαρμογή για να εφαρμοστούν οι αλλαγές</string>
+    <string name="restart">Επανεκκίνηση</string>
+    <string name="pref_custom_theme">Χρήση ενός προσαρμοσμένου θέματος</string>
+    <string name="pref_custom_theme_summary">Να επιτρέπεται η αντικατάσταση των χρωμάτων του παραπάνω επιλεγμένου θέματος</string>
+    <string name="theming">Θεματισμός</string>
+    <string name="store_before">Πρώτα αποθήκευση</string>
+    <string name="data_export_theme">Έγινε εξαγωγή του θέματος</string>
+    <string name="data_export_theme_success">Έγινε επιτυχής εξαγωγή του θέματος σε μορφή CSV</string>
+    <string name="pref_colored_status_bar_summary">Εφαρμογή του πρωτεύοντος χρώματος στη γραμμή κατάστασης</string>
+    <string name="pref_colored_status_bar_title">Χρώμα γραμμής κατάστασης</string>
+    <string name="restore_default_theme">Αποκατάσταση ενός προεπιλεγμένου θέματος</string>
+    <string name="import_theme">Εισαγωγή ενός θέματος</string>
+    <string name="import_theme_title">Πίεσε εδώ, για να γίνει εισαγωγή ενός θέματος, από προηγούμενη εξαγωγή</string>
+    <string name="export_theme">Εξαγωγή του θέματος</string>
+    <string name="export_theme_title">Πίεσε εδώ για να εξάγεις το τωρινό θέμα</string>
+    <string name="theme_file_error">Παρουσιάστηκε κάποιο σφάλμα στην επιλογή του αρχείου με το θέμα</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Εξαγωγή των σελιδοδεικτών στην υπόσταση</string>
+    <string name="import_bookmarks">Εισαγωγή των σελιδοδεικτών από την υπόσταση</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Φραγμένοι</string>
+    <string name="poll_finish_in">Να τελειώσει στις %s</string>
+    <string name="release_note_title">Τι είναι νέο στο %s</string>
+    <string name="follow_account_update">Μπορείς να παρακολουθείς των λογαριασμό μου για ενημερώσεις</string>
+    <string name="no_instance_reccord">Αυτή η υπόσταση δεν είναι διαθέσιμη στην https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index f7eb8cc2f..f62b8421c 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Averto</string>
     <string name="toot_placeholder">Kion vi pensas?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">{name} diskonigis vian mesaĝon</string>
     <string name="notif_favourite">{name} stelumis vian mesaĝon</string>
     <string name="notif_follow">%s eksekvis vin</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">and another notification</item>
         <item quantity="other">and %d other notifications</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Sciigi?</string>
     <string name="set_notif_silent">Silent Notifications</string>
     <string name="set_nsfw_timeout">NSFW view timeout (seconds, 0 means off)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Redakti profilon</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Ebligi Ĝavoskripton</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="use_cookies">Permesi tria-partiaj kuketojn</string>
-    <string-array name="settings_translation">
-        <item>Jandekso</item>
-        <item>DeepL</item>
-        <item>Ne</item>
-    </string-array>
     <string name="your_api_key">Your API key, you can leave blank for Yandex</string>
     <string-array name="settings_theme">
         <item>Malluma</item>
@@ -937,6 +950,10 @@
         <item quantity="one">%d voĉdono</item>
         <item quantity="other">%d voĉdonoj</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1009,6 +1026,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1042,4 +1061,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2316c96ae..516bc165e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d segundo</item>
+        <item quantity="other">%d segundos</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minuto</item>
+        <item quantity="other">%d minutos</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hora</item>
+        <item quantity="other">%d horas</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d día</item>
+        <item quantity="other">%d días</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Advertencia</string>
     <string name="toot_placeholder">¿En qué estás pensando?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">retooteó tu estado</string>
     <string name="notif_favourite">marcó como favorito tu estado</string>
     <string name="notif_follow">te siguió</string>
+    <string name="notif_follow_request">solicitó seguirte</string>
     <plurals name="other_notifications">
         <item quantity="one">y otra notificación</item>
         <item quantity="other">y otra notificación</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">¿Notificar?</string>
     <string name="set_notif_silent">Notificaciones silenciosas</string>
     <string name="set_nsfw_timeout">Tiempo de vista de contenido sensible (segundos, 0 significa terminado)</string>
+    <string name="set_med_desc_timeout">Tiempo de espera de descripción multimedia (en segundos, 0 para desactivar)</string>
     <string name="settings_title_profile">Editar perfil</string>
     <string name="settings_title_custom_sharing">Compartición personalizada</string>
     <string name="settings_custom_sharing_url">Tu URL de compartición personalizada&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Permitir Javascripts</string>
     <string name="expand_cw">Expandir cw automáticamente</string>
     <string name="use_cookies">Permitir cookies de terceros</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>No</item>
-    </string-array>
     <string name="your_api_key">Tu llave API, puedes dejar en blanco para Yandex</string>
     <string-array name="settings_theme">
         <item>Oscuro</item>
@@ -931,6 +944,10 @@ https://yandex.ru/legal/confidential/?lang=en    </string>
         <item quantity="one">%d voto</item>
         <item quantity="other">%d voto</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d votante</item>
+        <item quantity="other">%d votantes</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Selección única</item>
         <item>Opciones múltiples</item>
@@ -1003,6 +1020,8 @@ https://yandex.ru/legal/confidential/?lang=en    </string>
     <string name="link_color_title">Enlaces</string>
     <string name="link_color">Cambiar el color de los enlaces (Url, menciones, etiquetas, etc.) en los mensajes</string>
     <string name="boost_header_color_title">Cabecera de impulsos</string>
+    <string name="displayname_title">Cambiar el color del nombre mostrado en la parte superior de los mensajes</string>
+    <string name="username_title">Cambiar el color del nombre de usuario en la parte superior de los mensajes</string>
     <string name="boost_header_color">Cambiar el color de la cabecera de los impulsos</string>
     <string name="background_status_title">Publicaciones</string>
     <string name="background_status">Color de fondo de las publicaciones en las líneas de tiempo</string>
@@ -1025,15 +1044,56 @@ https://yandex.ru/legal/confidential/?lang=en    </string>
     <string name="pref_custom_theme">Usar un tema personalizado</string>
     <string name="pref_custom_theme_summary">Permiten reemplazar los colores del tema seleccionado anteriormente</string>
     <string name="theming">Personalización del tema</string>
-    <string name="store_before">Store before</string>
-    <string name="data_export_theme">The theme was exported</string>
-    <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
-    <string name="pref_colored_status_bar_summary">Apply the primary color to the status bar</string>
-    <string name="pref_colored_status_bar_title">Status bar color</string>
-    <string name="restore_default_theme">Restore a default theme</string>
-    <string name="import_theme">Import a theme</string>
-    <string name="import_theme_title">Tap here to import a theme from a previous export</string>
-    <string name="export_theme">Export the theme</string>
-    <string name="export_theme_title">Tap here to export the current theme</string>
-    <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="store_before">Almacenar previamente</string>
+    <string name="data_export_theme">El tema ha sido exportado</string>
+    <string name="data_export_theme_success">El tema se ha exportado correctamente en CSV</string>
+    <string name="pref_colored_status_bar_summary">Aplicar el color principal a la barra de estado</string>
+    <string name="pref_colored_status_bar_title">Color de la barra de estado</string>
+    <string name="restore_default_theme">Restaurar un tema predeterminado</string>
+    <string name="import_theme">Importar un tema</string>
+    <string name="import_theme_title">Pulsa aquí para importar un tema exportado previamente</string>
+    <string name="export_theme">Exportar el tema</string>
+    <string name="export_theme_title">Pulsa aquí para exportar el tema actual</string>
+    <string name="theme_file_error">Se produjo un error al seleccionar el archivo de tema</string>
+    <string name="label_theme_picker">Selector de Temas</string>
+    <string name="pref_theme_summary">Selecciona un tema pre-instalado</string>
+    <string name="pref_theme_title">Temas</string>
+    <string name="pref_colored_navigation_bar_summary">Aplicar el color principal a la barra de navegación</string>
+    <string name="pref_colored_navigation_bar_title">Color de la barra de navegación</string>
+    <string name="pref_background_color_summary">El color de fondo del contenido de la aplicación.</string>
+    <string name="pref_background_color_title">Color de fondo</string>
+    <string name="pref_accent_color_summary">Se aplica a ciertas partes de la interfaz.</string>
+    <string name="pref_accent_color_title">Color de acento</string>
+    <string name="pref_primary_color_summary">Mostrado más frecuentemente por tu aplicación.</string>
+    <string name="pref_primary_color_title">Color principal</string>
+    <string name="export_bookmarks">Exportar marcadores a la instancia</string>
+    <string name="import_bookmarks">Importar marcadores de la instancia</string>
+    <string name="user_count">Número de usuarios</string>
+    <string name="status_count">Número de estados</string>
+    <string name="instance_count">Número de instancias</string>
+    <string name="blocked">Bloqueado</string>
+    <string name="poll_finish_in">Finaliza en %s</string>
+    <string name="release_note_title">Novedades en %s</string>
+    <string name="follow_account_update">Puedes seguir mi cuenta para mantenerte al día con las actualizaciones</string>
+    <string name="no_instance_reccord">Esta instancia no está disponible en https://instances.social</string>
+    <string name="display_full_link">Mostrar enlace completo</string>
+    <string name="share_link">Compartir enlace</string>
+    <string name="link_copy">La URL se ha copiado al portapapeles</string>
+    <string name="open_other_app">Abrir con otra aplicación</string>
+    <string name="check_redirect">Comprobar redirección</string>
+    <string name="no_redirect">El redireccionamiento de la URL no funciona</string>
+    <string name="redirect_detected">%1$s \n\nredirige a\n\n %2$s</string>
+    <string name="set_user_agent">Cambiar el agente de usuario</string>
+    <string name="set_user_agent_hint">Establece un agente de usuario personalizado o deja en blanco</string>
+    <string name="set_user_agent_indication">Permite personalizar el agente de usuario que se utiliza para las llamadas a la api o con el navegador integrado.</string>
+    <string name="set_utm_parameters">Eliminar parámetros UTM</string>
+    <string name="set_utm_parameters_indication">La aplicación eliminará automáticamente los parámetros UTM de las URLs antes de visitar un enlace.</string>
+    <string name="action_trends">Tendencias</string>
+    <string name="trending_now">Tendencia ahora</string>
+    <string name="talking_about">%d personas hablando</string>
+    <string name="twitter_accounts">Cuentas de Twitter (vía Nitter)</string>
+    <string name="list_of_twitter_accounts">Nombres de usuario de Twitter separados por un espacio</string>
+    <string name="identity_proofs">Pruebas de identidad</string>
+    <string name="verified_user">Identidad verificada</string>
+    <string name="verified_by">Verificado por %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index c1c2a8477..04b0b82fd 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d e</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">Segundo %d</item>
+        <item quantity="other">%d segundo</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">Minutu %d</item>
+        <item quantity="other">%d minutu</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">Ordu %d</item>
+        <item quantity="other">%d ordu</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">Egun %d</item>
+        <item quantity="other">%d egun</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Abisua</string>
     <string name="toot_placeholder">Zer duzu buruan?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">erabiltzaileak zure mezuari bultzada eman dio</string>
     <string name="notif_favourite">erabiltzaileak zure mezua gogoko du</string>
     <string name="notif_follow">zu jarraitzen hasi da</string>
+    <string name="notif_follow_request">zu jarraitzea eskatu du</string>
     <plurals name="other_notifications">
         <item quantity="one">eta beste jakinarazpen bat</item>
         <item quantity="other">eta beste %d jakinarazpen</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Jakinarazi?</string>
     <string name="set_notif_silent">Jakinarazpen isilak</string>
     <string name="set_nsfw_timeout">NSFW ikusteko denbora-muga (segundoak, 0 itzalita)</string>
+    <string name="set_med_desc_timeout">Multimediaren deskripzioaren denbora-muga (segundoak, 0 desgaituta esan nahi du)</string>
     <string name="settings_title_profile">Editatu profila</string>
     <string name="settings_title_custom_sharing">Partekatze pertsonalizatua</string>
     <string name="settings_custom_sharing_url">Zure partekatze pertsonalizaturako URL-a&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Gaitu JavaScript</string>
     <string name="expand_cw">Hedatu automatikoki CW</string>
     <string name="use_cookies">Baimendu hirugarrengoen cookie-ak</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>Ez</item>
-        <item>Ez</item>
-    </string-array>
     <string name="your_api_key">Zure API gakoa, Yandex erabiltzeko hutsik laga dezakezu</string>
     <string-array name="settings_theme">
         <item>Iluna</item>
@@ -937,6 +950,10 @@
         <item quantity="one">boto %d</item>
         <item quantity="other">%d boto</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">Bozkatzaile %d</item>
+        <item quantity="other">%d bozkatzaile</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Aukera bakarra</item>
         <item>Hainbat aukera</item>
@@ -1008,12 +1025,14 @@
     <string name="link_color_title">Estekak</string>
     <string name="link_color">Aldatu mezuetako esteken koloreak (URL-ak, aipamenak, etiketak, eta abar)</string>
     <string name="boost_header_color_title">Bultzaden goiburua</string>
+    <string name="displayname_title">Aldatu mezuen goialdeko pantaila-izenaren kolorea</string>
+    <string name="username_title">Aldatu mezuen goialdeko erabiltzaile-izenaren kolorea</string>
     <string name="boost_header_color">Aldatu bultzaden goiburuen kolorea</string>
-    <string name="background_status_title">Mezuak</string>
+    <string name="background_status_title">Bidalketak</string>
     <string name="background_status">Mezuen atzealdearen kolorea denbora-lerroetan</string>
     <string name="reset_color">Berrezarri koloreak</string>
-    <string name="clik_reset">Sakatu hemen zure kolore pertsonalizatuak berrezartzeko</string>
-    <string name="reset">Berrezarri</string>
+    <string name="clik_reset">Sakatu hemen zure kolore pertsonalizatu guztiak leheneratzeko</string>
+    <string name="reset">Leheneratu</string>
     <string name="icons_color_title">Ikonoak</string>
     <string name="icons_color">Denbora-lerroen azpialdeko botoien kolorea</string>
     <string name="pin_tag">Finkatu etiketa hau</string>
@@ -1022,23 +1041,64 @@
     <string name="make_an_action">Burutu ekintza bat</string>
     <string name="translation">Itzulpena</string>
     <string name="image_preview">Irudiaren aurrebista</string>
-    <string name="text_color_title">Text color</string>
-    <string name="text_color">Change the text color in pots</string>
-    <string name="apply_changes">Apply changes</string>
-    <string name="restart_message">You need to restart the application to apply changes</string>
-    <string name="restart">Restart</string>
-    <string name="pref_custom_theme">Use a custom theme</string>
-    <string name="pref_custom_theme_summary">Allow to override colors of the  selected theme above</string>
-    <string name="theming">Theming</string>
-    <string name="store_before">Store before</string>
-    <string name="data_export_theme">The theme was exported</string>
-    <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
-    <string name="pref_colored_status_bar_summary">Apply the primary color to the status bar</string>
-    <string name="pref_colored_status_bar_title">Status bar color</string>
-    <string name="restore_default_theme">Restore a default theme</string>
-    <string name="import_theme">Import a theme</string>
-    <string name="import_theme_title">Tap here to import a theme from a previous export</string>
-    <string name="export_theme">Export the theme</string>
-    <string name="export_theme_title">Tap here to export the current theme</string>
-    <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="text_color_title">Testuaren kolorea</string>
+    <string name="text_color">Aldatu mezuen testuaren kolorea</string>
+    <string name="apply_changes">Aplikatu aldaketak</string>
+    <string name="restart_message">Aplikazioa berrabiarazi behar duzu aldaketak aplikatzeko</string>
+    <string name="restart">Berrabiarazi</string>
+    <string name="pref_custom_theme">Erabili gai pertsonalizatua</string>
+    <string name="pref_custom_theme_summary">Baimendu goian hautatutako gaiaren koloreak gainidaztea</string>
+    <string name="theming">Gaiak</string>
+    <string name="store_before">Lehenbizi gorde</string>
+    <string name="data_export_theme">Gaia esportatu da</string>
+    <string name="data_export_theme_success">Gaia ongi esportatu da CSV gisa</string>
+    <string name="pref_colored_status_bar_summary">Aplikatu kolore nagusia egoera barrari</string>
+    <string name="pref_colored_status_bar_title">Egoera barraren kolorea</string>
+    <string name="restore_default_theme">Berrezarri lehenetsitako gai bat</string>
+    <string name="import_theme">Inportatu gai bat</string>
+    <string name="import_theme_title">Sakatu hemen aurretik esportatutako gai bat inportatzeko</string>
+    <string name="export_theme">Esportatu gaia</string>
+    <string name="export_theme_title">Sakatu hemen oraingo gaia esportatzeko</string>
+    <string name="theme_file_error">Errore bat gertatu da gaiaren fitxategia hautatzean</string>
+    <string name="label_theme_picker">Gai hautatzailea</string>
+    <string name="pref_theme_summary">Hautatu aurrez instalatutako gai bat</string>
+    <string name="pref_theme_title">Gaiak</string>
+    <string name="pref_colored_navigation_bar_summary">Aplikatu kolore nagusia nabigazio barrari</string>
+    <string name="pref_colored_navigation_bar_title">Nabigazio barraren kolorea</string>
+    <string name="pref_background_color_summary">Aplikazioaren edukien atzeko kolorea.</string>
+    <string name="pref_background_color_title">Atzeko kolorea</string>
+    <string name="pref_accent_color_summary">Interfazearen atal hautatuak nabarmentzen ditu.</string>
+    <string name="pref_accent_color_title">Nabarmentze kolorea</string>
+    <string name="pref_primary_color_summary">Zure aplikazioan gehien erabiliko dena.</string>
+    <string name="pref_primary_color_title">Kolore nagusia</string>
+    <string name="export_bookmarks">Esportatu gogokoak instantziara</string>
+    <string name="import_bookmarks">Inportatu gogokoak instantziatik</string>
+    <string name="user_count">Erabiltzaile kopurua</string>
+    <string name="status_count">Mezu kopurua</string>
+    <string name="instance_count">Instantzia kopurua</string>
+    <string name="blocked">Blokeatuta</string>
+    <string name="poll_finish_in">Amaitzeko %s</string>
+    <string name="release_note_title">Zer dago berri %s bertsioan</string>
+    <string name="follow_account_update">Nire kontua jarraitu dezakezu eguneraketetarako</string>
+    <string name="no_instance_reccord">Instantzia hau ez dago eskuragarri https://instances.social gunean</string>
+    <string name="display_full_link">Erakutsi esteka osoa</string>
+    <string name="share_link">Partekatu esteka</string>
+    <string name="link_copy">URL-a arbelera kopiatu da</string>
+    <string name="open_other_app">Ireki beste aplikazio batekin</string>
+    <string name="check_redirect">Egiaztatu birbideratzea</string>
+    <string name="no_redirect">URL honek ez du birbideratzen</string>
+    <string name="redirect_detected">%1$s \n\n helbideak \n\n %2$s helbidera birbideratzen du</string>
+    <string name="set_user_agent">Aldatu erabiltzaile-agentea</string>
+    <string name="set_user_agent_hint">Ezarri erabiltzaile-agente pertsonalizatu bat edo laga hutsik</string>
+    <string name="set_user_agent_indication">API deietarako eta barne nabigatzailean erabilitako erabiltzaile-agentea pertsonalizatzeko aukera ematen du.</string>
+    <string name="set_utm_parameters">Kendu UTM parametroak</string>
+    <string name="set_utm_parameters_indication">Aplikazioak automatikoki kenduko ditu URL baten UTM parametroak hau bisitatu aurretik.</string>
+    <string name="action_trends">Joerak</string>
+    <string name="trending_now">Joera orain</string>
+    <string name="talking_about">%d pertsona hitz egiten</string>
+    <string name="twitter_accounts">Twitter kontuak (Nitter bidez)</string>
+    <string name="list_of_twitter_accounts">Twitter erabiltzaile-izenak zuriunez bereizita</string>
+    <string name="identity_proofs">Identitate frogak</string>
+    <string name="verified_user">Egiaztatutako identitatea</string>
+    <string name="verified_by">Egiaztatzailea: %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 1f16250ec..fd8d965ba 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Warning</string>
     <string name="toot_placeholder">What is on your mind?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">boosted your status</string>
     <string name="notif_favourite">favourited your status</string>
     <string name="notif_follow">followed you</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">and another notification</item>
         <item quantity="other">and %d other notifications</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Notify?</string>
     <string name="set_notif_silent">Silent Notifications</string>
     <string name="set_nsfw_timeout">NSFW view timeout (seconds, 0 means off)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Edit profile</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Enable Javascript</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="use_cookies">Allow third-party cookies</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>No</item>
-    </string-array>
     <string name="your_api_key">Your API key, you can leave blank for Yandex</string>
     <string-array name="settings_theme">
         <item>Dark</item>
@@ -937,6 +950,10 @@
         <item quantity="one">%d vote</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1009,6 +1026,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1042,4 +1061,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">هویت تایید شده</string>
+    <string name="verified_by">تایید شده توسط %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4fe1424bf..289be111d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d min</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d j</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d seconde</item>
+        <item quantity="other">%d secondes</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d heure</item>
+        <item quantity="other">%d heures</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d jour</item>
+        <item quantity="other">%d jours</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Avertissement</string>
     <string name="toot_placeholder">Qu’avez-vous en tête ?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">a partagé votre pouet</string>
     <string name="notif_favourite">a ajouté votre pouet à ses favoris</string>
     <string name="notif_follow">vous suit</string>
+    <string name="notif_follow_request">a demandé à vous suivre</string>
     <plurals name="other_notifications">
         <item quantity="one">et %d autre notification</item>
         <item quantity="other">et %d autres notifications</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Notifier ?</string>
     <string name="set_notif_silent">Utiliser le vibreur</string>
     <string name="set_nsfw_timeout">Délai d’affichage NSFW (en secondes, 0 signifie aucun délai)</string>
+    <string name="set_med_desc_timeout">Délai de l\'affichage de la description des médias (en secondes, 0 signifie désactivé)</string>
     <string name="settings_title_profile">Modifier le profil</string>
     <string name="settings_title_custom_sharing">Partage personnalisé</string>
     <string name="settings_custom_sharing_url">Votre URL de partage personnalisé&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Activer Javascript</string>
     <string name="expand_cw">Afficher automatiquement le contenu masqué</string>
     <string name="use_cookies">Autoriser les cookies tiers</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Non</item>
-    </string-array>
     <string name="your_api_key">Votre clé API, vous pouvez laisser vide pour Yandex</string>
     <string-array name="settings_theme">
         <item>Sombre</item>
@@ -934,6 +947,10 @@ Le bouton de connexion s’activera une fois qu’un domaine valide sera renseig
         <item quantity="one">%d voix</item>
         <item quantity="other">%d voix</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d votant</item>
+        <item quantity="other">%d votants</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Choix unique</item>
         <item>Choix multiple</item>
@@ -1005,8 +1022,10 @@ Le bouton de connexion s’activera une fois qu’un domaine valide sera renseig
     <string name="agreement_check_peertube">J\'ai au moins 16 ans et je suis d\'accord avec les %1$s de cette instance</string>
     <string name="link_color_title">Liens</string>
     <string name="link_color">Changer la couleur des liens (URL, mentions, tags, etc.) dans les messages</string>
-    <string name="boost_header_color_title">Reblogs header</string>
-    <string name="boost_header_color">Change the color of the header for reblogs</string>
+    <string name="boost_header_color_title">En-tête des partages</string>
+    <string name="displayname_title">Changer la couleur du nom affiché en haut des messages</string>
+    <string name="username_title">Changer la couleur du nom de l\'utilisateur en haut des messages</string>
+    <string name="boost_header_color">Modifie la couleur de l’en-tête des partages</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Couleur du fond des post des fils</string>
     <string name="reset_color">Réinitialiser les couleurs</string>
@@ -1028,7 +1047,7 @@ Le bouton de connexion s’activera une fois qu’un domaine valide sera renseig
     <string name="pref_custom_theme">Utiliser un thème personnalisé</string>
     <string name="pref_custom_theme_summary">Permettre de modifier les couleurs du thème sélectionné ci-dessus</string>
     <string name="theming">Thème</string>
-    <string name="store_before">Store before</string>
+    <string name="store_before">Sauvegarder au préalable</string>
     <string name="data_export_theme">Le thème a été exporté</string>
     <string name="data_export_theme_success">Le thème a été exporté avec succès en CSV</string>
     <string name="pref_colored_status_bar_summary">Appliquer la couleur primaire à la barre d\'état</string>
@@ -1039,4 +1058,45 @@ Le bouton de connexion s’activera une fois qu’un domaine valide sera renseig
     <string name="export_theme">Exporter le thème</string>
     <string name="export_theme_title">Appuyez ici pour exporter le thème actuel</string>
     <string name="theme_file_error">Une erreur s\'est produite lors de la sélection du fichier de thème</string>
+    <string name="label_theme_picker">Sélecteur de thème</string>
+    <string name="pref_theme_summary">Sélectionner un thème préinstallé</string>
+    <string name="pref_theme_title">Thèmes</string>
+    <string name="pref_colored_navigation_bar_summary">Appliquer la couleur principale à la barre de navigation</string>
+    <string name="pref_colored_navigation_bar_title">Couleur de la barre de navigation</string>
+    <string name="pref_background_color_summary">Couleur sous-jacente du contenu de l’application.</string>
+    <string name="pref_background_color_title">Couleur du fond</string>
+    <string name="pref_accent_color_summary">Les Accents sélectionnent des parties de l\'interface utilisateur.</string>
+    <string name="pref_accent_color_title">Couleur d\'accentuation</string>
+    <string name="pref_primary_color_summary">Affiché le plus souvent dans l\'application.</string>
+    <string name="pref_primary_color_title">Couleur primaire</string>
+    <string name="export_bookmarks">Exporter les signets vers l\'instance</string>
+    <string name="import_bookmarks">Importer les signets de l\'instance</string>
+    <string name="user_count">Nombre d\'utilisateurs</string>
+    <string name="status_count">Nombre de statuts</string>
+    <string name="instance_count">L’instance comprend</string>
+    <string name="blocked">Bloqué</string>
+    <string name="poll_finish_in">Fin dans %s</string>
+    <string name="release_note_title">Quoi de neuf dans %s</string>
+    <string name="follow_account_update">Vous pouvez suivre mon compte pour les mises à jour</string>
+    <string name="no_instance_reccord">Cette instance n’est pas disponible sur https://instances.social</string>
+    <string name="display_full_link">Afficher le lien complet</string>
+    <string name="share_link">Partager le lien</string>
+    <string name="link_copy">L\'url a été copiée dans le presse-papiers</string>
+    <string name="open_other_app">Ouvrir avec une autre application</string>
+    <string name="check_redirect">Vérifier la redirection</string>
+    <string name="no_redirect">Cette URL ne redirige pas</string>
+    <string name="redirect_detected">%1$s\n\nredirige vers\n\n%2$s</string>
+    <string name="set_user_agent">Modifier l\'agent d\'utilisateur</string>
+    <string name="set_user_agent_hint">Définir un agent utilisateur personnalisé ou laisser vide</string>
+    <string name="set_user_agent_indication">Permet de personnaliser l\'agent de l\'utilisateur utilisé pour les appels de l\'api ou avec le navigateur intégré.</string>
+    <string name="set_utm_parameters">Supprimer les paramètres UTM</string>
+    <string name="set_utm_parameters_indication">L’application supprimera automatiquement les paramètres UTM des URL avant de visiter un lien.</string>
+    <string name="action_trends">Tendances</string>
+    <string name="trending_now">Tendance en ce moment</string>
+    <string name="talking_about">%d personnes en parlent</string>
+    <string name="twitter_accounts">Comptes Twitter (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Noms d\'utilisateurs Twitter séparés par un espace</string>
+    <string name="identity_proofs">Preuves d’identité</string>
+    <string name="verified_user">Identité vérifiée</string>
+    <string name="verified_by">Vérifié par %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 187863142..dcc395a92 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com-->
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
     <string name="navigation_drawer_open">Abrir o menú</string>
     <string name="navigation_drawer_close">Pechar o menú</string>
@@ -126,6 +127,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d segundo</item>
+        <item quantity="other">%d segundos</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minuto</item>
+        <item quantity="other">%d minutos</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hora</item>
+        <item quantity="other">%d horas</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d día</item>
+        <item quantity="other">%d días</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Aviso</string>
     <string name="toot_placeholder">Que contas?</string>
@@ -198,6 +215,7 @@
     <string name="notif_reblog">promoveu o seu estado</string>
     <string name="notif_favourite">favoreceu o seu estado</string>
     <string name="notif_follow">segueuna</string>
+    <string name="notif_follow_request">solicitou seguirte</string>
     <plurals name="other_notifications">
         <item quantity="one">e outra notificación</item>
         <item quantity="other">e outras %d notificacións</item>
@@ -270,6 +288,7 @@
     <string name="set_notify">Notificar?</string>
     <string name="set_notif_silent">Notificacións silenciosas</string>
     <string name="set_nsfw_timeout">Caducidade da vista NSFW (en segundos, 0 é apagado)</string>
+    <string name="set_med_desc_timeout">Caducidade Descrición Medios (segundos, 0 igual a off)</string>
     <string name="settings_title_profile">Editar perfil</string>
     <string name="settings_title_custom_sharing">Compartición personalizada</string>
     <string name="settings_custom_sharing_url">O URL da súa compartición&#8230;</string>
@@ -292,11 +311,6 @@
     <string name="use_javascript">Activar javascript</string>
     <string name="expand_cw">Expandir automáticamente CW</string>
     <string name="use_cookies">Permitir testemuños de terceiros</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeppL</item>
-        <item>Non</item>
-    </string-array>
     <string name="your_api_key">A súa chave API, pode deixala en branco para Yandex</string>
     <string-array name="settings_theme">
         <item>Escuro</item>
@@ -937,6 +951,10 @@
         <item quantity="one">%d voto</item>
         <item quantity="other">%d votos</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d votante</item>
+        <item quantity="other">%d votantes</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Opción única</item>
         <item>Selección múltiple</item>
@@ -1009,6 +1027,8 @@
     <string name="link_color_title">Ligazóns</string>
     <string name="link_color">Cambiar cor das ligazóns (URLs, mencións, etiquetas, etc.) nas mensaxes</string>
     <string name="boost_header_color_title">Cabeceira das repeticións</string>
+    <string name="displayname_title">Cambiar cor do nome mostrado enriba das mensaxes</string>
+    <string name="username_title">Cambiar a cor do nome de usuaria enriba das mensaxes</string>
     <string name="boost_header_color">Cambiar a cor da cabeceira das mensaxes repetidas</string>
     <string name="background_status_title">Publicacións</string>
     <string name="background_status">Cor de fondo das publicacións en liñas temporais</string>
@@ -1023,23 +1043,64 @@
     <string name="make_an_action">Tomar decisión</string>
     <string name="translation">Tradución</string>
     <string name="image_preview">Vista previa da imaxe</string>
-    <string name="text_color_title">Text color</string>
-    <string name="text_color">Change the text color in pots</string>
-    <string name="apply_changes">Apply changes</string>
-    <string name="restart_message">You need to restart the application to apply changes</string>
-    <string name="restart">Restart</string>
+    <string name="text_color_title">Cor do texto</string>
+    <string name="text_color">Cambiar cor do texto nas mensaxes</string>
+    <string name="apply_changes">Aplicar cambios</string>
+    <string name="restart_message">Debes reiniciar para aplicar os cambios</string>
+    <string name="restart">Reiniciar</string>
     <string name="pref_custom_theme">Usar decorado personalizado</string>
     <string name="pref_custom_theme_summary">Permitir obviar as cores do decorado seleccionado</string>
     <string name="theming">Decoración</string>
-    <string name="store_before">Store before</string>
-    <string name="data_export_theme">The theme was exported</string>
-    <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
-    <string name="pref_colored_status_bar_summary">Apply the primary color to the status bar</string>
-    <string name="pref_colored_status_bar_title">Status bar color</string>
-    <string name="restore_default_theme">Restore a default theme</string>
-    <string name="import_theme">Import a theme</string>
-    <string name="import_theme_title">Tap here to import a theme from a previous export</string>
-    <string name="export_theme">Export the theme</string>
-    <string name="export_theme_title">Tap here to export the current theme</string>
-    <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="store_before">Gardar antes</string>
+    <string name="data_export_theme">Exportouse o decorado</string>
+    <string name="data_export_theme_success">Exportouse correctamente o decorado a CSV</string>
+    <string name="pref_colored_status_bar_summary">Aplicar a cor primaria a barra de estado</string>
+    <string name="pref_colored_status_bar_title">Cor da barra de estado</string>
+    <string name="restore_default_theme">Restablecer decorado por omisión</string>
+    <string name="import_theme">Importar decorado</string>
+    <string name="import_theme_title">Toca aquí para importar un decorado previamente exportado</string>
+    <string name="export_theme">Exportar decorado</string>
+    <string name="export_theme_title">Toca aquí para exportar decorado actual</string>
+    <string name="theme_file_error">Algo fallou ao escoller o ficheiro do decorado</string>
+    <string name="label_theme_picker">Selección de decorado</string>
+    <string name="pref_theme_summary">Escoller decorado preinstaldo</string>
+    <string name="pref_theme_title">Decorados</string>
+    <string name="pref_colored_navigation_bar_summary">Aplicar cor primaria a barra de navegación</string>
+    <string name="pref_colored_navigation_bar_title">Cor da barra de navegación</string>
+    <string name="pref_background_color_summary">A cor de fondo do contido da app.</string>
+    <string name="pref_background_color_title">Cor de fondo</string>
+    <string name="pref_accent_color_summary">Resalta partes seleccionadas da IU.</string>
+    <string name="pref_accent_color_title">Cor de resalte</string>
+    <string name="pref_primary_color_summary">Mostrado frecuentemente a través da app.</string>
+    <string name="pref_primary_color_title">Cor primaria</string>
+    <string name="export_bookmarks">Exportar marcadores a instancia</string>
+    <string name="import_bookmarks">Importar marcadores desde a instancia</string>
+    <string name="user_count">Número de usuarias</string>
+    <string name="status_count">Número de estados</string>
+    <string name="instance_count">Contas da instancia</string>
+    <string name="blocked">Bloqueado</string>
+    <string name="poll_finish_in">Remata en %s</string>
+    <string name="release_note_title">Qué novidades hai en %s</string>
+    <string name="follow_account_update">Podes seguir a miña conta para actualizacións</string>
+    <string name="no_instance_reccord">Esta instancia non está dispoñible en https://instances.social</string>
+    <string name="display_full_link">Mostra ligazón completa</string>
+    <string name="share_link">Comparte ligazón</string>
+    <string name="link_copy">Copiouse o URL ao portaretallos</string>
+    <string name="open_other_app">Abrir con outra app</string>
+    <string name="check_redirect">Comproba redirección</string>
+    <string name="no_redirect">Este URL non redirixe</string>
+    <string name="redirect_detected">%1$s \n\nredirixe a\n\n %2$s</string>
+    <string name="set_user_agent">Cambiar User Agent</string>
+    <string name="set_user_agent_hint">Establecer un User Agent ou deixar baldeiro</string>
+    <string name="set_user_agent_indication">Permite personalizar o User Agent utilizado nas chamadas a API ou co navegador incluído.</string>
+    <string name="set_utm_parameters">Eliminar parámetros UTM</string>
+    <string name="set_utm_parameters_indication">A app borrará automáticamente os parámetros UTM dos URLs antes de visitar a ligazón.</string>
+    <string name="action_trends">Tendencias</string>
+    <string name="trending_now">Tendencia agora</string>
+    <string name="talking_about">%d xente comentando</string>
+    <string name="twitter_accounts">Contas de Twitter (vía Nitter)</string>
+    <string name="list_of_twitter_accounts">Nomes de usuario Twitter separados por vírgulas</string>
+    <string name="identity_proofs">Probas de identidade</string>
+    <string name="verified_user">Identidade verificada</string>
+    <string name="verified_by">Verificada por %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 301449556..0b5615301 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">चेतावनी</string>
     <string name="toot_placeholder">आपके मन में क्या है?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">आपका लेख बूस्ट किया</string>
     <string name="notif_favourite">आपका लेख पसंद किया</string>
     <string name="notif_follow">आपका अनुसरण किया</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">एक और सूचना</item>
         <item quantity="other">%d अन्य सूचनाएं</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">सूचित करें?</string>
     <string name="set_notif_silent">शांत सूचनाएं</string>
     <string name="set_nsfw_timeout">NSFW दृश्य विराम (सेकेंड, ० मतलब बंद)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">प्रोफ़ाइल संपादित करें</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">जावास्क्रिप्ट चालू करें</string>
     <string name="expand_cw">स्वतः cw खोलें</string>
     <string name="use_cookies">तीसरी पार्टी कुकीज़ को स्वीकारें</string>
-    <string-array name="settings_translation">
-        <item>यैंडैक्स</item>
-        <item>डीपएल</item>
-        <item>नहीं</item>
-    </string-array>
     <string name="your_api_key">आपकी एपीआई कुंजी, आप इसे यैंडेक्स के लिये खाली छोड़ सकते हैं</string>
     <string-array name="settings_theme">
         <item>साँवला</item>
@@ -929,6 +942,10 @@
         <item quantity="one">%d मत</item>
         <item quantity="other">%d मत</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>एक विकल्प</item>
         <item>अनेक विकल्प</item>
@@ -1001,6 +1018,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1034,4 +1053,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d25851034..6a2d7ed61 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d p</string>
     <string name="date_hours">%d ó</string>
     <string name="date_day">%d n</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Figyelmeztetés</string>
     <string name="toot_placeholder">Mi jár a fejedben?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">megismételte posztodat</string>
     <string name="notif_favourite">lájkolta a posztodat</string>
     <string name="notif_follow">követett téged</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">és még egy értesítés</item>
         <item quantity="other">és még %d értesítés</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Kérsz értesítést?</string>
     <string name="set_notif_silent">Csendes értesítések</string>
     <string name="set_nsfw_timeout">NSFW tartalom megjelenítésének ideje (mp, 0 érték kikapcsolja)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Profil szerkesztése</string>
     <string name="settings_title_custom_sharing">Egyéni megosztás</string>
     <string name="settings_custom_sharing_url">Az egyéni megosztási URL&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Javascript engedélyezése</string>
     <string name="expand_cw">cw automatikus kibontása</string>
     <string name="use_cookies">Harmadik féltől származó sütik engedélyezése</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Nem</item>
-    </string-array>
     <string name="your_api_key">A te API-kulcsod (Yandex esetén üresen hagyhatja)</string>
     <string-array name="settings_theme">
         <item>Sötét</item>
@@ -935,6 +948,10 @@ A Yandexnek megvan a saját adatvédelmi szabályzata, ami itt található: http
         <item quantity="one">%d szavazat</item>
         <item quantity="other">%d szavazat</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Egyetlen választás</item>
         <item>Több választás</item>
@@ -1007,6 +1024,8 @@ A Yandexnek megvan a saját adatvédelmi szabályzata, ami itt található: http
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1040,4 +1059,45 @@ A Yandexnek megvan a saját adatvédelmi szabályzata, ami itt található: http
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index 919c880b8..05e59a826 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d ր</string>
     <string name="date_hours">%d ժ</string>
     <string name="date_day">%d օր</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Զգուշացում</string>
     <string name="toot_placeholder">Մտքիդ ի՞նչ կա</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">-ը խրախուսել է քո թութը</string>
     <string name="notif_favourite">-ը գրառումդ ավելացրել է նախընտրումներին</string>
     <string name="notif_follow">-ը հետևում է քեզ</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">և մեկ այլ ծանուցում</item>
         <item quantity="other">և %d այլ ծանուցումներ</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Ծանուցե՞լ</string>
     <string name="set_notif_silent">Լուռ ծանուցումներ</string>
     <string name="set_nsfw_timeout">NSFW ցուցադրման տևողությունը(վրկյ-ով, 0-ն անջատելն է)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Խմբագրել Էջը</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Թույլատրել JavaScript</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="use_cookies">Թույլատրել երրորդ կողմի քուքիներ</string>
-    <string-array name="settings_translation">
-        <item>Յանդեքս</item>
-        <item>DeepL</item>
-        <item>Ոչ</item>
-    </string-array>
     <string name="your_api_key">Your API key, you can leave blank for Yandex</string>
     <string-array name="settings_theme">
         <item>Dark</item>
@@ -936,6 +949,10 @@
         <item quantity="one">%d vote</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1008,6 +1025,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1041,4 +1060,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 1757533f1..ac86b48e8 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -126,6 +126,18 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="other">%d detik</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="other">%d menit</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="other">%d jam</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="other">%d hari</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Peringatan</string>
     <string name="toot_placeholder">Apa yang Anda pikirkan?</string>
@@ -134,8 +146,8 @@
     <string name="cw">cw</string>
     <string name="toot_title">Tulis sebuah kutipan</string>
     <string name="toot_title_reply">Balas ke sebuah kutipan</string>
-    <string name="queet_title">Write a queet</string>
-    <string name="queet_title_reply">Reply to a queet</string>
+    <string name="queet_title">Tulis sebuah queet</string>
+    <string name="queet_title_reply">Balas sebuah queet</string>
     <string name="toot_select_image">Pilih media</string>
     <string name="toot_select_image_error">Terjadi kesalahan saat memilih media!</string>
     <string name="toot_delete_media">Hapus media ini?</string>
@@ -198,11 +210,12 @@
     <string name="notif_reblog">tingkatkan status Kamu</string>
     <string name="notif_favourite">status kesukaan Kamu</string>
     <string name="notif_follow">mengikutimu</string>
+    <string name="notif_follow_request">meminta untuk mengikuti anda</string>
     <plurals name="other_notifications">
         <item quantity="other">dan %d pemberitahuan lainnya</item>
     </plurals>
     <plurals name="likes">
-        <item quantity="other">%d likes</item>
+        <item quantity="other">%d like</item>
     </plurals>
     <string name="delete_notification_ask">Hapus pemberitahuan?</string>
     <string name="delete_notification_ask_all">Hapus semua pemberitahuan?</string>
@@ -214,7 +227,7 @@
     <string name="pinned_toots">Disematkan</string>
     <!-- TOAST -->
     <string name="client_error">Tidak menemukan id klien!</string>
-    <string name="connect_error">Unable to connect to instance domain!</string>
+    <string name="connect_error">Tidak dapat terhubung ke instance domain!</string>
     <string name="no_internet">Tidak ada koneksi internet!</string>
     <string name="toast_block">Akun diblokir!</string>
     <string name="toast_unblock">Akun tidak lagi diblokir!</string>
@@ -239,7 +252,7 @@
     <string name="nothing_to_do">Tidak dapat diambil tindakan</string>
     <string name="toast_saved">Media telah tersimpan!</string>
     <string name="toast_error_translate">Terjadi kesalahan saat menerjemahkan!</string>
-    <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
+    <string name="toast_error_translations_disabled">Terjemahan dinonaktifkan di pengaturan</string>
     <string name="toast_toot_saved">Konsep tersimpan!</string>
     <string name="toast_error_char_limit">Apakah anda yakin contoh ini memungkinkan jumlah karakter ini? biasanya, nilai mendekati 500 karakter.</string>
     <string name="toast_visibility_changed">Visibilitas kutipan telah diubah untuk akun %1$s</string>
@@ -261,13 +274,14 @@
     <string name="set_notif_follow_share">Beritahu ketika seseorang meningkatkan status Anda</string>
     <string name="set_notif_follow_add">Beritahu ketika seseorang menyukai status Anda</string>
     <string name="set_notif_follow_mention">Beritahu ketika seseorang menyebut Anda</string>
-    <string name="set_notif_follow_poll">Notify when a poll ended</string>
+    <string name="set_notif_follow_poll">Beritahu ketika pemilihan berakhir</string>
     <string name="set_share_validation">Tampilkan dialog konfirmasi sebelum meningkatkan</string>
     <string name="set_share_validation_fav">Tampilkan dialog konfirmasi sebelum menambahkan ke favorit</string>
     <string name="set_wifi_only">Beritahu hanya di WIFI</string>
     <string name="set_notify">Memberitahu?</string>
     <string name="set_notif_silent">Diamkan pemberitahuan</string>
     <string name="set_nsfw_timeout">Lihat NSFW waktu habis (detik, 0 berarti mati)</string>
+    <string name="set_med_desc_timeout">Waktu Keterangan Media habis (detik, 0 berarti mati)</string>
     <string name="settings_title_profile">Ubah profil</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -276,7 +290,7 @@
     <string name="set_save_changes">Simpan perubahan</string>
     <string name="set_header_picture_overlay">Pilih gambar header</string>
     <string name="set_fit_preview">Fit preview images</string>
-    <string name="set_automatically_split_toot">Automatically split toots in replies when chars are over:</string>
+    <string name="set_automatically_split_toot">Pisah toots secara otomatis di balasan ketika karakter lebih dari:</string>
     <string name="note_no_space">Kamu telah mencapai 160 karakter yang diizinkan!</string>
     <string name="username_no_space">Kamu telah mencapai 30 karakter yang diizinkan!</string>
     <string name="settings_time_from">Antara</string>
@@ -286,15 +300,10 @@
     <string name="settings_hour_init">Waktu mulai</string>
     <string name="settings_hour_end">Waktu akhir</string>
     <string name="embedded_browser">Gunakan browser built-in</string>
-    <string name="custom_tabs">Custom tabs</string>
+    <string name="custom_tabs">Tab kustom</string>
     <string name="use_javascript">Aktifkan Javascript</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="use_cookies">Izinkan cookie pihak ketiga</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Tidak</item>
-    </string-array>
     <string name="your_api_key">Your API key, you can leave blank for Yandex</string>
     <string-array name="settings_theme">
         <item>Dark</item>
@@ -936,6 +945,9 @@ https://yandex.ru/legal/confidential/?lang=en
     <plurals name="number_of_vote">
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1008,6 +1020,8 @@ https://yandex.ru/legal/confidential/?lang=en
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1041,4 +1055,45 @@ https://yandex.ru/legal/confidential/?lang=en
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0fa130125..57e73f21e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d o</string>
     <string name="date_day">%d g</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d secondo</item>
+        <item quantity="other">%d secondi</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minuto</item>
+        <item quantity="other">%d minuti</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d ora</item>
+        <item quantity="other">%d ore</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d giorno</item>
+        <item quantity="other">%d giorni</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Attenzione</string>
     <string name="toot_placeholder">Cosa ti passa per la mente?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">ha ricondiviso il tuo stato</string>
     <string name="notif_favourite">ha messo tra i preferiti il tuo stato</string>
     <string name="notif_follow">ti segue</string>
+    <string name="notif_follow_request">ha richiesto di seguirti</string>
     <plurals name="other_notifications">
         <item quantity="one">e un\'altra notifica</item>
         <item quantity="other">e %d altre notifiche</item>
@@ -269,7 +286,8 @@
     <string name="set_wifi_only">Notifica solo in WIFI</string>
     <string name="set_notify">Notifica?</string>
     <string name="set_notif_silent">Notifiche silenziose</string>
-    <string name="set_nsfw_timeout">Timeout visualizzazione NSFW (secondi, 0 significa spento)</string>
+    <string name="set_nsfw_timeout">Timeout visualizzazione NSFW (secondi, 0 significa disattivato)</string>
+    <string name="set_med_desc_timeout">Timeout descrizione media (secondi, 0 significa disattivato)</string>
     <string name="settings_title_profile">Modifica profilo</string>
     <string name="settings_title_custom_sharing">Condivisione personalizzata</string>
     <string name="settings_custom_sharing_url">L\'URL della tua condivisione personalizzata&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Abilita Javascript</string>
     <string name="expand_cw">Espandi automaticamente cw</string>
     <string name="use_cookies">Permetti cookie di terze-parti</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>No</item>
-    </string-array>
     <string name="your_api_key">La tua chiave API, puoi lasciarla vuota per Yandex</string>
     <string-array name="settings_theme">
         <item>Scuro</item>
@@ -937,6 +950,10 @@
         <item quantity="one">%d voto</item>
         <item quantity="other">%d voti</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d votante</item>
+        <item quantity="other">%d votanti</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Scelta singola</item>
         <item>Scelta multipla</item>
@@ -1009,6 +1026,8 @@
     <string name="link_color_title">Collegamenti</string>
     <string name="link_color">Cambiare il colore dei collegamenti (URL, menzioni, etichette, ecc.) nei messaggi</string>
     <string name="boost_header_color_title">Intestazione dei reblog</string>
+    <string name="displayname_title">Cambia il colore del nome visualizzato nella parte superiore dei messaggi</string>
+    <string name="username_title">Cambia il colore del nome utente nella parte superiore dei messaggi</string>
     <string name="boost_header_color">Cambia il colore dell\'intestazione per i reblog</string>
     <string name="background_status_title">Messaggi</string>
     <string name="background_status">Colore di sfondo dei messaggi nelle timeline</string>
@@ -1020,26 +1039,67 @@
     <string name="pin_tag">Metti etichetta in evidenza</string>
     <string name="logo_of_the_instance">Logo dell\'istanza</string>
     <string name="edit_profile">Modifica profilo</string>
-    <string name="make_an_action">Make an action</string>
+    <string name="make_an_action">Scegli un\'azione</string>
     <string name="translation">Traduzione</string>
     <string name="image_preview">Anteprima immagine</string>
     <string name="text_color_title">Colore del testo</string>
-    <string name="text_color">Change the text color in pots</string>
+    <string name="text_color">Cambia il colore del testo nei riquadri</string>
     <string name="apply_changes">Applica le modifiche</string>
     <string name="restart_message">È necessario riavviare l\'applicazione per applicare le modifiche</string>
     <string name="restart">Riavvia</string>
-    <string name="pref_custom_theme">Use a custom theme</string>
-    <string name="pref_custom_theme_summary">Allow to override colors of the  selected theme above</string>
-    <string name="theming">Theming</string>
-    <string name="store_before">Store before</string>
-    <string name="data_export_theme">The theme was exported</string>
-    <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
-    <string name="pref_colored_status_bar_summary">Apply the primary color to the status bar</string>
-    <string name="pref_colored_status_bar_title">Status bar color</string>
-    <string name="restore_default_theme">Restore a default theme</string>
-    <string name="import_theme">Import a theme</string>
-    <string name="import_theme_title">Tap here to import a theme from a previous export</string>
-    <string name="export_theme">Export the theme</string>
-    <string name="export_theme_title">Tap here to export the current theme</string>
-    <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="pref_custom_theme">Usa un tema personalizzato</string>
+    <string name="pref_custom_theme_summary">Permetti di non tenere conto dei colori del tema selezionato sopra</string>
+    <string name="theming">Temi</string>
+    <string name="store_before">Archivia prima</string>
+    <string name="data_export_theme">Il tema è stato esportato</string>
+    <string name="data_export_theme_success">Il tema è stato esportato correttamente in CSV</string>
+    <string name="pref_colored_status_bar_summary">Applica il colore primario alla barra di stato</string>
+    <string name="pref_colored_status_bar_title">Colore della barra di stato</string>
+    <string name="restore_default_theme">Ripristina un tema predefinito</string>
+    <string name="import_theme">Importa un tema</string>
+    <string name="import_theme_title">Premi qui per importare un tema da un\'esportazione precedente</string>
+    <string name="export_theme">Esporta il tema</string>
+    <string name="export_theme_title">Premi qui per esportare il tema corrente</string>
+    <string name="theme_file_error">Si è verificato un errore durante la selezione del file di tema</string>
+    <string name="label_theme_picker">Selettore Tema</string>
+    <string name="pref_theme_summary">Seleziona un tema preinstallato</string>
+    <string name="pref_theme_title">Temi</string>
+    <string name="pref_colored_navigation_bar_summary">Applica il colore primario alla barra di navigazione</string>
+    <string name="pref_colored_navigation_bar_title">Colore della barra di navigazione</string>
+    <string name="pref_background_color_summary">Colore sottostante al contenuto dell\'app.</string>
+    <string name="pref_background_color_title">Colore di sfondo</string>
+    <string name="pref_accent_color_summary">Colori in tinta per alcune parti dell\'interfaccia.</string>
+    <string name="pref_accent_color_title">Colore in tinta</string>
+    <string name="pref_primary_color_summary">Visualizzati più di frequente nella tua applicazione.</string>
+    <string name="pref_primary_color_title">Colore primario</string>
+    <string name="export_bookmarks">Esporta segnalibri nell\'istanza</string>
+    <string name="import_bookmarks">Importa segnalibri dall\'istanza</string>
+    <string name="user_count">Numero di utenti</string>
+    <string name="status_count">Numero di stati</string>
+    <string name="instance_count">Numero di istanze</string>
+    <string name="blocked">Bloccati</string>
+    <string name="poll_finish_in">Termina tra %s</string>
+    <string name="release_note_title">Cosa c\'è di nuovo nella %s</string>
+    <string name="follow_account_update">Puoi seguire il mio account per gli aggiornamenti</string>
+    <string name="no_instance_reccord">Questa istanza non è disponibile su https://instances.social</string>
+    <string name="display_full_link">Mostra collegamento completo</string>
+    <string name="share_link">Condividi collegamento</string>
+    <string name="link_copy">L\'URL è stato copiato negli appunti</string>
+    <string name="open_other_app">Apri con un\'altra app</string>
+    <string name="check_redirect">Controlla reindirizzamento</string>
+    <string name="no_redirect">Questo URL non reindirizza</string>
+    <string name="redirect_detected">%1$s \n\nreindirizza verso\n\n %2$s</string>
+    <string name="set_user_agent">Cambia l\'agente dell\'utente</string>
+    <string name="set_user_agent_hint">Imposta un agente utente personalizzato o lascia vuoto</string>
+    <string name="set_user_agent_indication">Permetti la personalizzazione dell\'agente utente utilizzata per le chiamate dell\'API o con il browser integrato.</string>
+    <string name="set_utm_parameters">Rimuovi parametri UTM</string>
+    <string name="set_utm_parameters_indication">L\'app rimuoverà automaticamente i parametri UTM dagli URL prima di aprire un collegamento.</string>
+    <string name="action_trends">Tendenze</string>
+    <string name="trending_now">Di tendenza ora</string>
+    <string name="talking_about">%d persone ne parlano</string>
+    <string name="twitter_accounts">Account Twitter (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Nomi utente Twitter separati da spazio</string>
+    <string name="identity_proofs">Prove d\'identità</string>
+    <string name="verified_user">Identità verificata</string>
+    <string name="verified_by">Verificata da %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index bde250862..461523ab6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -126,6 +126,18 @@
     <string name="date_minutes">%d 分</string>
     <string name="date_hours">%d 時間</string>
     <string name="date_day">%d 日</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="other">%d秒</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="other">%d分</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="other">%d時間</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="other">%d日</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">警告</string>
     <string name="toot_placeholder">今なにしてる？</string>
@@ -198,6 +210,7 @@
     <string name="notif_reblog">がブーストしました</string>
     <string name="notif_favourite">がお気に入りに登録しました</string>
     <string name="notif_follow">があなたをフォローしました</string>
+    <string name="notif_follow_request">フォローリクエストが来ています</string>
     <plurals name="other_notifications">
         <item quantity="other">別の通知</item>
     </plurals>
@@ -267,7 +280,8 @@
     <string name="set_wifi_only">WIFI接続時のみ通知</string>
     <string name="set_notify">通知する</string>
     <string name="set_notif_silent">サイレント通知</string>
-    <string name="set_nsfw_timeout">NSFWビューのタイムアウト(秒、0でオフ)</string>
+    <string name="set_nsfw_timeout">NSFW表示のタイムアウト(単位は秒、0でオフ)</string>
+    <string name="set_med_desc_timeout">メディアの説明のタイムアウト(単位は秒、0でオフ)</string>
     <string name="settings_title_profile">プロフィールを編集</string>
     <string name="settings_title_custom_sharing">カスタム共有</string>
     <string name="settings_custom_sharing_url">カスタム共有URL&#8230;</string>
@@ -290,11 +304,6 @@
     <string name="use_javascript">Javascript を有効にする</string>
     <string name="expand_cw">CWを自動的に展開する</string>
     <string name="use_cookies">サードパーティのCookieを許可する</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>いいえ</item>
-    </string-array>
     <string name="your_api_key">あなたのAPIキーを入力するか、Yandex向けに空欄にすることもできます</string>
     <string-array name="settings_theme">
         <item>ダーク</item>
@@ -927,6 +936,9 @@
     <plurals name="number_of_vote">
         <item quantity="other">%d票</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="other">%d票</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>単一の選択</item>
         <item>複数の選択</item>
@@ -969,7 +981,7 @@
     <string name="set_nitter_indication">Nitterはプライバシーに重点を置いたオープンソースのTwitter代替フロントエンドです。</string>
     <string name="set_nitter_host">カスタムホストを入力してください。空欄にするとnitter.netが使用されます。</string>
     <string name="set_hide_status_bar">通知バーからFedilabを非表示にする</string>
-    <string name="set_hide_status_bar_indication">ステータスバーに残っている通知を非表示にするには、目のアイコンをタップして「ステータスバーに表示する」のチェックを外します</string>
+    <string name="set_hide_status_bar_indication">ステータスバー上の通知を非表示にするには、目のアイコンボタンをタップして「ステータスバーに表示する」のチェックを外します</string>
     <string name="set_live_type_indication">通知は30秒ごとに遅延が発生します。バッテリーの持ちが改善します。</string>
     <string name="live_delayed">遅延ありのライブ通知</string>
     <string name="no_live_notif">ライブ通知なし</string>
@@ -996,39 +1008,82 @@
     <string name="join_peertube">Peertubeに参加</string>
     <string name="agreement_check_peertube">私は16歳以上で、インスタンスの %1$s に同意します。</string>
     <string name="link_color_title">リンク</string>
-    <string name="link_color">メッセージ内のリンク(URL、メンション、タグなど)の色を変更する</string>
+    <string name="link_color">メッセージ内のリンク(URL、メンション、タグなど)の色を変更します</string>
     <string name="boost_header_color_title">ブーストヘッダー</string>
-    <string name="boost_header_color">ブースト時のヘッダーの色を変更する</string>
+    <string name="displayname_title">メッセージ一番上の表示名の色を変更します</string>
+    <string name="username_title">メッセージ一番上のユーザー名の色を変更します</string>
+    <string name="boost_header_color">ブーストのヘッダーの色を変更します</string>
     <string name="background_status_title">投稿</string>
     <string name="background_status">タイムライン上の投稿の背景色</string>
     <string name="reset_color">色をリセット</string>
-    <string name="clik_reset">ここをタップして色のカスタマイズを初期化する</string>
+    <string name="clik_reset">ここをタップしてすべての色のカスタマイズをリセットします</string>
     <string name="reset">リセット</string>
     <string name="icons_color_title">アイコン</string>
-    <string name="icons_color">タイムラインの下部アイコンの色</string>
-    <string name="pin_tag">Pin this tag</string>
-    <string name="logo_of_the_instance">Logo of the instance</string>
-    <string name="edit_profile">Edit profile</string>
-    <string name="make_an_action">Make an action</string>
-    <string name="translation">Translation</string>
-    <string name="image_preview">Image preview</string>
-    <string name="text_color_title">Text color</string>
-    <string name="text_color">Change the text color in pots</string>
-    <string name="apply_changes">Apply changes</string>
-    <string name="restart_message">You need to restart the application to apply changes</string>
-    <string name="restart">Restart</string>
-    <string name="pref_custom_theme">Use a custom theme</string>
-    <string name="pref_custom_theme_summary">Allow to override colors of the  selected theme above</string>
-    <string name="theming">Theming</string>
-    <string name="store_before">Store before</string>
-    <string name="data_export_theme">The theme was exported</string>
-    <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
-    <string name="pref_colored_status_bar_summary">Apply the primary color to the status bar</string>
-    <string name="pref_colored_status_bar_title">Status bar color</string>
-    <string name="restore_default_theme">Restore a default theme</string>
-    <string name="import_theme">Import a theme</string>
-    <string name="import_theme_title">Tap here to import a theme from a previous export</string>
-    <string name="export_theme">Export the theme</string>
-    <string name="export_theme_title">Tap here to export the current theme</string>
-    <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="icons_color">投稿下部にあるアイコンの色</string>
+    <string name="pin_tag">このタグをピン留め</string>
+    <string name="logo_of_the_instance">インスタンスのロゴ</string>
+    <string name="edit_profile">プロフィールを編集</string>
+    <string name="make_an_action">アクションを作成</string>
+    <string name="translation">翻訳</string>
+    <string name="image_preview">画像のプレビュー</string>
+    <string name="text_color_title">テキストの色</string>
+    <string name="text_color">投稿内のテキストの色を変更します</string>
+    <string name="apply_changes">変更を適用</string>
+    <string name="restart_message">変更を反映するにはアプリケーションを再起動する必要があります。</string>
+    <string name="restart">再起動</string>
+    <string name="pref_custom_theme">カスタムテーマの使用</string>
+    <string name="pref_custom_theme_summary">上で選択したテーマの色の上書きを許可します</string>
+    <string name="theming">テーマ設定</string>
+    <string name="store_before">先に保存</string>
+    <string name="data_export_theme">テーマをエクスポートしました</string>
+    <string name="data_export_theme_success">テーマをCSVファイルにエクスポートしました</string>
+    <string name="pref_colored_status_bar_summary">プライマリカラーをステータスバーに使用する</string>
+    <string name="pref_colored_status_bar_title">ステータスバーの色</string>
+    <string name="restore_default_theme">デフォルトテーマを復元</string>
+    <string name="import_theme">テーマのインポート</string>
+    <string name="import_theme_title">ここをタップして以前エクスポートしたテーマをインポートします</string>
+    <string name="export_theme">テーマのエクスポート</string>
+    <string name="export_theme_title">ここをタップして現在のテーマをエクスポートします</string>
+    <string name="theme_file_error">テーマファイルの選択中にエラーが発生しました</string>
+    <string name="label_theme_picker">テーマ選択</string>
+    <string name="pref_theme_summary">内蔵のテーマを選択</string>
+    <string name="pref_theme_title">テーマ</string>
+    <string name="pref_colored_navigation_bar_summary">ナビゲーションバーにプライマリカラーを適用します</string>
+    <string name="pref_colored_navigation_bar_title">ナビゲーションバーの色</string>
+    <string name="pref_background_color_summary">アプリ内コンテンツの背景色</string>
+    <string name="pref_background_color_title">背景色</string>
+    <string name="pref_accent_color_summary">UIのアクセント部分の色を選択します。</string>
+    <string name="pref_accent_color_title">アクセントカラー</string>
+    <string name="pref_primary_color_summary">アプリ内で最も使用される色です。</string>
+    <string name="pref_primary_color_title">プライマリカラー</string>
+    <string name="export_bookmarks">そのインスタンスにブックマークをエクスポート</string>
+    <string name="import_bookmarks">このインスタンスからブックマークをインポート</string>
+    <string name="user_count">ユーザー数</string>
+    <string name="status_count">トゥート数</string>
+    <string name="instance_count">インスタンス数</string>
+    <string name="blocked">ブロック済み</string>
+    <string name="poll_finish_in">%sで終了</string>
+    <string name="release_note_title">%sの新機能</string>
+    <string name="follow_account_update">私のアカウントをフォローすると新機能をチェックできます</string>
+    <string name="no_instance_reccord">このインスタンスは https://instances.social 上で利用できません</string>
+    <string name="display_full_link">リンクを省略せずに表示</string>
+    <string name="share_link">リンクを共有</string>
+    <string name="link_copy">URLをクリップボードにコピーしました</string>
+    <string name="open_other_app">別のアプリで開く</string>
+    <string name="check_redirect">リダイレクト先を確認する</string>
+    <string name="no_redirect">このURLはリダイレクトではありません</string>
+    <string name="redirect_detected">%1$s\n\nは\n\n%2$sにリダイレクトしています</string>
+    <string name="set_user_agent">ユーザエージェントを変更</string>
+    <string name="set_user_agent_hint">カスタムのユーザーエージェントを設定するか、空欄にしておいてください</string>
+    <string name="set_user_agent_indication">APIの呼び出しやアプリ内ブラウザで使用するユーザーエージェントをカスタマイズできます</string>
+    <string name="set_utm_parameters">UTMパラメータを削除</string>
+    <string name="set_utm_parameters_indication">リンクを開く前に自動的にURLからUTMパラメータを取り除きます。</string>
+    <string name="action_trends">トレンド</string>
+    <string name="trending_now">トレンド</string>
+    <string name="talking_about">%d人が話題にしています</string>
+    <string name="twitter_accounts">Twitterアカウント(via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitterのユーザー名をスペースで区切って入力</string>
+    <string name="identity_proofs">身分証明</string>
+    <string name="verified_user">認証済み</string>
+    <string name="verified_by">%1$s(%2$s)によって認証されました</string>
 </resources>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 0c36a5fdf..5df7d38f6 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Acaγli</string>
     <string name="toot_placeholder">What is on your mind?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">boosted your status</string>
     <string name="notif_favourite">favourited your status</string>
     <string name="notif_follow">i ḍferek id</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">and another notification</item>
         <item quantity="other">and %d other notifications</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Notify?</string>
     <string name="set_notif_silent">Silent Notifications</string>
     <string name="set_nsfw_timeout">NSFW view timeout (seconds, 0 means off)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Zreg alegdis</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Enable Javascript</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="use_cookies">Allow third-party cookies</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Ala</item>
-    </string-array>
     <string name="your_api_key">Your API key, you can leave blank for Yandex</string>
     <string-array name="settings_theme">
         <item>Tebrek</item>
@@ -937,6 +950,10 @@
         <item quantity="one">%d vote</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1009,6 +1026,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1042,4 +1061,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index f10937275..e5fa812f0 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -126,6 +126,18 @@
     <string name="date_minutes">%d 분</string>
     <string name="date_hours">%d 시</string>
     <string name="date_day">%d 일</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">경고</string>
     <string name="toot_placeholder">무슨 생각을 하고 있나요?</string>
@@ -198,6 +210,7 @@
     <string name="notif_reblog">당신의 게시물을 부스트 했습니다</string>
     <string name="notif_favourite">당신의 상태를 마음에 들어했습니다</string>
     <string name="notif_follow">당신을 팔로우 했습니다</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="other">그리고 %d개의 다른 알림</item>
     </plurals>
@@ -268,6 +281,7 @@
     <string name="set_notify">일림?</string>
     <string name="set_notif_silent">Silent Notifications</string>
     <string name="set_nsfw_timeout">NSFW 보는 시간(초, 0 = 비활성화)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">프로필 수정</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -290,11 +304,6 @@
     <string name="use_javascript">자바스크립트 활성화</string>
     <string name="expand_cw">CW를 자동으로 펼침</string>
     <string name="use_cookies">서드파티 쿠키 허용</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>아니오</item>
-    </string-array>
     <string name="your_api_key">API 키, Yandex에 대해 공백으로 남겨 둘 수 있습니다</string>
     <string-array name="settings_theme">
         <item>어두움</item>
@@ -934,6 +943,9 @@
     <plurals name="number_of_vote">
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1006,6 +1018,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1039,4 +1053,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 7812142e5..9dd657de4 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com-->
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
     <string name="navigation_drawer_open">മെനു തുറക്കുക</string>
     <string name="navigation_drawer_close">മെനു അടയ്ക്കുക</string>
     <string name="action_about">വിവരം</string>
     <string name="action_about_instance">ഇതിനെക്കുറിച്ചുള്ള വിവരങ്ങൾ</string>
     <string name="action_privacy">സ്വകാര്യത</string>
-    <string name="action_cache">Cache</string>
+    <string name="action_cache">കാഷേ</string>
     <string name="action_logout">പുറത്തിറങ്ങുക</string>
     <string name="login">അകത്തു കയറുക</string>
     <!-- common -->
@@ -14,10 +15,10 @@
     <string name="no">വേണ്ട</string>
     <string name="cancel">റദ്ദാക്കുക</string>
     <string name="download">ഇറക്കിവെക്കുക</string>
-    <string name="download_file">Download %1$s</string>
+    <string name="download_file">ഡൗൺലോഡ് %1$s</string>
     <string name="save_over">മാധ്യമം സൂക്ഷിക്കപ്പെട്ടിരിക്കുന്നു</string>
     <string name="download_from" formatted="false">ഫയൽ %1$s</string>
-    <string name="password">Password</string>
+    <string name="password">രഹസ്യവാക്ക്</string>
     <string name="email">ഇമെയിൽ</string>
     <string name="accounts">അക്കൗണ്ടുകൾ</string>
     <string name="toots">ടൂട്ടുകൾ</string>
@@ -26,7 +27,7 @@
     <string name="restore">പുനഃസ്ഥാപിക്കുക</string>
     <string name="no_result">ഫലങ്ങൾ ഇല്ല!</string>
     <string name="instance">പതിപ്പ്</string>
-    <string name="instance_example">പതിപ്പ്: മാസ്റ്റോഡോൺ.സോഷ്യൽ</string>
+    <string name="instance_example">പതിപ്പ്: mastodon.social</string>
     <string name="toast_account_changed" formatted="false">ഇപ്പോൾ അക്കൗണ്ടിന്റെ കൂടെ പ്രവർത്തിക്കുന്നു %1$s</string>
     <string name="add_account">ഒരു അക്കൗണ്ട് ചേർക്കുക</string>
     <string name="clipboard">ഈ ടൂട്ടിന്റെ ഉള്ളടക്കം ക്ലിപ്ബോർഡിലേക്ക് പകർത്തിയിരിക്കുന്നു</string>
@@ -73,14 +74,14 @@
     <string name="follow_request">പിന്തുടരാൻ ഉള്ള അഭ്യർത്ഥനകൾ</string>
     <string name="settings">ക്രമീകരണങ്ങള്‍</string>
     <string name="delete_account_title">അക്കൗണ്ട് ഇല്ലാതാക്കുക</string>
-    <string name="delete_account_message" formatted="false">Delete the account %1$s from the application?</string>
+    <string name="delete_account_message" formatted="false">ഈ അപ്പ്ളിക്കേഷനിൽ നിന്നും %1$s അക്കൗണ്ട് നീക്കം ചെയ്യട്ടെ?</string>
     <string name="send_email">ഇ മെയിൽ അയക്കൂ</string>
     <string name="click_to_change">മാറ്റണമെങ്കിൽ ഇവിടെ ക്ലിക്ക് ചെയ്യൂ</string>
     <string name="failed">പരാജയപ്പെട്ടു!</string>
     <string name="scheduled_toots">മുൻകൂട്ടി നിശ്ചയിച്ച സമയപ്രകാരം ഉള്ള ടൂട്ടുകൾ</string>
-    <string name="disclaimer_full">Information below may reflect the user\'s profile incompletely.</string>
+    <string name="disclaimer_full">താഴെ കൊടുത്തിരിക്കുന്ന വിവരങ്ങൾ ഈ ഉപയോക്താവിന്റെ പ്രൊഫൈൽ അപൂർണ്ണമായി പ്രതിഫലിപ്പിക്കുന്നു.</string>
     <string name="insert_emoji">ഇമോജി ഇടൂ</string>
-    <string name="no_emoji">The app did not collect custom emojis for the moment.</string>
+    <string name="no_emoji">ഈ ആപ് ഇപ്പോൾ വ്യക്തി അധിഷ്ഠിത ഇമോജികൾ സ്വീകരിക്കുന്നതല്ല.</string>
     <string name="live_notif">തത്സമയ അറിയിപ്പുകൾ</string>
     <!-- Status -->
     <string name="no_status">പ്രദർശിപ്പിക്കാൻ ടൂട്ടുകൾ ഇല്ല</string>
@@ -104,142 +105,159 @@
         <item>ഈ അക്കൗണ്ട് നിശബ്ദമാക്കട്ടെ?</item>
         <item>ഈ അക്കൗണ്ട് തടയട്ടെ?</item>
         <item>ഈ ടൂട്ടിനെ റിപ്പോർട്ട് ചെയ്യട്ടെ?</item>
-        <item>Block this domain?</item>
-        <item>Unmute this account?</item>
+        <item>ഈ ഡൊമെയിൻ തടയട്ടെ?</item>
+        <item>ഈ അക്കൗണ്ട് ശബ്ദിക്കട്ടെ?</item>
     </string-array>
     <string-array name="action_notification">
-        <item>Notify</item>
-        <item>Silent</item>
+        <item>അറിയിക്കുക</item>
+        <item>നിശബ്‌ദം</item>
     </string-array>
     <string-array name="more_action_owner_confirm">
-        <item>Remove this toot?</item>
-        <item>Delete &amp; re-draft this toot?</item>
+        <item>ഈ ടൂട്ടിനെ നീക്കം ചെയ്യട്ടെ?</item>
+        <item>ഈ ടൂത്ത് മായ്ച്ചു കളഞ്ഞു ആദ്യമേ എഴുതട്ടെ?</item>
     </string-array>
-    <string name="bookmarks">Bookmarks</string>
-    <string name="bookmark_add">Add to bookmarks</string>
-    <string name="bookmark_remove">Remove bookmark</string>
-    <string name="bookmarks_empty">No bookmarks to display</string>
-    <string name="status_bookmarked">Status has been added to bookmarks!</string>
-    <string name="status_unbookmarked">Status was removed from bookmarks!</string>
+    <string name="bookmarks">ബുക്ക്മാർക്കുകൾ</string>
+    <string name="bookmark_add">ബുക്ക്‌മാർക്കിലേക്ക് ചേർക്കൂ</string>
+    <string name="bookmark_remove">ബുക്ക്മാർക്ക് നീക്കംചെയ്യുക</string>
+    <string name="bookmarks_empty">പ്രദർശിപ്പിക്കാൻ ബുക്ക്മാർക്കുകൾ ഇല്ല</string>
+    <string name="status_bookmarked">സ്റ്റാറ്റസ് ബുക്ക്മാർക്ക് ചെയ്യപ്പെട്ടിരിക്കുന്നു!</string>
+    <string name="status_unbookmarked">സ്റ്റാറ്റസ് ബുക്മാർക്കുകളിൽ നിന്ന് നീക്കം ചെയ്യപ്പെട്ടിരിക്കുന്നു!</string>
     <!-- Date -->
-    <string name="date_seconds">%d s</string>
-    <string name="date_minutes">%d m</string>
-    <string name="date_hours">%d h</string>
-    <string name="date_day">%d d</string>
+    <string name="date_seconds">%d സെ</string>
+    <string name="date_minutes">%d മി</string>
+    <string name="date_hours">%d ഹ</string>
+    <string name="date_day">%d ഡേ</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
-    <string name="toot_cw_placeholder">Warning</string>
-    <string name="toot_placeholder">What is on your mind?</string>
-    <string name="toot_it">TOOT!</string>
-    <string name="queet_it">QUEET!</string>
-    <string name="cw">cw</string>
-    <string name="toot_title">Write a toot</string>
-    <string name="toot_title_reply">Reply to a toot</string>
-    <string name="queet_title">Write a queet</string>
-    <string name="queet_title_reply">Reply to a queet</string>
-    <string name="toot_select_image">Select a media</string>
-    <string name="toot_select_image_error">An error occurred while selecting the media!</string>
-    <string name="toot_delete_media">Delete this media?</string>
-    <string name="toot_error_no_content">Your toot is empty!</string>
-    <string name="toot_visibility_tilte">Visibility of the toot</string>
-    <string name="toots_visibility_tilte">Visibility of the toots by default: </string>
-    <string name="toot_sent">The toot has been sent!</string>
-    <string name="toot_reply_content_title">You are replying to this toot:</string>
-    <string name="toot_sensitive">Sensitive content?</string>
+    <string name="toot_cw_placeholder">മുന്നറിയിപ്പ്</string>
+    <string name="toot_placeholder">നിങ്ങളുടെ മനസ്സിൽ എന്താണ്?</string>
+    <string name="toot_it">ടൂട്ട്!</string>
+    <string name="queet_it">ക്വീറ്റ്!</string>
+    <string name="cw">മുന്നറിയിപ്പ് എഴുതൂ</string>
+    <string name="toot_title">ടൂട്ട് എഴുതൂ</string>
+    <string name="toot_title_reply">ടൂട്ടിന് മറുപടി എഴുതൂ</string>
+    <string name="queet_title">ക്വീറ്റ് എഴുതൂ</string>
+    <string name="queet_title_reply">ക്വീറ്റിന് മറുപടി എഴുതൂ</string>
+    <string name="toot_select_image">ഒരു മാധ്യമം തിരഞ്ഞെടുക്കൂ</string>
+    <string name="toot_select_image_error">മാധ്യമം തിരഞ്ഞെടുത്തതിൽ പിഴവ് പറ്റിയിരിക്കുന്നു!</string>
+    <string name="toot_delete_media">ഈ മാധ്യമം കളയട്ടെ?</string>
+    <string name="toot_error_no_content">താങ്കളുടെ ടൂട്ട് ശൂന്യമാണ്!</string>
+    <string name="toot_visibility_tilte">ടൂട്ടിന്റെ ദർശനീയത</string>
+    <string name="toots_visibility_tilte">ടൂട്ടിന്റെ മൗലികമായ ദർശനീയത: </string>
+    <string name="toot_sent">ടൂട്ട് അയക്കപ്പെട്ടിരിക്കുന്നു!</string>
+    <string name="toot_reply_content_title">തങ്ങൾ ഈ ടൂട്ടിനു മറുപടി എഴുതുകയാണ്:</string>
+    <string name="toot_sensitive">അസ്വസ്ഥമാക്കാമാകുന്ന ഉള്ളടക്കം?</string>
     <string-array name="toot_visibility">
-        <item>Post to public timelines</item>
-        <item>Do not post to public timelines</item>
-        <item>Post to followers only</item>
-        <item>Post to mentioned users only</item>
+        <item>പൊതു സമയ രേഖകളിലേക്ക് അയക്കുക</item>
+        <item>പൊതു സമയ രേഖകളിലേക്ക് അയക്കരുത്</item>
+        <item>പിന്തുടരുന്നവർക്ക് മാത്രം അയക്കുക</item>
+        <item>പരാമർശിക്കപ്പെട്ട ഉപയോക്താക്കൾക്ക് മാത്രം അയക്കുക</item>
     </string-array>
-    <string name="no_draft">No drafts!</string>
-    <string name="choose_toot">Choose a toot</string>
-    <string name="choose_accounts">Choose an account</string>
-    <string name="select_accounts">Select some accounts</string>
-    <string name="remove_draft">Remove draft?</string>
-    <string name="show_reply">Tap on the button to display the original toot</string>
-    <string name="upload_form_description">Describe for the visually impaired</string>
+    <string name="no_draft">ഡ്രാഫ്റ്റുകൾ ഇല്ല!</string>
+    <string name="choose_toot">ഒരു ടൂട്ട് തിരഞ്ഞെടുക്കുക</string>
+    <string name="choose_accounts">ഒരു അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക</string>
+    <string name="select_accounts">ചില അക്കൗണ്ടുകൾ തിരഞ്ഞെടുക്കൂ</string>
+    <string name="remove_draft">ഡ്രാഫ്റ്റ് നീക്കം ചെയ്യട്ടെ?</string>
+    <string name="show_reply">ഒറിജിനൽ ടൂട്ട് കാണാൻ ഈ ബട്ടണിൽ ഞെക്കൂ</string>
+    <string name="upload_form_description">കാഴ്ചശക്തി ഇല്ലാത്തവർക്ക് വേണ്ടി വിവരണം നൽകൂ</string>
     <!-- Instance -->
-    <string name="instance_no_description">No description available!</string>
+    <string name="instance_no_description">വിവരണം ലഭ്യമല്ല!</string>
     <!-- About -->
-    <string name="about_vesrion">Release %1$s</string>
-    <string name="about_developer">Developer:</string>
-    <string name="about_license">License: </string>
-    <string name="about_license_action">GNU GPL V3</string>
-    <string name="about_code">Source code: </string>
-    <string name="about_yandex">Translation of toots:</string>
-    <string name="about_thekinrar">Search instances:</string>
-    <string name="thanks_text_logo">Icon designer:</string>
+    <string name="about_vesrion">റിലീസ് %1$s</string>
+    <string name="about_developer">ഡെവലപ്പർ:</string>
+    <string name="about_license">ലൈസന്‍സ്: </string>
+    <string name="about_license_action">ഗ്നു ജി പി എൽ V3</string>
+    <string name="about_code">മൂലാധാരം: </string>
+    <string name="about_yandex">ടൂട്ടുകളുടെ മൊഴി മാറ്റം:</string>
+    <string name="about_thekinrar">പതിപ്പുകൾ തിരഞ്ഞു നോക്കൂ:</string>
+    <string name="thanks_text_logo">ചിഹ്നം രൂപകൽപന ചെയ്തത്:</string>
     <!-- Conversation -->
-    <string name="conversation">Conversation</string>
+    <string name="conversation">സംഭാഷണങ്ങൾ</string>
     <!-- Accounts -->
-    <string name="no_accounts">No account to display</string>
-    <string name="no_follow_request">No follow request</string>
-    <string name="status_cnt">Toots \n %1$s</string>
-    <string name="following_cnt">Following \n %1$s</string>
-    <string name="followers_cnt">Followers \n %1$s</string>
-    <string name="pins_cnt">Pinned \n %d</string>
-    <string name="authorize">Authorize</string>
-    <string name="reject">Reject</string>
+    <string name="no_accounts">പ്രദർശിപ്പിക്കാൻ അക്കൗണ്ട് ഇല്ല</string>
+    <string name="no_follow_request">പിന്തുടരാനുള്ള അഭ്യർത്ഥനകൾ ഇല്ല</string>
+    <string name="status_cnt">ടൂട്ട്സ് \n %1$s</string>
+    <string name="following_cnt">പിന്തുടരുന്നു \n %1$s</string>
+    <string name="followers_cnt">പിന്തുടർച്ചക്കാർ \n %1$s</string>
+    <string name="pins_cnt">പിൻ കുത്തി വച്ചിരിക്കുന്നു \n %d</string>
+    <string name="authorize">അംഗീകരണം</string>
+    <string name="reject">നിരാകരിക്കുക</string>
     <!-- Scheduled toots -->
-    <string name="no_scheduled_toots">No scheduled toots to display!</string>
-    <string name="no_scheduled_toots_indications">Write a toot and then choose <b>Schedule</b> from the top menu.</string>
-    <string name="remove_scheduled">Delete scheduled toot?</string>
-    <string name="media_count">Media: %d</string>
-    <string name="toot_scheduled">The toot has been scheduled!</string>
-    <string name="toot_scheduled_date">The scheduled date must be greater than the current hour!</string>
-    <string name="warning_battery">Battery saver is enabled! It might not work as expected.</string>
+    <string name="no_scheduled_toots">കാണിക്കാൻ സമയബന്ധിത ടൂട്ടുകൾ ഇല്ല!</string>
+    <string name="no_scheduled_toots_indications">ടൂട്ട് എഴുതിയ മുകളിൽ മെനുവിൽ നിന്ന് <b>ഷെഡ്യൂൾ</b> തിരഞ്ഞെടുക്കുക.</string>
+    <string name="remove_scheduled">സമയബന്ധിത ടൂട്ട് നീക്കം ചെയ്യട്ടെ?</string>
+    <string name="media_count">മാധ്യമം: %d</string>
+    <string name="toot_scheduled">ടൂട്ട് ഷെഡ്യൂൾ ചെയ്യപ്പെട്ടു!</string>
+    <string name="toot_scheduled_date">ഷെഡ്യൂൾ ചെയ്ത സമയം ഇപ്പോഴുള്ള സമയത്തേക്കാൾ വൈകി ആയിരിക്കണം!</string>
+    <string name="warning_battery">ബാറ്ററി സേവർ പ്രവർത്തിക്കുന്നു. ഉദ്ദേശിക്കുന്നത് പോലെ ഈ പ്രവർത്തി നടക്കണം എന്നില്ല.</string>
     <!-- timed mute -->
-    <string name="timed_mute_date_error">The time for muting should be greater than one minute.</string>
-    <string name="timed_mute_date">%1$s has been muted until %2$s.\n You can unmute this account from their profile page.</string>
-    <string name="timed_mute_profile">%1$s is muted until %2$s.\n Tap here to unmute the account.</string>
+    <string name="timed_mute_date_error">നിശ്ശബ്ദമാക്കാനുള്ള സമയം ഒരു മിനുട്ടിൽ കൂടുതൽ വേണം.</string>
+    <string name="timed_mute_date">%2$s വരെ %1$s നെ നിശ്ശബ്ദമാക്കിയിട്ടുണ്ട്. \n വേണമെങ്കിൽ ഈ അക്കൗണ്ടിനെ അവരുടെ പ്രൊഫൈൽ പേജിൽ നിന്ന് പഴയ പടി ആക്കാം.</string>
+    <string name="timed_mute_profile">%2$s വരെ %1$s നെ നിശ്ശബ്ദമാക്കിയിട്ടുണ്ട്. \n പഴയപടി ആക്കാൻ ഇവിടെ ഞെക്കൂ.</string>
     <!-- Notifications -->
-    <string name="no_notifications">No notification to display</string>
-    <string name="notif_mention">mentioned you</string>
-    <string name="notif_reblog">boosted your status</string>
-    <string name="notif_favourite">favourited your status</string>
-    <string name="notif_follow">followed you</string>
+    <string name="no_notifications">പ്രദർശിപ്പിക്കാൻ അറിയിപ്പുകൾ ഇല്ല</string>
+    <string name="notif_mention">താങ്കളെ പ്രതിപാദിച്ചിരിക്കുന്നു</string>
+    <string name="notif_reblog">തങ്ങളുടെ സ്റ്റാറ്റസ് ബൂസ്റ്റ് ചെയ്യപ്പെട്ടിരിക്കുന്നു</string>
+    <string name="notif_favourite">താങ്കളുടെ സ്റ്റാറ്റസ് പ്രിയപെട്ടവയിൽ ചേർത്തിരിക്കുന്നു</string>
+    <string name="notif_follow">നിങ്ങളെ പിന്തുടരുന്നു</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
-        <item quantity="one">and another notification</item>
+        <item quantity="one">മറ്റൊരു അറിയിപ്പ്</item>
         <item quantity="other">and %d other notifications</item>
     </plurals>
     <plurals name="likes">
-        <item quantity="one">%d like</item>
-        <item quantity="other">%d likes</item>
+        <item quantity="one">%d ഇഷ്ടം</item>
+        <item quantity="other">%d ഇഷ്ടം</item>
     </plurals>
-    <string name="delete_notification_ask">Delete a notification?</string>
-    <string name="delete_notification_ask_all">Delete all notifications?</string>
-    <string name="delete_notification">The notification has been deleted!</string>
-    <string name="delete_notification_all">All notifications have been deleted!</string>
+    <string name="delete_notification_ask">ഒരു അറിയിപ്പ് നീക്കം ചെയ്യട്ടെ?</string>
+    <string name="delete_notification_ask_all">എല്ലാ അറിയിപ്പുകളും നീക്കം ചെയ്യട്ടെ?</string>
+    <string name="delete_notification">അറിയിപ്പ് നീക്കം ചെയ്തിരിക്കുന്നു!</string>
+    <string name="delete_notification_all">എല്ലാ അറിയിപ്പുകളും നീക്കം ചെയ്തിരിക്കുന്നു!</string>
     <!-- HEADER -->
-    <string name="following">Following</string>
-    <string name="followers">Followers</string>
-    <string name="pinned_toots">Pinned</string>
+    <string name="following">പിന്തുടരുന്നു</string>
+    <string name="followers">അനുയായികൾ</string>
+    <string name="pinned_toots">പിൻ കുത്തി വച്ചിരിക്കുന്നു</string>
     <!-- TOAST -->
-    <string name="client_error">Unable to get client id!</string>
-    <string name="connect_error">Unable to connect to instance domain!</string>
-    <string name="no_internet">No Internet connection!</string>
-    <string name="toast_block">The account was blocked!</string>
-    <string name="toast_unblock">The account is no longer blocked!</string>
-    <string name="toast_mute">The account was muted!</string>
-    <string name="toast_unmute">The account is no longer muted!</string>
-    <string name="toast_follow">The account was followed!</string>
-    <string name="toast_unfollow">The account is no longer followed!</string>
-    <string name="toast_reblog">The toot was boosted!</string>
-    <string name="toast_unreblog">The toot is no longer boosted!</string>
-    <string name="toast_favourite">The toot was added to your favourites!</string>
-    <string name="toast_unfavourite">The toot was removed from your favourites!</string>
-    <string name="toast_report">The toot was reported!</string>
-    <string name="toast_unstatus">The toot was deleted!</string>
-    <string name="toast_pin">The toot was pinned!</string>
-    <string name="toast_unpin">The toot was unpinned!</string>
-    <string name="toast_error">Oops ! An error occurred!</string>
-    <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
-    <string name="toast_error_instance">The instance domain does not seem to be valid!</string>
-    <string name="toast_error_loading_account">An error occurred while switching between accounts!</string>
-    <string name="toast_error_search">An error occurred while searching!</string>
-    <string name="toast_update_credential_ok">The profile data have been saved!</string>
-    <string name="nothing_to_do">No action can be taken</string>
-    <string name="toast_saved">The media has been saved!</string>
+    <string name="client_error">ഉപയോക്താവിന്റെ ഐ ഡി എടുക്കാൻ സാധ്യമല്ല!</string>
+    <string name="connect_error">ഈ പതിപ്പിന്റെ ഡൊമെയിനിലേക്ക് ബന്ധപ്പെടുവാൻ സാധിക്കുന്നില്ല!</string>
+    <string name="no_internet">ഇന്റർനെറ്റ് കണക്ഷൻ ഇല്ല!</string>
+    <string name="toast_block">ഈ അക്കൗണ്ട് തടഞ്ഞിരുന്നു!</string>
+    <string name="toast_unblock">ഈ അക്കൗണ്ട് ഇനിമുതൽ തടയപ്പെടുന്നതല്ല!</string>
+    <string name="toast_mute">ഈ അക്കൗണ്ട് നിശ്ശബ്ദമാക്കിയിരുന്നു!</string>
+    <string name="toast_unmute">ഈ അക്കൗണ്ട് ഇനിമുതൽ നിശ്ശബ്ദമാക്കപ്പെടുന്നതല്ല!</string>
+    <string name="toast_follow">ഈ അക്കൗണ്ട് പിന്തുടരപ്പെട്ടിരുന്നു!</string>
+    <string name="toast_unfollow">ഈ അക്കൗണ്ട് ഇനിമുതൽ പിന്തുടരപ്പെടുന്നില്ല!</string>
+    <string name="toast_reblog">ഈ ടൂട്ടിനെ ബൂസ്റ്റ് ചെയ്തിരിക്കുന്നു!</string>
+    <string name="toast_unreblog">ഈ ടൂട്ട് ബൂസ്റ്റിൽ നിന്ന് മാറ്റിയിരിക്കുന്നു!</string>
+    <string name="toast_favourite">ഈ ടൂട്ടിനെ പ്രിയപ്പെട്ടവയിലേക്ക് ചേർത്തിരിക്കുന്നു!</string>
+    <string name="toast_unfavourite">ഈ ടൂട്ടിനെ പ്രിയപ്പെട്ടവയിൽ നിന്ന് മാറ്റിയിരിക്കുന്നു!</string>
+    <string name="toast_report">ഈ ടൂട്ടിനെ റിപ്പോർട് ചെയ്തിരിക്കുന്നു!</string>
+    <string name="toast_unstatus">ഈ ടൂട്ട് നീക്കം ചെയ്യപ്പെട്ടിരിക്കുന്നു!</string>
+    <string name="toast_pin">ഈ ടൂട്ട് പിൻ ചെയ്തിരിക്കുന്നു!</string>
+    <string name="toast_unpin">ഈ ടൂട്ട് പിൻ നീക്കം ചെയ്തിരിക്കുന്നു!</string>
+    <string name="toast_error">അയ്യോ! ഒരു പിഴവ് സംഭവിച്ചു!</string>
+    <string name="toast_code_error">ഒരു പിഴവ് സംഭവിച്ചു! ഈ പതിപ്പ് അടയാളവാക്യം തിരികെ തന്നില്ല!</string>
+    <string name="toast_error_instance">ഈ പതിപ്പിന്റെ മണ്ഡലം സാധുവല്ല!</string>
+    <string name="toast_error_loading_account">അക്കൗണ്ടുകൾ മാറ്റുമ്പോൾ ഒരു പിഴവ് സംഭവിച്ചു!</string>
+    <string name="toast_error_search">തിരയുമ്പോൾ ഒരു പിഴവ് സംഭവിച്ചു!</string>
+    <string name="toast_update_credential_ok">ഈ പ്രൊഫൈലിലെ വിവരങ്ങൾ സൂക്ഷിക്കപ്പെട്ടിരിക്കുന്നു!</string>
+    <string name="nothing_to_do">ഒരു നടപടിയും എടുക്കാൻ സാധ്യമല്ല</string>
+    <string name="toast_saved">മാധ്യമം സൂക്ഷിക്കപ്പെട്ടിരിക്കുന്നു!</string>
     <string name="toast_error_translate">An error occurred while translating!</string>
     <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
     <string name="toast_toot_saved">Draft saved!</string>
@@ -253,11 +271,11 @@
     <string name="set_attachment_action">Load the media</string>
     <string name="load_attachment">Load the pictures</string>
     <string name="load_attachment_spoiler">Show more…</string>
-    <string name="load_attachment_spoiler_less">Show less…</string>
-    <string name="load_sensitive_attachment">Sensitive content</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="load_attachment_spoiler_less">കുറച്ചു കാണിക്കുക…</string>
+    <string name="load_sensitive_attachment">അസ്വസ്ഥമാക്കാമാകുന്ന ഉള്ളടക്കം</string>
+    <string name="set_disable_gif">ജിഫ് അവതാരങ്ങൾ പ്രവർത്തനരഹിതമാക്കുക</string>
+    <string name="set_folder_title">വഴി: </string>
+    <string name="set_auto_store_toot">ഡ്രാഫ്റ്റുകൾ സ്വയമേ സൂക്ഷിക്കുക</string>
     <string name="set_auto_add_media_url">Add URL of media in toots</string>
     <string name="set_notif_follow">Notify when someone follows you</string>
     <string name="set_notif_follow_share">Notify when someone boosts your status</string>
@@ -270,6 +288,7 @@
     <string name="set_notify">Notify?</string>
     <string name="set_notif_silent">Silent Notifications</string>
     <string name="set_nsfw_timeout">NSFW view timeout (seconds, 0 means off)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Edit profile</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -292,11 +311,6 @@
     <string name="use_javascript">Enable Javascript</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="use_cookies">Allow third-party cookies</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>No</item>
-    </string-array>
     <string name="your_api_key">Your API key, you can leave blank for Yandex</string>
     <string-array name="settings_theme">
         <item>Dark</item>
@@ -582,9 +596,7 @@
         <item>1 day</item>
         <item>1 week</item>
     </string-array>
-    <string name="showcase_instance">        In this field, you need to write your instance host name.\nFor example, if you created your account on https://mastodon.social\nJust write <b>mastodon.social</b> (without https://)\n
-        You can start writing first letters and names will be suggested.\n\n
-        ⚠ The Login button will only work if the instance name is valid and the instance is up!
+    <string name="showcase_instance">In this field, you need to write your instance domain.\nFor example, if you created your account on https://mastodon.social\nJust write <b>mastodon.social</b>\nYou can start writing first letters and names will be suggested.
     </string>
     <string name="more_information">More information</string>
     <!-- languages not translated -->
@@ -937,6 +949,10 @@
         <item quantity="one">%d vote</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1009,6 +1025,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1042,4 +1060,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 696080caa..e3fcdaa8e 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d u</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Waarschuwing</string>
     <string name="toot_placeholder">Wat wil je kwijt?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">boostte jouw toot</string>
     <string name="notif_favourite">markeerde jouw toot als favoriet</string>
     <string name="notif_follow">volgt jou nu</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">en één andere melding</item>
         <item quantity="other">en %d andere meldingen</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Meldingen?</string>
     <string name="set_notif_silent">Stille meldingen</string>
     <string name="set_nsfw_timeout">Hoe lang gevoelige inhoud blijven tonen (in seconden, 0 is onbeperkt)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Profiel bewerken</string>
     <string name="settings_title_custom_sharing">Handmatig delen</string>
     <string name="settings_custom_sharing_url">Jouw handmatige deel-URL&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Javascript toegestaan</string>
     <string name="expand_cw">Automatisch tekstwaarschuwingen (cw) uitklappen</string>
     <string name="use_cookies">Cookies van derden accepteren</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Nee</item>
-    </string-array>
     <string name="your_api_key">Je hoeft geen API-sleutel voor Yandex te gebruiken</string>
     <string-array name="settings_theme">
         <item>Donker</item>
@@ -936,6 +949,10 @@ Je kunt beginnen met typen en er zullen namen gesuggereerd worden.\n\n
         <item quantity="one">%d stem</item>
         <item quantity="other">%d stemmen</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Enkele keus</item>
         <item>Meerdere keuzes</item>
@@ -1008,6 +1025,8 @@ Je kunt beginnen met typen en er zullen namen gesuggereerd worden.\n\n
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1041,4 +1060,45 @@ Je kunt beginnen met typen en er zullen namen gesuggereerd worden.\n\n
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 01681ba74..13f7bb7b2 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Innholdsadvarsel</string>
     <string name="toot_placeholder">Hva tenker du på?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">boostet tootet ditt</string>
     <string name="notif_favourite">favoriserte tootet ditt</string>
     <string name="notif_follow">fulgte deg</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">og et annet varsel</item>
         <item quantity="other">og %d andre varsler</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Varsle?</string>
     <string name="set_notif_silent">Dempede varslinger</string>
     <string name="set_nsfw_timeout">NSFW visningspause i sekunder (0 betyr ingen visningspause)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Rediger profil</string>
     <string name="settings_title_custom_sharing">Tilpasset deling</string>
     <string name="settings_custom_sharing_url">Din URL for tilpasset deling&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Aktiver Javascript</string>
     <string name="expand_cw">Utvid cw automatisk</string>
     <string name="use_cookies">Tillat cookies fra tredjeparter</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Nei</item>
-    </string-array>
     <string name="your_api_key">API-nøkkel, du kan la denne stå tom dersom Yandex benyttes</string>
     <string-array name="settings_theme">
         <item>Mørkt</item>
@@ -927,6 +940,10 @@ Adresser vil bli foreslått når du begynner å skrive.\n\n
         <item quantity="one">%d stemme</item>
         <item quantity="other">%d stemmer</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Ett valg</item>
         <item>Flere valg</item>
@@ -999,6 +1016,8 @@ Adresser vil bli foreslått når du begynner å skrive.\n\n
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1032,4 +1051,45 @@ Adresser vil bli foreslått når du begynner å skrive.\n\n
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 73e3d6d4d..2398bb5b5 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Warning</string>
     <string name="toot_placeholder">What is on your mind?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">boosted your status</string>
     <string name="notif_favourite">favourited your status</string>
     <string name="notif_follow">followed you</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">and another notification</item>
         <item quantity="other">and %d other notifications</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Notify?</string>
     <string name="set_notif_silent">Silent Notifications</string>
     <string name="set_nsfw_timeout">NSFW view timeout (seconds, 0 means off)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Edit profile</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Enable Javascript</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="use_cookies">Allow third-party cookies</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>No</item>
-    </string-array>
     <string name="your_api_key">Your API key, you can leave blank for Yandex</string>
     <string-array name="settings_theme">
         <item>Dark</item>
@@ -937,6 +950,10 @@
         <item quantity="one">%d vote</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1009,6 +1026,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1042,4 +1061,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ce2f57872..5019aae01 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -126,6 +126,30 @@
     <string name="date_minutes">%d min</string>
     <string name="date_hours">%d godz.</string>
     <string name="date_day">%d dni</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="few">%d seconds</item>
+        <item quantity="many">%d seconds</item>
+        <item quantity="other">%d sekundd</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minuta</item>
+        <item quantity="few">%d minuty</item>
+        <item quantity="many">%d minut</item>
+        <item quantity="other">%d minut</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d godzina</item>
+        <item quantity="few">%d godziny</item>
+        <item quantity="many">%d godzin</item>
+        <item quantity="other">%d godzin</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d dzień</item>
+        <item quantity="few">%d dni</item>
+        <item quantity="many">%d dni</item>
+        <item quantity="other">%d dni</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Ostrzeżenie</string>
     <string name="toot_placeholder">Co Ci chodzi po głowie?</string>
@@ -198,6 +222,7 @@
     <string name="notif_reblog">podbił twój wpis</string>
     <string name="notif_favourite">dodał(a) Twój wpis do ulubionych</string>
     <string name="notif_follow">zaczął(-ęła) Cię śledzić</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">dodaj %d innych powiadomień</item>
         <item quantity="few">dodaj %d innych powiadomień</item>
@@ -205,10 +230,10 @@
         <item quantity="other">dodaj %d innych powiadomień</item>
     </plurals>
     <plurals name="likes">
-        <item quantity="one">%d like</item>
-        <item quantity="few">%d likes</item>
-        <item quantity="many">%d likes</item>
-        <item quantity="other">%d likes</item>
+        <item quantity="one">%d polubienie</item>
+        <item quantity="few">%d polubienia</item>
+        <item quantity="many">%d polubień</item>
+        <item quantity="other">%d polubień</item>
     </plurals>
     <string name="delete_notification_ask">Czy na pewno chcesz usunąć to powiadomienie?</string>
     <string name="delete_notification_ask_all">Wyczyścić wszytstkie powiadomienia?</string>
@@ -220,7 +245,7 @@
     <string name="pinned_toots">Przypięte</string>
     <!-- TOAST -->
     <string name="client_error">Nie można pobrać identyfikatora klienta!</string>
-    <string name="connect_error">Unable to connect to instance domain!</string>
+    <string name="connect_error">Nie można połączyć się z domeną instancji!</string>
     <string name="no_internet">Brak połączenia z Internetem!</string>
     <string name="toast_block">Konto zostało zablokowane!</string>
     <string name="toast_unblock">Konto nie jest już zablokowane!</string>
@@ -245,7 +270,7 @@
     <string name="nothing_to_do">Żadna akcja nie może zostać podjęta</string>
     <string name="toast_saved">Zapisano zawartość multimedialną!</string>
     <string name="toast_error_translate">Tłumaczenie nieudane!</string>
-    <string name="toast_error_translations_disabled">Translations are disabled in settings</string>
+    <string name="toast_error_translations_disabled">Tłumaczenia są wyłączone w ustawieniach</string>
     <string name="toast_toot_saved">Zapisano szkic!</string>
     <string name="toast_error_char_limit">Czy na pewno ta instancja zezwala na więcej, niż domyślne 500 znaków?</string>
     <string name="toast_visibility_changed">Widoczność wpisu została zmieniona na %1$s</string>
@@ -267,16 +292,17 @@
     <string name="set_notif_follow_share">Powiadom mnie, gdy ktoś podbije mój wpis</string>
     <string name="set_notif_follow_add">Powiadom mnie, gdy ktoś polubi mój wpis</string>
     <string name="set_notif_follow_mention">Powiadom mnie, gdy ktoś mnie wspomni</string>
-    <string name="set_notif_follow_poll">Notify when a poll ended</string>
+    <string name="set_notif_follow_poll">Powiadom kiedy głosowanie zostanie zakończone</string>
     <string name="set_share_validation">Proś o potwierdzenie przed podbiciem</string>
     <string name="set_share_validation_fav">Proś o potwierdzenie przed dodaniem wpisu do ulubionych</string>
     <string name="set_wifi_only">Powiadamiaj tylko w sieci WiFi</string>
     <string name="set_notify">Powiadamiać?</string>
     <string name="set_notif_silent">Ciche powiadomienia</string>
     <string name="set_nsfw_timeout">Czas do automatycznego ukrycia treści wrażliwej w sekundach. 0 oznacza dezaktywację.</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Edytuj profil</string>
-    <string name="settings_title_custom_sharing">Custom sharing</string>
-    <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
+    <string name="settings_title_custom_sharing">Niestandardowe udostępnianie</string>
+    <string name="settings_custom_sharing_url">Twoje URL do niestandardowego udostępniania&#8230;</string>
     <string name="set_profile_description">Biografia…</string>
     <string name="set_lock_account">Zablokuj konto</string>
     <string name="set_save_changes">Zapisz zmiany</string>
@@ -296,11 +322,6 @@
     <string name="use_javascript">Włącz Javascript</string>
     <string name="expand_cw">Zawsze rozwijaj ostrzeżenia o zawartości</string>
     <string name="use_cookies">Zezwalaj na pliki cookie firm trzecich</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Brak</item>
-    </string-array>
     <string name="your_api_key">Klucz API, można zostawić puste dla Yandex</string>
     <string-array name="settings_theme">
         <item>Ciemny</item>
@@ -326,7 +347,7 @@
     <string name="action_search">Wyszukaj</string>
     <string name="set_capitalize">Zaczynaj wpisy z wielkiej litery</string>
     <string name="set_resize_picture">Zmniejszanie zdjęć</string>
-    <string name="set_resize_video">Resize videos</string>
+    <string name="set_resize_video">Zmień rozmiar wideo</string>
     <!-- Quick settings for notifications -->
     <string name="settings_popup_title">Powiadomienia</string>
     <string name="settings_popup_message">Wskaż, jakie powiadomienia chcesz otrzymywać.
@@ -340,13 +361,13 @@
     <string name="title_header_custom_sharing">Tytuł</string>
     <string name="title_hint_custom_sharing">Tytuł&#8230;</string>
     <string name="description_header_custom_sharing">Opis</string>
-    <string name="keywords_header_custom_sharing">Keywords</string>
-    <string name="keywords_hint_custom_sharing">Keywords&#8230;</string>
+    <string name="keywords_header_custom_sharing">Słowa kluczowe</string>
+    <string name="keywords_hint_custom_sharing">Słowa kluczowe&#8230;</string>
     <!-- ACTIVITY CACHE -->
     <string name="action_sync">Synchronizacja</string>
     <string name="action_filter">Filtrowanie</string>
     <string name="owner_cached_toots">Twoje wpisy</string>
-    <string name="owner_cached_notifications">Your notifications</string>
+    <string name="owner_cached_notifications">Twoje powiadomienia</string>
     <string name="v_public">Publiczne</string>
     <string name="v_unlisted">Niepubliczne</string>
     <string name="v_private">Tylko śledzeni</string>
@@ -357,10 +378,10 @@
     <string name="filter_no_result">Nie znaleziono pasujących wpisów!</string>
     <string name="data_backup_toots">Kopia zapasowa dla %1$s</string>
     <string name="data_backup_success">Zaimportowano %1$s nowych wpisów</string>
-    <string name="data_backup_notification_success">%1$s new notifications have been imported</string>
+    <string name="data_backup_notification_success">Zaimportowano %1$s nowych powiadomień</string>
     <string-array name="filter_order">
-        <item>Dates descending</item>
-        <item>Dates ascending</item>
+        <item>Data malejąco</item>
+        <item>Data rosnąco</item>
     </string-array>
     <string-array name="filter_select">
         <item>Żaden</item>
@@ -414,8 +435,8 @@
     <string name="action_lists_delete">Usuń listę</string>
     <string name="action_lists_update">Edytuj listę</string>
     <string name="action_lists_title_placeholder">Nowy tytuł listy</string>
-    <string name="action_lists_add_user">The account was added to the list!</string>
-    <string name="action_lists_empty">You don\'t have any lists yet!</string>
+    <string name="action_lists_add_user">Konto zostały dodane do listy!</string>
+    <string name="action_lists_empty">Nie masz jeszcze żadnych list!</string>
     <!-- Migration -->
     <string name="account_moved_to">%1$s przeniósł się do %2$s</string>
     <string name="issue_login_title">Problem z uwierzytelnieniem?</string>
@@ -433,8 +454,8 @@
     <string name="data_export_toots">Eksportuj wpisy dla %1$s</string>
     <string name="data_export_success">Wyeksportowano %1$s wpisów z dostępnych %2$s.</string>
     <string name="data_export_error">Coś poszło nie tak podczas próby eksportu danych %1$s</string>
-    <string name="data_export_error_simple">Something went wrong when exporting data!</string>
-    <string name="data_import_error_simple">Something went wrong when importing data!</string>
+    <string name="data_export_error_simple">Coś poszło nie tak podczas próby eksportu danych!</string>
+    <string name="data_import_error_simple">Coś poszło nie tak podczas próby importu danych!</string>
     <!-- Proxy -->
     <string name="proxy_set">Proxy</string>
     <string name="proxy_enable">Włączyć proxy?</string>
@@ -500,7 +521,7 @@
     <string name="channel_notif_boost">Nowe Podbicie</string>
     <string name="channel_notif_fav">Nowe ulubione</string>
     <string name="channel_notif_mention">Nowe Wspomnienie</string>
-    <string name="channel_notif_poll">Poll Ended</string>
+    <string name="channel_notif_poll">Głosowanie zakończone</string>
     <string name="channel_notif_toot">Nowy Wpis</string>
     <string name="channel_notif_backup">Kopia zapasowa wpisów</string>
     <string name="channel_notif_media">Pobrane Media</string>
@@ -556,7 +577,7 @@
     <string name="no_scheduled_boosts_indications"><![CDATA[Otwórz menu toota i wybierz <b>Zaplanuj podbicie</b>.]]></string>
     <string name="art_menu">Oś sztuki</string>
     <string name="open_menu">Otwórz menu</string>
-    <string name="go_back">Go back</string>
+    <string name="go_back">Powrót</string>
     <string name="app_logo">Logo aplikacji</string>
     <string name="profile_picture">Zdjęcie profilowe</string>
     <string name="profile_banner">Baner profilowy</string>
@@ -604,7 +625,7 @@
     <string name="none_tags">Zadne z wymienionych</string>
     <string name="some_words_any">Dowolne z tych słów (oddzielone spacją)</string>
     <string name="some_words_all">Wszystkie z tych słów (rozdzielone spacją)</string>
-    <string name="some_tags">Add some words to filter (space-separated)</string>
+    <string name="some_tags">Dodaj kilka słów do filtru (oddzielone spacjami)</string>
     <string name="change_tag_column">Zmień nazwę kolumny</string>
     <string name="misskey_instance">Instancja Misskey</string>
     <string name="toast_no_apps">Brak zainstalowanej aplikacji do otwarcia tego odnośnika.</string>
@@ -619,112 +640,112 @@
     <string name="delete_comment_confirm">Czy na pewno chcesz usunąć ten komentarz?</string>
     <string name="fullscreen">Odtwarzanie pełnoekranowe</string>
     <string name="set_video_mode">Tryb wideo</string>
-    <string name="file_to_upload">Select the file to upload</string>
+    <string name="file_to_upload">Wybierz plik do przesłania</string>
     <string name="my_videos">Moje filmy</string>
     <string name="title">Tytuł</string>
     <string name="license">Licencja</string>
     <string name="category">Kategoria</string>
     <string name="language">Język</string>
-    <string name="peertube_nsfw">This video contains mature or explicit content</string>
-    <string name="peertube_enable_comments">Enable video comments</string>
-    <string name="update_video">Update video</string>
+    <string name="peertube_nsfw">Ten film zawiera dojrzałe lub nieodpowiednie treści</string>
+    <string name="peertube_enable_comments">Włącz komentarze na filmach</string>
+    <string name="update_video">Aktualizuj filmy</string>
     <string name="description">Opis</string>
     <string name="toast_peertube_video_updated">Film został zaaktualizowany!</string>
     <string name="toast_cancelled">Wysyłanie anulowane!</string>
     <string name="upload_video_success">Film został przesłany!</string>
-    <string name="uploading">Uploading, please wait…</string>
-    <string name="video_uploaded_action">Tap here to edit the video data.</string>
+    <string name="uploading">Przesyłanie, proszę czekać…</string>
+    <string name="video_uploaded_action">Naciśnij tutaj, aby edytować informacje o filmie.</string>
     <string name="delete_video">Usuń film</string>
     <string name="delete_video_confirmation">Czy na pewno chcesz usunąć ten film?</string>
-    <string name="display_nsfw_videos">Display NSFW videos</string>
-    <string name="no_video_to_display">No videos to display!</string>
-    <string name="leave_a_comment">Leave a comment</string>
+    <string name="display_nsfw_videos">Wyświetlaj filmy NSFW</string>
+    <string name="no_video_to_display">Brak filmów do wyświetlenia!</string>
+    <string name="leave_a_comment">Zostaw komentarz</string>
     <string name="share">Udostępnij</string>
-    <string name="choose_schedule">Choose a schedule mode</string>
+    <string name="choose_schedule">Wybierz tryb harmonogramu</string>
     <string name="device_schedule">Z urządzenia</string>
-    <string name="server_schedule">From server</string>
-    <string name="toots_server">Toots (Server)</string>
-    <string name="toots_client">Toots (Device)</string>
+    <string name="server_schedule">Z serwera</string>
+    <string name="toots_server">Wpisy (Serwer)</string>
+    <string name="toots_client">Wpisy (Urządzenie)</string>
     <string name="modify">Modyfikuj</string>
-    <string name="set_display_content_after_fetch_more">Display new toots above the \"Fetch more\" button</string>
-    <string name="settings_category_label_timelines">Timelines</string>
-    <string name="settings_category_label_interface">Interface</string>
-    <string name="contact">Contacts</string>
-    <string name="peertube_comment_on_video"><![CDATA[<b>%1$s</b> commented your video <b>%2$s</b>]]></string>
-    <string name="peertube_follow_channel"><![CDATA[<b>%1$s</b> is following your channel <b>%2$s</b>]]></string>
-    <string name="peertube_follow_account"><![CDATA[<b>%1$s</b> is following your account]]></string>
-    <string name="peertube_video_published"><![CDATA[Your video <b>%1$s</b> has been published]]></string>
-    <string name="peertube_video_import_success"><![CDATA[Your video import <b>%1$s</b> succeeded]]></string>
-    <string name="peertube_video_import_error"><![CDATA[Your video import <b>%1$s</b> failed]]></string>
-    <string name="peertube_video_from_subscription"><![CDATA[<b>%1$s</b> published a new video: <b>%2$s</b>]]></string>
-    <string name="peertube_video_blacklist"><![CDATA[Your video <b>%1$s</b> has been blacklisted]]></string>
-    <string name="peertube_video_unblacklist"><![CDATA[Your video <b>%1$s</b> has been unblacklisted]]></string>
+    <string name="set_display_content_after_fetch_more">Wyświetl nowe wpisy nad przyciskiem \"Pobierz wpisy\"</string>
+    <string name="settings_category_label_timelines">Osi czasu</string>
+    <string name="settings_category_label_interface">Interfejs</string>
+    <string name="contact">Kontakty</string>
+    <string name="peertube_comment_on_video"><![CDATA[<b>%1$s</b> skomentował twój film <b>%2$s</b>]]></string>
+    <string name="peertube_follow_channel"><![CDATA[<b>%1$s</b> śledzi twój kanał <b>%2$s</b>]]></string>
+    <string name="peertube_follow_account"><![CDATA[<b>%1$s</b> śledzi twoje konto]]></string>
+    <string name="peertube_video_published"><![CDATA[Twój film <b>%1$s</b> został opublikowany]]></string>
+    <string name="peertube_video_import_success"><![CDATA[Import wideo <b>%1$s</b> zakończony powodzeniem]]></string>
+    <string name="peertube_video_import_error"><![CDATA[Import wideo <b>%1$s</b> nie powiódł się]]></string>
+    <string name="peertube_video_from_subscription"><![CDATA[<b>%1$s</b> opublikował nowy film: <b>%2$s</b>]]></string>
+    <string name="peertube_video_blacklist"><![CDATA[Twój film <b>%1$s</b> został dodany do czarnej listy]]></string>
+    <string name="peertube_video_unblacklist"><![CDATA[Twój film <b>%1$s</b> został usunięty z czarnej listy]]></string>
     <string name="export_data">Eksportuj dane</string>
     <string name="import_data">Importuj dane</string>
-    <string name="toot_select_import">Select the file to import</string>
-    <string name="toot_select_file_error">An error occurred when selecting the backup file!</string>
-    <string name="add_public_comment">Add a public comment</string>
-    <string name="send_comment">Send comment</string>
-    <string name="toast_toot_saved_error">There is no Internet connection. Your message has been stored in drafts.</string>
+    <string name="toot_select_import">Wybierz plik do zaimportowania</string>
+    <string name="toot_select_file_error">Wystąpił błąd podczas wybierania pliku z kopią zapasową!</string>
+    <string name="add_public_comment">Dodaj publiczny komentarz</string>
+    <string name="send_comment">Wyślij komentarz</string>
+    <string name="toast_toot_saved_error">Brak połączenia z Internetem. Twoja wiadomość została zapisana w szkicach.</string>
     <string name="action_plain_text">Zwykły tekst</string>
     <string name="action_html">HTML</string>
     <string name="action_markdown">Markdown</string>
-    <string name="action_logout_account">Logout account</string>
-    <string name="all">All</string>
-    <string name="about_opencollective">Support the app</string>
-    <string name="more_about_opencollective">Open Collective enables groups to quickly set up a collective, raise funds and manage them transparently.</string>
+    <string name="action_logout_account">Wyloguj konto</string>
+    <string name="all">Wszystko</string>
+    <string name="about_opencollective">Wspomóż aplikację</string>
+    <string name="more_about_opencollective">Open Collective umożliwia grupom szybkie tworzenie kolektywów, pozyskiwanie funduszy i zarządzanie nimi w przejrzysty sposób.</string>
     <string name="copy_link">Skopiuj adres</string>
     <string name="connect_instance">Połącz</string>
-    <string name="set_normal">Normal</string>
-    <string name="set_compact">Compact</string>
-    <string name="set_console">Console</string>
-    <string name="set_mode">Set display mode</string>
+    <string name="set_normal">Normalny</string>
+    <string name="set_compact">Kompaktowy</string>
+    <string name="set_console">Konsola</string>
+    <string name="set_mode">Ustaw tryb wyświetlania</string>
     <string name="set_security_provider">Patch the Security Provider</string>
-    <string name="update_tracking_domains">Update tracking domains</string>
-    <string name="tracking_db_updated">The tracking data base has been updated!</string>
-    <string name="calls_blocked">http calls blocked by the application</string>
-    <string name="list_of_blocked_domains">List of blocked calls</string>
-    <string name="submit">Submit</string>
-    <string name="data_base_exported">The data base has been exported!</string>
-    <string name="featured_hashtags">Featured hashtags</string>
-    <string name="filter_timeline_with_a_tag">Filter timeline with tags</string>
-    <string name="no_tags">No tags</string>
-    <string name="set_hide_delete_notification_on_tab">Hide the \"delete\" button in the notification tab</string>
-    <string name="set_retrieve_metadata_share_from_extras">Attach an image when sharing a URL</string>
+    <string name="update_tracking_domains">Aktualizuj śledzące domeny</string>
+    <string name="tracking_db_updated">Baza danych śledzących domen została zaktualizowana!</string>
+    <string name="calls_blocked">połączenia http zablokowane przez aplikację</string>
+    <string name="list_of_blocked_domains">Lista zablokowanych połączeń</string>
+    <string name="submit">Wyślij</string>
+    <string name="data_base_exported">Baza danych została wyeksportowana!</string>
+    <string name="featured_hashtags">Wyróżnione hashtagi</string>
+    <string name="filter_timeline_with_a_tag">Filtruj oś czasu z tagami</string>
+    <string name="no_tags">Brak tagów</string>
+    <string name="set_hide_delete_notification_on_tab">Ukryj przycisk \"Usuń\" na karcie Powiadomienia</string>
+    <string name="set_retrieve_metadata_share_from_extras">Dołącz obraz podczas udostępniania adresu URL</string>
     <!-- end languages -->
-    <string name="poll">Poll</string>
-    <string name="polls">Polls</string>
-    <string name="create_poll">Create a poll</string>
-    <string name="poll_choice_1">Choice 1</string>
-    <string name="poll_choice_2">Choice 2</string>
-    <string name="poll_choice_s">Choice %d</string>
-    <string name="poll_invalid_choices">You need two choices at least for the poll!</string>
-    <string name="done">Done</string>
-    <string name="poll_finish_at">end at %s</string>
-    <string name="refresh_poll">Refresh poll</string>
-    <string name="vote">Vote</string>
-    <string name="notif_poll">A poll you have voted in has ended</string>
-    <string name="notif_poll_self">A poll you tooted has ended</string>
-    <string name="settings_category_notif_customize">Customize</string>
-    <string name="settings_category_notif_categories">Categories</string>
+    <string name="poll">Głosowanie</string>
+    <string name="polls">Głosowania</string>
+    <string name="create_poll">Utwórz głosowanie</string>
+    <string name="poll_choice_1">Opcja 1</string>
+    <string name="poll_choice_2">Opcja 2</string>
+    <string name="poll_choice_s">Opcja %d</string>
+    <string name="poll_invalid_choices">Potrzebujesz conajmniej dwóch opcji dla głosowania!</string>
+    <string name="done">Gotowe</string>
+    <string name="poll_finish_at">zakończ o %s</string>
+    <string name="refresh_poll">Odśwież głosowanie</string>
+    <string name="vote">Zagłosuj</string>
+    <string name="notif_poll">Głosowanie, w którym brałeś(-aś) udział, zostało zakończone</string>
+    <string name="notif_poll_self">Głosowanie, które stworzyłeś(-aś), zostało zakończone</string>
+    <string name="settings_category_notif_customize">Dostosuj</string>
+    <string name="settings_category_notif_categories">Kategorie</string>
     <string name="settings_category_notif_time_slot">Time slot</string>
-    <string name="settings_category_notif_advanced">Advanced</string>
-    <string name="set_display_new_badge">Display \'new\' badge on unread toots</string>
+    <string name="settings_category_notif_advanced">Zaawansowane</string>
+    <string name="set_display_new_badge">Wyświetl plakietkę \"nowy\" na nieprzeczytanych wpisach</string>
     <string name="peertube_menu">Peertube</string>
-    <string name="move_timeline">Move timeline</string>
-    <string name="hide_timeline">Hide timeline</string>
-    <string name="reorder_timelines">Reorder timelines</string>
-    <string name="reorder_list_deleted">List permanently deleted</string>
-    <string name="reorder_instance_removed">Followed instance removed</string>
-    <string name="reorder_tag_removed">Pinned tag removed</string>
-    <string name="undo">Undo</string>
-    <string name="visible_tabs_needed">You need to keep two visible tabs!</string>
-    <string name="action_reorder_timeline">Reorder timelines</string>
-    <string name="warning_main_timeline">Main timelines can only be hidden!</string>
+    <string name="move_timeline">Przesuń oś czasu</string>
+    <string name="hide_timeline">Ukryj oś czasu</string>
+    <string name="reorder_timelines">Zmień kolejność osi czasu</string>
+    <string name="reorder_list_deleted">Lista permanentnie usunięta</string>
+    <string name="reorder_instance_removed">Śledzona instancja usunięta</string>
+    <string name="reorder_tag_removed">Przypięty tag usunięty</string>
+    <string name="undo">Cofnij</string>
+    <string name="visible_tabs_needed">Musisz mieć dwie widoczne karty!</string>
+    <string name="action_reorder_timeline">Zmień kolejność osi czasu</string>
+    <string name="warning_main_timeline">Główne osi czasu mogą jedynie być ukryte!</string>
     <string name="action_bbcode">BBCode</string>
-    <string name="set_sensitive_content">Always mark media as sensitive</string>
-    <string name="gnu_instance">GNU instance</string>
-    <string name="cached_status">Cached status</string>
+    <string name="set_sensitive_content">Zawsze oznaczaj media jako wrażliwe</string>
+    <string name="gnu_instance">Instancja GNU</string>
+    <string name="cached_status">Wpis zapisany w pamięci podręcznej</string>
     <string name="set_forward_tags">Forward tags in replies</string>
     <string name="set_long_press_media">Long press to store media</string>
     <string name="set_blur_sensitive">Blur sensitive media</string>
@@ -751,17 +772,17 @@
     <string name="label_brush">Brush</string>
     <string name="confirm_exit_editing">Are you sure you want to exit without saving the image?</string>
     <string name="discard">Discard</string>
-    <string name="saving">Saving…</string>
-    <string name="image_saved">Image Saved Successfully!</string>
-    <string name="save_image_failed">Failed to save Image</string>
-    <string name="opacity">Opacity</string>
-    <string name="set_photo_editor">Enable photo editor</string>
-    <string name="add_poll_item">Add a poll item</string>
-    <string name="remove_poll_item">Remove last poll item</string>
-    <string name="mute_conversation">Mute conversation</string>
-    <string name="unmute_conversation">Unmute conversation</string>
-    <string name="toast_unmute_conversation">The conversation is no longer muted!</string>
-    <string name="toast_mute_conversation">The conversation is muted</string>
+    <string name="saving">Zapisywanie…</string>
+    <string name="image_saved">Obraz zapisany pomyślnie!</string>
+    <string name="save_image_failed">Nie udało się zapisać obrazu</string>
+    <string name="opacity">Przezroczystość</string>
+    <string name="set_photo_editor">Włącz edytor zdjęć</string>
+    <string name="add_poll_item">Dodaj opcję</string>
+    <string name="remove_poll_item">Usuń ostatnią opcję</string>
+    <string name="mute_conversation">Wycisz rozmowę</string>
+    <string name="unmute_conversation">Wyłącz wyciszenie rozmowy</string>
+    <string name="toast_unmute_conversation">Rozmowa nie jest już wyciszona!</string>
+    <string name="toast_mute_conversation">Ta rozmowa jest wyciszona</string>
     <string name="app_features">Open application features</string>
     <string name="timed_mute">Timed mute</string>
     <string name="mention_account">Mention the account</string>
@@ -940,6 +961,12 @@
         <item quantity="many">%d votes</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="few">%d voters</item>
+        <item quantity="many">%d voters</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1012,6 +1039,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1045,4 +1074,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index c2662baac..895748ff4 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Aviso de conteúdo</string>
     <string name="toot_placeholder">No que você está pensando?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">deu boost no seu toot</string>
     <string name="notif_favourite">favoritou seu toot</string>
     <string name="notif_follow">te seguiu</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">e outra notificação</item>
         <item quantity="other">e outras %d notificações</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Notificar?</string>
     <string name="set_notif_silent">Silenciar notificações</string>
     <string name="set_nsfw_timeout">Segundos para expirar a prévia de mídia sensível, 0 para desativar.</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Editar perfil</string>
     <string name="settings_title_custom_sharing">Compartilhamento externo personalizado</string>
     <string name="settings_custom_sharing_url">Seu link de compartilhamento externo&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Ativar Javascript</string>
     <string name="expand_cw">Expandir AC automaticamente</string>
     <string name="use_cookies">Permitir cookies de terceiros</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Não</item>
-    </string-array>
     <string name="your_api_key">Você pode deixar sua chave de API em branco para Yandex</string>
     <string-array name="settings_theme">
         <item>Noturno</item>
@@ -937,6 +950,10 @@
         <item quantity="one">%d voto</item>
         <item quantity="other">%d votos</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Uma opção</item>
         <item>Múltiplas opções</item>
@@ -1009,6 +1026,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1042,4 +1061,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 988ff8d79..ff3d0bd0e 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -126,6 +126,26 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="few">%d seconds</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="few">%d minutes</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="few">%d hours</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="few">%d days</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Atenționare</string>
     <string name="toot_placeholder">La ce te gândești?</string>
@@ -198,6 +218,7 @@
     <string name="notif_reblog">a amplificat statusul tău</string>
     <string name="notif_favourite">a favorizat statusul tău</string>
     <string name="notif_follow">vă urmărește</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">și încă o notificare</item>
         <item quantity="few">și incă %d alte notificări</item>
@@ -272,6 +293,7 @@
     <string name="set_notify">Notifică?</string>
     <string name="set_notif_silent">Notificații silențioase</string>
     <string name="set_nsfw_timeout">NSFW Vezi timp expirare (secunde, 0 înseamnă oprit)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Editează profilul</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -294,11 +316,6 @@
     <string name="use_javascript">Activează Javascript</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="use_cookies">Permite cookies terțiare</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Nu</item>
-    </string-array>
     <string name="your_api_key">Your API key, you can leave blank for Yandex</string>
     <string-array name="settings_theme">
         <item>Dark</item>
@@ -938,6 +955,11 @@ Aceste date sunt strict confidențiale și pot fi folosite doar de aplicație.
         <item quantity="few">%d votes</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="few">%d voters</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1010,6 +1032,8 @@ Aceste date sunt strict confidențiale și pot fi folosite doar de aplicație.
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1043,4 +1067,45 @@ Aceste date sunt strict confidențiale și pot fi folosite doar de aplicație.
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 1838345c1..776db3f6c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -126,6 +126,30 @@
     <string name="date_minutes">%d м</string>
     <string name="date_hours">%d ч</string>
     <string name="date_day">%d д</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d секунда</item>
+        <item quantity="few">%d секунды</item>
+        <item quantity="many">%d секунд</item>
+        <item quantity="other">%d секунды</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d минута</item>
+        <item quantity="few">%d минуты</item>
+        <item quantity="many">%d минут</item>
+        <item quantity="other">%d минуты</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d час</item>
+        <item quantity="few">%d часа</item>
+        <item quantity="many">%d часов</item>
+        <item quantity="other">%d часа</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d день</item>
+        <item quantity="few">%d дня</item>
+        <item quantity="many">%d дней</item>
+        <item quantity="other">%d дня</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Предупреждение</string>
     <string name="toot_placeholder">О чем вы думаете?</string>
@@ -198,6 +222,7 @@
     <string name="notif_reblog">ваш статус продвинут</string>
     <string name="notif_favourite">добавил ваш статус в избранные</string>
     <string name="notif_follow">подписался на вас</string>
+    <string name="notif_follow_request">попросил подписаться на вас</string>
     <plurals name="other_notifications">
         <item quantity="one">и другое уведомление</item>
         <item quantity="few">и %d других уведомления</item>
@@ -274,6 +299,7 @@
     <string name="set_notify">Уведомлять?</string>
     <string name="set_notif_silent">Тихие уведомления</string>
     <string name="set_nsfw_timeout">Время просмотра NSFW (в секундах, 0 означает выключено)</string>
+    <string name="set_med_desc_timeout">Время просмотра описания (в секундах, 0 означает выключено)</string>
     <string name="settings_title_profile">Изменить профиль</string>
     <string name="settings_title_custom_sharing">Пользовательский обмен</string>
     <string name="settings_custom_sharing_url">Ваш пользовательский URL для обмена&#8230;</string>
@@ -296,11 +322,6 @@
     <string name="use_javascript">Включить Javascript</string>
     <string name="expand_cw">Автоматически раскрывать 18+</string>
     <string name="use_cookies">Разрешить сторонние куки</string>
-    <string-array name="settings_translation">
-        <item>Яндекс</item>
-        <item>DeepL</item>
-        <item>Нет</item>
-    </string-array>
     <string name="your_api_key">Ваш ключ API (для Яндекса можно оставить пустым)</string>
     <string-array name="settings_theme">
         <item>Темная</item>
@@ -360,8 +381,8 @@
     <string name="data_backup_success">было импортировано %1$s новых тутов</string>
     <string name="data_backup_notification_success">было импортировано %1$s новых уведомлений</string>
     <string-array name="filter_order">
-        <item>Dates descending</item>
-        <item>Dates ascending</item>
+        <item>Даты по убыванию</item>
+        <item>Даты по возрастанию</item>
     </string-array>
     <string-array name="filter_select">
         <item>Нет</item>
@@ -785,7 +806,7 @@
     <string name="toast_error_instance_reg">Что-то пошло не так при проверке доступных инстансов!</string>
     <string name="join_mastodon">Присоединиться к Mastodon</string>
     <string name="pickup_instance_category">Выберите инстанс, подобрав категорию и нажмите кнопку проверки.</string>
-    <string name="pickup_instance_peertube">Choose an instance by tapping on a check button.</string>
+    <string name="pickup_instance_peertube">Выберите инстанс, нажав на кнопку проверки.</string>
     <string name="users">%1$s пользователей</string>
     <string name="password_confirm">Подтвердить пароль</string>
     <string name="agreement_check">Я принимаю %1$s и %2$s</string>
@@ -943,6 +964,12 @@
         <item quantity="many">%d голосов</item>
         <item quantity="other">%d голосов</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d голосующий</item>
+        <item quantity="few">%d голосующих</item>
+        <item quantity="many">%d голосующих</item>
+        <item quantity="other">%d голосующих</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Единичный выбор</item>
         <item>Множественный выбор</item>
@@ -988,8 +1015,8 @@
     <string name="set_hide_status_bar">Скрыть панель уведомлений Fedilab</string>
     <string name="set_hide_status_bar_indication">Чтобы скрыть уведомление в строке состояния, нажмите на кнопку с пиктограммой глаза и снимите флажок: \"Показывать в строке состояния\"</string>
     <string name="set_live_type_indication">Уведомления будут появляться на 30 секунд позже. Это позволит уменьшить влияние на батарею.</string>
-    <string name="live_delayed">Live notifications delayed</string>
-    <string name="no_live_notif">No live notifications</string>
+    <string name="live_delayed">Отложенные живые уведомления</string>
+    <string name="no_live_notif">Нет живых уведомлений</string>
     <string name="no_live_indication">Уведомления будут поступать каждые 15 минут.</string>
     <string name="action_add_notes">Добавить примечания</string>
     <string name="note_for_account">Примечания для аккаунта</string>
@@ -998,54 +1025,97 @@
     <string name="please_wait_compression">Приложение сжимает медиа, это может продолжаться достаточно долго…</string>
     <string name="change_app_icon_experimental">Изменение значка приложения</string>
     <string name="click_to_change_the_app_icon">Нажмите, чтобы изменить значок приложения</string>
-    <string name="post">Post</string>
-    <string name="post_visibility_tilte">Visibility of the post</string>
-    <string name="add_photo_pixelfed">Tap here to add photos</string>
-    <string name="add_photo_indication_pixelfed">Accepted Formats: jpeg, png, gif  \n\nMax File Size: 15 MB  \n\nAlbums can contain up to 4 photos or videos</string>
-    <string name="upload_media">Upload media</string>
-    <string name="pixelfed_compose_placeholder">Add an optional caption</string>
-    <string name="long_api_error">The app received a very long error message from the API %1$s</string>
-    <string name="message_preview">Message preview</string>
-    <string name="report_mention">Add mentions in each message</string>
-    <string name="fetch_conversation">Fetching conversation</string>
-    <string name="order_by">Order by</string>
-    <string name="title_video_peertube">Title for the video</string>
-    <string name="join_peertube">Join Peertube</string>
-    <string name="agreement_check_peertube">I am at least 16 years old and agree to the %1$s of this instance</string>
-    <string name="link_color_title">Links</string>
-    <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
-    <string name="boost_header_color_title">Reblogs header</string>
-    <string name="boost_header_color">Change the color of the header for reblogs</string>
-    <string name="background_status_title">Posts</string>
-    <string name="background_status">Background color of posts in timelines</string>
-    <string name="reset_color">Reset colors</string>
-    <string name="clik_reset">Tap here to reset all your custom colors</string>
-    <string name="reset">Reset</string>
-    <string name="icons_color_title">Icons</string>
-    <string name="icons_color">Color of bottom icons in timelines</string>
-    <string name="pin_tag">Pin this tag</string>
-    <string name="logo_of_the_instance">Logo of the instance</string>
-    <string name="edit_profile">Edit profile</string>
-    <string name="make_an_action">Make an action</string>
-    <string name="translation">Translation</string>
-    <string name="image_preview">Image preview</string>
+    <string name="post">Опубликовать</string>
+    <string name="post_visibility_tilte">Видимость записи</string>
+    <string name="add_photo_pixelfed">Нажмите здесь, чтобы добавить фотографии</string>
+    <string name="add_photo_indication_pixelfed">Поддерживаемые форматы: jpeg, png, gif \n\nМаксимальный размер файла: 15 Мб \n\nАльбомы могут содержать 4 фотографии или видео</string>
+    <string name="upload_media">Загрузить медиа</string>
+    <string name="pixelfed_compose_placeholder">Добавить подпись (необязательно)</string>
+    <string name="long_api_error">Приложение получило очень длинное сообщение об ошибке от API %1$s</string>
+    <string name="message_preview">Предпросмотр сообщения</string>
+    <string name="report_mention">Добавлять упоминания в каждом сообщении</string>
+    <string name="fetch_conversation">Загрузка диалога</string>
+    <string name="order_by">Упорядочить по</string>
+    <string name="title_video_peertube">Заголовок видео</string>
+    <string name="join_peertube">Присоединиться к Peertube</string>
+    <string name="agreement_check_peertube">Мне 16 или более лет и я согласен с %1$s этого инстанса</string>
+    <string name="link_color_title">Ссылки</string>
+    <string name="link_color">Изменить цвет ссылок (URL, обращения, теги и т.д.) в сообщениях</string>
+    <string name="boost_header_color_title">Заголовок продвижений</string>
+    <string name="displayname_title">Изменить цвет отображаемого имени в верхней части сообщений</string>
+    <string name="username_title">Изменить цвет имени пользователя в верхней части сообщений</string>
+    <string name="boost_header_color">Изменить цвет заголовка продвижений</string>
+    <string name="background_status_title">Записи</string>
+    <string name="background_status">Цвет фона записей в лентах</string>
+    <string name="reset_color">Сбросить цвета</string>
+    <string name="clik_reset">Нажмите здесь, чтобы сбросить все ваши пользовательские цвета</string>
+    <string name="reset">Сброс</string>
+    <string name="icons_color_title">Иконки</string>
+    <string name="icons_color">Цвет нижних значков в лентах</string>
+    <string name="pin_tag">Закрепить этот тег</string>
+    <string name="logo_of_the_instance">Логотип инстанса</string>
+    <string name="edit_profile">Редактировать профиль</string>
+    <string name="make_an_action">Предпринять действие</string>
+    <string name="translation">Перевод</string>
+    <string name="image_preview">Предпросмотр изображения</string>
     <string name="text_color_title">Цвет текста</string>
-    <string name="text_color">Change the text color in pots</string>
+    <string name="text_color">Изменить цвет текста в записях</string>
     <string name="apply_changes">Применить изменения</string>
     <string name="restart_message">Вам понадобится перезапустить клиент, чтобы применить изменения</string>
     <string name="restart">Перезапустить</string>
     <string name="pref_custom_theme">Использовать собственную тему</string>
     <string name="pref_custom_theme_summary">Позволяет переопределить цвета выбранной темы выше</string>
     <string name="theming">Настройки оформления</string>
-    <string name="store_before">Store before</string>
-    <string name="data_export_theme">The theme was exported</string>
-    <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
-    <string name="pref_colored_status_bar_summary">Apply the primary color to the status bar</string>
-    <string name="pref_colored_status_bar_title">Status bar color</string>
-    <string name="restore_default_theme">Restore a default theme</string>
-    <string name="import_theme">Import a theme</string>
-    <string name="import_theme_title">Tap here to import a theme from a previous export</string>
-    <string name="export_theme">Export the theme</string>
-    <string name="export_theme_title">Tap here to export the current theme</string>
-    <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="store_before">Сначала сохранить</string>
+    <string name="data_export_theme">Тема была экспортирована</string>
+    <string name="data_export_theme_success">Тема была успешна экспортирована в формат CSV</string>
+    <string name="pref_colored_status_bar_summary">Применить основной цвет к строке состояния</string>
+    <string name="pref_colored_status_bar_title">Цвет строки состояния</string>
+    <string name="restore_default_theme">Восстановить стандартную тему</string>
+    <string name="import_theme">Импортировать тему</string>
+    <string name="import_theme_title">Нажмите здесь чтобы импортировать тему из предыдущего экспорта</string>
+    <string name="export_theme">Экспортировать тему</string>
+    <string name="export_theme_title">Нажмите здесь для экспорта текущей темы</string>
+    <string name="theme_file_error">Произошла ошибка при выборе файла темы</string>
+    <string name="label_theme_picker">Выбор темы</string>
+    <string name="pref_theme_summary">Выбрать предустановленную тему</string>
+    <string name="pref_theme_title">Темы</string>
+    <string name="pref_colored_navigation_bar_summary">Применить основной цвет к панели навигации</string>
+    <string name="pref_colored_navigation_bar_title">Цвет панели навигации</string>
+    <string name="pref_background_color_summary">Базовый цвет содержимого приложения.</string>
+    <string name="pref_background_color_title">Цвет фона</string>
+    <string name="pref_accent_color_summary">Акценты выбирают части пользовательского интерфейса.</string>
+    <string name="pref_accent_color_title">Цвет акцента</string>
+    <string name="pref_primary_color_summary">Отображаемые чаще всего в вашем приложении.</string>
+    <string name="pref_primary_color_title">Основной цвет</string>
+    <string name="export_bookmarks">Экспортировать закладки в инстанс</string>
+    <string name="import_bookmarks">Импортировать закладки из инстанса</string>
+    <string name="user_count">Количество пользователей</string>
+    <string name="status_count">Количество статусов</string>
+    <string name="instance_count">Количество инстансов</string>
+    <string name="blocked">Заблокировано</string>
+    <string name="poll_finish_in">Заканчивается в %s</string>
+    <string name="release_note_title">Что нового в %s</string>
+    <string name="follow_account_update">Вы можете подписаться на мой аккаунт чтобы следить за обновлениями</string>
+    <string name="no_instance_reccord">Этот инстанс не доступен на https://instances.social</string>
+    <string name="display_full_link">Показать полную ссылку</string>
+    <string name="share_link">Поделиться ссылкой</string>
+    <string name="link_copy">URL была скопирована в буфер обмена</string>
+    <string name="open_other_app">Открыть с помощью другого приложения</string>
+    <string name="check_redirect">Проверить перенаправление</string>
+    <string name="no_redirect">Этот URL не перенаправляет</string>
+    <string name="redirect_detected">%1$s \n\nперенаправляет на\n\n %2$s</string>
+    <string name="set_user_agent">Изменить user agent</string>
+    <string name="set_user_agent_hint">Задать свой user agent или оставить пустым</string>
+    <string name="set_user_agent_indication">Позволяет изменить user agent используемый для api вызовов или во встроенном браузере.</string>
+    <string name="set_utm_parameters">Удалить UTM параметры</string>
+    <string name="set_utm_parameters_indication">Приложение будет автоматически удалять UTM параметры из URL-адреса, перед посещением ссылки.</string>
+    <string name="action_trends">Актуальное</string>
+    <string name="trending_now">Актуальное сейчас</string>
+    <string name="talking_about">%d люди говорят</string>
+    <string name="twitter_accounts">Аккаунты Twitter (с помощью Nitter)</string>
+    <string name="list_of_twitter_accounts">Имена пользователей Twitter разделённые пробелом</string>
+    <string name="identity_proofs">Подтверждение личности</string>
+    <string name="verified_user">Подтверждённая личность</string>
+    <string name="verified_by">Подтверждено %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index b2264c0bb..3eb8b86e1 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">මිනි.%d</string>
     <string name="date_hours">පැය %d</string>
     <string name="date_day">දින %d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">අවවාදයයි</string>
     <string name="toot_placeholder">ඔබේ සිතුවිලි මොනවාද?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">boosted your status</string>
     <string name="notif_favourite">favourited your status</string>
     <string name="notif_follow">followed you</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">and another notification</item>
         <item quantity="other">and %d other notifications</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Notify?</string>
     <string name="set_notif_silent">Silent Notifications</string>
     <string name="set_nsfw_timeout">NSFW view timeout (seconds, 0 means off)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Edit profile</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">Javascript සක්‍රිය කරන්න</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="use_cookies">Allow third-party cookies</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>නැහැ</item>
-    </string-array>
     <string name="your_api_key">ඔබේ API යතුර, Yandex සඳහා හිස්ව තැබීමට ඔබට හැකි ය</string>
     <string-array name="settings_theme">
         <item>අඳුරු</item>
@@ -937,6 +950,10 @@
         <item quantity="one">%d vote</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1009,6 +1026,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1042,4 +1061,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index cecb31517..1bc3de4c7 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -126,6 +126,30 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d ur</string>
     <string name="date_day">%d dni</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="two">%d seconds</item>
+        <item quantity="few">%d seconds</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="two">%d minutes</item>
+        <item quantity="few">%d minutes</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="two">%d hours</item>
+        <item quantity="few">%d hours</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="two">%d days</item>
+        <item quantity="few">%d days</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Opozorilo</string>
     <string name="toot_placeholder">O čem razmišljate?</string>
@@ -198,6 +222,7 @@
     <string name="notif_reblog">je ojačal tvoj status</string>
     <string name="notif_favourite">je všeč tvoja objava</string>
     <string name="notif_follow">spremlja vas</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">in še eno obvestilo</item>
         <item quantity="two">in še %d obvestili</item>
@@ -274,6 +299,7 @@
     <string name="set_notify">Obveščanje?</string>
     <string name="set_notif_silent">Tiha obvestila</string>
     <string name="set_nsfw_timeout">Časovna omejitev prikaza NSFW (v sekundah, 0 za izklop)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Urejanje profila</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -296,11 +322,6 @@
     <string name="use_javascript">Omogoči JavaScript</string>
     <string name="expand_cw">Samodejno razširi cw</string>
     <string name="use_cookies">Dovoli tuje piškotke</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Ne</item>
-    </string-array>
     <string name="your_api_key">Tvoj ključ API. Za Yandex je lahko prazen.</string>
     <string-array name="settings_theme">
         <item>Temna</item>
@@ -943,6 +964,12 @@
         <item quantity="few">%d votes</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="two">%d voters</item>
+        <item quantity="few">%d voters</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1015,6 +1042,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1048,4 +1077,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 011ece5f3..02740f293 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -126,6 +126,26 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d д</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="few">%d seconds</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="few">%d minutes</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="few">%d hours</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="few">%d days</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Упозорење</string>
     <string name="toot_placeholder">Шта Вам је на уму?</string>
@@ -198,6 +218,7 @@
     <string name="notif_reblog">је подржао Ваш статус</string>
     <string name="notif_favourite">је ставио Ваш статус као омиљени</string>
     <string name="notif_follow">Вас је запратио</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">и још једно обавештење</item>
         <item quantity="few">и још %d обавештења</item>
@@ -272,6 +293,7 @@
     <string name="set_notify">Обавештења?</string>
     <string name="set_notif_silent">Тиха обавештења</string>
     <string name="set_nsfw_timeout">NSFW временско ограничење приказа (у секундама, 0 значи искључено)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Измени профил</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -294,11 +316,6 @@
     <string name="use_javascript">Омогућите JavaScript</string>
     <string name="expand_cw">Аутоматски приказуј осетљиве садржаје</string>
     <string name="use_cookies">Дозволите независне колачиће</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Не</item>
-    </string-array>
     <string name="your_api_key">Ваш API кључ, можете оставити празно за Yandex</string>
     <string-array name="settings_theme">
         <item>Тамна</item>
@@ -940,6 +957,11 @@
         <item quantity="few">%d votes</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="few">%d voters</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1012,6 +1034,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1045,4 +1069,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 9f0af322a..1b5509739 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--Generated by crowdin.com-->
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <resources>
     <string name="navigation_drawer_open">Öppna menyn</string>
     <string name="navigation_drawer_close">Stäng menyn</string>
@@ -126,6 +127,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d t</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Varning</string>
     <string name="toot_placeholder">Vad tänker du på?</string>
@@ -198,6 +215,7 @@
     <string name="notif_reblog">ökat din status</string>
     <string name="notif_favourite">favourited din status</string>
     <string name="notif_follow">följt dig</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">och en till notifikation</item>
         <item quantity="other">och %d till notifikationer</item>
@@ -270,6 +288,7 @@
     <string name="set_notify">Notifiera?</string>
     <string name="set_notif_silent">Tysta aviseringar</string>
     <string name="set_nsfw_timeout">NSFW visningspaus (i sekunder, 0 betyder av)</string>
+    <string name="set_med_desc_timeout">Media Beskrivnings-timeout (sekunder, 0 betyder avstängd)</string>
     <string name="settings_title_profile">Ändra profil</string>
     <string name="settings_title_custom_sharing">Anpassad delning</string>
     <string name="settings_custom_sharing_url">Din anpassade URL&#8230;</string>
@@ -292,11 +311,6 @@
     <string name="use_javascript">Aktivera Javascript</string>
     <string name="expand_cw">Utöka meddelanden automatiskt</string>
     <string name="use_cookies">Tillåt tredjepartskakor</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Nej</item>
-    </string-array>
     <string name="your_api_key">Din API-nyckel, lämna blankt för Yandex</string>
     <string-array name="settings_theme">
         <item>Mörkt</item>
@@ -937,6 +951,10 @@
         <item quantity="one">%d röst</item>
         <item quantity="other">%d röster</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d röster</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Enkel val</item>
         <item>Flervalsalternativ</item>
@@ -1009,6 +1027,8 @@
     <string name="link_color_title">Länkar</string>
     <string name="link_color">Ändra färg på länkar (Url:er, omnämnande, taggar, etc.) i meddelanden</string>
     <string name="boost_header_color_title">Ompublicera-rubrik</string>
+    <string name="displayname_title">Ändra färg på visningsnamn på toppen av meddelanden</string>
+    <string name="username_title">Ändra färg på användarens namn i toppen av meddelanden</string>
     <string name="boost_header_color">Ändra färgen för rubriken för ompublicera</string>
     <string name="background_status_title">Inlägg</string>
     <string name="background_status">Bakgrundsfärg för poster i tidslinjen</string>
@@ -1018,28 +1038,69 @@
     <string name="icons_color_title">Ikoner</string>
     <string name="icons_color">Färg på bottenikoner i tidslinjer</string>
     <string name="pin_tag">Pinna denna tagg</string>
-    <string name="logo_of_the_instance">Logo of the instance</string>
-    <string name="edit_profile">Edit profile</string>
-    <string name="make_an_action">Make an action</string>
-    <string name="translation">Translation</string>
-    <string name="image_preview">Image preview</string>
-    <string name="text_color_title">Text color</string>
-    <string name="text_color">Change the text color in pots</string>
+    <string name="logo_of_the_instance">Logo för instansen</string>
+    <string name="edit_profile">Ändra profil</string>
+    <string name="make_an_action">Gör en handling</string>
+    <string name="translation">Översättning</string>
+    <string name="image_preview">Förhandsvisning</string>
+    <string name="text_color_title">Textfärg</string>
+    <string name="text_color">Ändrar färgen på meddelanden</string>
     <string name="apply_changes">Tillämpa ändringar</string>
     <string name="restart_message">Du måste starta om programmet för att tillämpa ändringarna</string>
     <string name="restart">Starta om</string>
-    <string name="pref_custom_theme">Use a custom theme</string>
-    <string name="pref_custom_theme_summary">Allow to override colors of the  selected theme above</string>
-    <string name="theming">Theming</string>
+    <string name="pref_custom_theme">Använd ett anpassat tema</string>
+    <string name="pref_custom_theme_summary">Tillåt att åsidosätta färger på valt tema ovan</string>
+    <string name="theming">Tema</string>
     <string name="store_before">Store before</string>
-    <string name="data_export_theme">The theme was exported</string>
-    <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
-    <string name="pref_colored_status_bar_summary">Apply the primary color to the status bar</string>
-    <string name="pref_colored_status_bar_title">Status bar color</string>
-    <string name="restore_default_theme">Restore a default theme</string>
-    <string name="import_theme">Import a theme</string>
-    <string name="import_theme_title">Tap here to import a theme from a previous export</string>
-    <string name="export_theme">Export the theme</string>
-    <string name="export_theme_title">Tap here to export the current theme</string>
-    <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="data_export_theme">Temat har exporterats</string>
+    <string name="data_export_theme_success">Temat har exporteras till CSV</string>
+    <string name="pref_colored_status_bar_summary">Använd den primära färgen till statusraden</string>
+    <string name="pref_colored_status_bar_title">Färg på statusrad</string>
+    <string name="restore_default_theme">Återställ standardtema</string>
+    <string name="import_theme">Importera tema</string>
+    <string name="import_theme_title">Tryck här för att importera tema från tidigare export</string>
+    <string name="export_theme">Exportera tema</string>
+    <string name="export_theme_title">Tryck här för att exportera nuvarande tema</string>
+    <string name="theme_file_error">Ett fel uppstod när tema valdes</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Exportera bokmärken till instans</string>
+    <string name="import_bookmarks">Importera bokmärken från instans</string>
+    <string name="user_count">Antal användare</string>
+    <string name="status_count">Status, antal</string>
+    <string name="instance_count">Instanser, antal</string>
+    <string name="blocked">Blockerad</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 83ab8e290..767a8e138 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -126,6 +126,22 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d saniye</item>
+        <item quantity="other">%d saniye</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d dakika</item>
+        <item quantity="other">%d dakika</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d saat</item>
+        <item quantity="other">%d saat</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d gün</item>
+        <item quantity="other">%d gün</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Uyarı</string>
     <string name="toot_placeholder">Aklınızda ki nedir?</string>
@@ -198,6 +214,7 @@
     <string name="notif_reblog">durumunu arttırdı</string>
     <string name="notif_favourite">durumunu favorilere ekledi</string>
     <string name="notif_follow">seni takip etti</string>
+    <string name="notif_follow_request">sizi takip etmek istedi</string>
     <plurals name="other_notifications">
         <item quantity="one">ve başka bildirim</item>
         <item quantity="other">ve başka bildirim</item>
@@ -270,6 +287,7 @@
     <string name="set_notify">Bildir?</string>
     <string name="set_notif_silent">Sessiz bildirimler</string>
     <string name="set_nsfw_timeout">NSFW görünümü zaman aşımı (saniye, kapatmak için sıfır girin)</string>
+    <string name="set_med_desc_timeout">Medya Açıklaması zaman aşımı (saniye, 0 kapalı demektir)</string>
     <string name="settings_title_profile">Profil düzenle</string>
     <string name="settings_title_custom_sharing">Özel paylaşım</string>
     <string name="settings_custom_sharing_url">Özel paylaşım URL&#8230;</string>
@@ -292,11 +310,6 @@
     <string name="use_javascript">JavaScript\'i etkinleştir</string>
     <string name="expand_cw">cw\'yi otomatik aç</string>
     <string name="use_cookies">Üçünçü parti çerezlere izin ver</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>Hayır</item>
-    </string-array>
     <string name="your_api_key">API anahtarınızı Yandex için boş bırakabilirsiniz</string>
     <string-array name="settings_theme">
         <item>Koyu</item>
@@ -700,7 +713,7 @@
     <string name="notif_poll_self">Tootladığınız bir anket sona erdi</string>
     <string name="settings_category_notif_customize">Özelleştir</string>
     <string name="settings_category_notif_categories">Kategoriler</string>
-    <string name="settings_category_notif_time_slot">Time slot</string>
+    <string name="settings_category_notif_time_slot">Zaman dilimi</string>
     <string name="settings_category_notif_advanced">Gelişmiş</string>
     <string name="set_display_new_badge">Okunmamış tootlarda \'yeni\' rozetini göster</string>
     <string name="peertube_menu">Peertube</string>
@@ -718,167 +731,167 @@
     <string name="set_sensitive_content">Medyayı her zaman hassas olarak işaretle</string>
     <string name="gnu_instance">GNU örneği</string>
     <string name="cached_status">Önbelleğe alınmış durum</string>
-    <string name="set_forward_tags">Forward tags in replies</string>
-    <string name="set_long_press_media">Long press to store media</string>
-    <string name="set_blur_sensitive">Blur sensitive media</string>
-    <string name="set_display_timeline_in_list">Display timelines in a list</string>
-    <string name="display_timeline">Display timelines</string>
-    <string name="set_display_bot_icon">Mark bot accounts in toots</string>
-    <string name="add_tags">Manage tags</string>
-    <string name="set_remember_position">Remember the position in Home timeline</string>
-    <string name="history">History</string>
-    <string name="playlists">Playlists</string>
-    <string name="display_name">Display name</string>
-    <string name="action_playlist_add">You don\'t have any playlists. Tap on the \"+\" icon to add a new playlist</string>
-    <string name="error_display_name">You must provide a display name!</string>
-    <string name="error_channel_mandatory">The channel is required when the playlist is public.</string>
-    <string name="action_playlist_create">Create a playlist</string>
-    <string name="action_playlist_empty_content">There is nothing in this playlist yet.</string>
-    <string name="redo">redo</string>
-    <string name="gallery">Gallery</string>
+    <string name="set_forward_tags">Yanıtlardaki etiketleri ilet</string>
+    <string name="set_long_press_media">Medyayı saklamak için uzun bas</string>
+    <string name="set_blur_sensitive">Hassas medyayı bulanıklaştır</string>
+    <string name="set_display_timeline_in_list">Zaman çizelgelerini bir listede göster</string>
+    <string name="display_timeline">Zaman çizelgelerini göster</string>
+    <string name="set_display_bot_icon">Tootlardaki bot hesaplarını işaretle</string>
+    <string name="add_tags">Etiketleri yönet</string>
+    <string name="set_remember_position">Ana zaman çizelgesindeki konumu hatırla</string>
+    <string name="history">Geçmiş</string>
+    <string name="playlists">Çalma listeleri</string>
+    <string name="display_name">Ekran adı</string>
+    <string name="action_playlist_add">Hiç çalma listeniz yok. Yeni bir çalma listesi eklemek için \"+\" simgesine dokunun</string>
+    <string name="error_display_name">Bir ekran adı sağlamanız gerekmektedir!</string>
+    <string name="error_channel_mandatory">Çalma listesi herkese açık olduğunda kanal gereklidir.</string>
+    <string name="action_playlist_create">Çalma listesi oluştur</string>
+    <string name="action_playlist_empty_content">Bu çalma listesinde henüz hiçbir şey yok.</string>
+    <string name="redo">ileri al</string>
+    <string name="gallery">Galeri</string>
     <string name="label_emoji">Emoji</string>
-    <string name="label_sticker">Sticker</string>
-    <string name="label_eraser">Eraser</string>
-    <string name="label_text">Text</string>
-    <string name="label_filter">Filter</string>
-    <string name="label_brush">Brush</string>
-    <string name="confirm_exit_editing">Are you sure you want to exit without saving the image?</string>
-    <string name="discard">Discard</string>
-    <string name="saving">Saving…</string>
-    <string name="image_saved">Image Saved Successfully!</string>
-    <string name="save_image_failed">Failed to save Image</string>
-    <string name="opacity">Opacity</string>
-    <string name="set_photo_editor">Enable photo editor</string>
-    <string name="add_poll_item">Add a poll item</string>
-    <string name="remove_poll_item">Remove last poll item</string>
-    <string name="mute_conversation">Mute conversation</string>
-    <string name="unmute_conversation">Unmute conversation</string>
-    <string name="toast_unmute_conversation">The conversation is no longer muted!</string>
-    <string name="toast_mute_conversation">The conversation is muted</string>
-    <string name="app_features">Open application features</string>
-    <string name="timed_mute">Timed mute</string>
-    <string name="mention_account">Mention the account</string>
-    <string name="refresh_cache">Refresh cache</string>
-    <string name="mention_status">Mention the status</string>
-    <string name="action_news">News</string>
-    <string name="category_general">General</string>
-    <string name="category_regional">Regional</string>
-    <string name="category_art">Art</string>
-    <string name="category_journalism">Journalism</string>
-    <string name="category_activism">Activism</string>
-    <string name="category_games">Gaming</string>
-    <string name="category_tech">Technology</string>
-    <string name="category_adult">Adult content</string>
-    <string name="category_furry">Furry</string>
-    <string name="category_food">Food</string>
-    <string name="instance_logo">Logo of the instance</string>
-    <string name="toast_error_instance_reg">Something went wrong when checking available instances!</string>
-    <string name="join_mastodon">Join Mastodon</string>
-    <string name="pickup_instance_category">Choose an instance by picking up a category, then tap on a check button.</string>
-    <string name="pickup_instance_peertube">Choose an instance by tapping on a check button.</string>
-    <string name="users">%1$s users</string>
-    <string name="password_confirm">Confirm password</string>
-    <string name="agreement_check">I agree to %1$s and %2$s</string>
-    <string name="server_rules">server rules</string>
-    <string name="tos">terms of service</string>
-    <string name="sign_up">Sign up</string>
-    <string name="validation_needed">This instance works with invitations. Your account will need to be manually approved by an administrator before being usable.</string>
-    <string name="all_field_filled">Please, fill all the fields!</string>
-    <string name="password_error">Passwords don\'t match!</string>
-    <string name="email_error">The email doesn\'t seem to be valid!</string>
-    <string name="username_indicator">Your username will be unique on %1$s</string>
-    <string name="email_indicator">You will be sent a confirmation e-mail</string>
-    <string name="password_indicator">Use at least 8 characters</string>
-    <string name="password_too_short">Password should contain at least 8 characters</string>
-    <string name="username_error">Username should only contain letters, numbers and underscores</string>
-    <string name="account_created">Account created!</string>
+    <string name="label_sticker">Çıkartma</string>
+    <string name="label_eraser">Silgi</string>
+    <string name="label_text">Metin</string>
+    <string name="label_filter">Filtre</string>
+    <string name="label_brush">Fırça</string>
+    <string name="confirm_exit_editing">Resmi kaydetmeden çıkmak istediğinizden emin misiniz?</string>
+    <string name="discard">At</string>
+    <string name="saving">Kaydediliyor…</string>
+    <string name="image_saved">Resim Başarıyla Kaydedildi!</string>
+    <string name="save_image_failed">Resim kaydedilemedi</string>
+    <string name="opacity">Opaklık</string>
+    <string name="set_photo_editor">Fotoğraf düzenleyiciyi etkinleştir</string>
+    <string name="add_poll_item">Anket ögesi ekle</string>
+    <string name="remove_poll_item">Son anket ögesini kaldır</string>
+    <string name="mute_conversation">Sohbetin sesini kapat</string>
+    <string name="unmute_conversation">Sohbetin sesini aç</string>
+    <string name="toast_unmute_conversation">Sohbetin sesi artık kapalı değil!</string>
+    <string name="toast_mute_conversation">Sohbetin sesi kapalı</string>
+    <string name="app_features">Uygulama özelliklerini aç</string>
+    <string name="timed_mute">Zamanlanmış ses kapatma</string>
+    <string name="mention_account">Hesaptan bahset</string>
+    <string name="refresh_cache">Önbelleği yenile</string>
+    <string name="mention_status">Durumdan bahset</string>
+    <string name="action_news">Haberler</string>
+    <string name="category_general">Genel</string>
+    <string name="category_regional">Bölgesel</string>
+    <string name="category_art">Sanat</string>
+    <string name="category_journalism">Gazetecilik</string>
+    <string name="category_activism">Aktivizm</string>
+    <string name="category_games">Oyun</string>
+    <string name="category_tech">Teknoloji</string>
+    <string name="category_adult">Yetişkin içerik</string>
+    <string name="category_furry">Kürklü</string>
+    <string name="category_food">Yemek</string>
+    <string name="instance_logo">Örneğin logosu</string>
+    <string name="toast_error_instance_reg">Mevcut örnekleri kontrol ederken bir şeyler ters gitti!</string>
+    <string name="join_mastodon">Mastodon\'a katıl</string>
+    <string name="pickup_instance_category">Bir kategori seçerek bir örnek seçin, ardından onay butonuna dokunun.</string>
+    <string name="pickup_instance_peertube">Bir onay butonuna dokunarak bir örnek seçin.</string>
+    <string name="users">%1$s kullanıcı</string>
+    <string name="password_confirm">Parolayı doğrula</string>
+    <string name="agreement_check">%1$s ve %2$s\'i kabul ediyorum</string>
+    <string name="server_rules">sunucu kuralları</string>
+    <string name="tos">hizmet koşulları</string>
+    <string name="sign_up">Kaydol</string>
+    <string name="validation_needed">Bu örnek davetiyelerle çalışmaktadır. Kullanılabilir olmadan önce hesabınızın bir yönetici tarafından manuel olarak onaylanması gerekecektir.</string>
+    <string name="all_field_filled">Lütfen tüm alanları doldurun!</string>
+    <string name="password_error">Parolalar eşleşmiyor!</string>
+    <string name="email_error">E-posta geçerli görünmüyor!</string>
+    <string name="username_indicator">Kullanıcı adınız %1$s üzerinde eşsiz olacaktır</string>
+    <string name="email_indicator">Bir onay e-postası alacaksınız</string>
+    <string name="password_indicator">En az 8 karakter kullanın</string>
+    <string name="password_too_short">Parola en az 8 karakter içermelidir</string>
+    <string name="username_error">Kullanıcı adı sadece harf, rakam ve alt çizgi içermelidir</string>
+    <string name="account_created">Hesap oluşturuldu!</string>
     <string name="account_created_message">        Your account has been created!\n\n
         Think to validate your email within the 48 next hours.\n\n
         You can now connect your account by writing <b>%1$s</b> in the first field and click on <b>Connect</b>.\n\n
         <b>Important</b>: If your instance required validation, you will receive an email once it is validated!
     </string>
-    <string name="save_draft">Save the message in drafts?</string>
-    <string name="administration">Administration</string>
-    <string name="reports">Reports</string>
-    <string name="no_reports">No reports to display!</string>
-    <string name="reconnect_account">Reconnect the account</string>
-    <string name="reconnect_account_message">The application failed to access the admin features. You might need to reconnect the account for having the correct scope.</string>
-    <string name="unresolved">Unresolved</string>
+    <string name="save_draft">Mesaj, taslaklara kaydedilsin mi?</string>
+    <string name="administration">Yönetim</string>
+    <string name="reports">Raporlar</string>
+    <string name="no_reports">Görüntülenecek rapor yok!</string>
+    <string name="reconnect_account">Hesabı yeniden bağla</string>
+    <string name="reconnect_account_message">Uygulama, yönetici özelliklerine erişemedi. Doğru kapsama sahip olması için hesabınızı yeniden bağlamanız gerekebilir.</string>
+    <string name="unresolved">Çözülmemiş</string>
     <string name="remote">Remote</string>
-    <string name="active">Active</string>
-    <string name="pending">Pending</string>
-    <string name="disabled">Disabled</string>
-    <string name="silenced">Silenced</string>
-    <string name="suspended">Suspended</string>
-    <string name="permissions">Permissions</string>
-    <string name="email_status">Email status</string>
-    <string name="login_status">Login status</string>
-    <string name="joined">Joined</string>
-    <string name="recent_ip">Most recent IP</string>
-    <string name="warn">Warn</string>
-    <string name="disable">Disable</string>
-    <string name="silence">Silence</string>
-    <string name="email_user">Notify the user per e-mail</string>
-    <string name="custom_warning">Custom warning</string>
-    <string name="user">User</string>
-    <string name="moderator">Moderator</string>
-    <string name="administrator">Administrator</string>
-    <string name="confirmed">Confirmed</string>
-    <string name="unconfirmed">Not confirmed</string>
-    <string name="list_reported_statuses">Reported statuses</string>
-    <string name="account">Account</string>
-    <string name="unsilence">Undo silence</string>
-    <string name="undisable">Undo disable</string>
-    <string name="suspend">Suspend</string>
-    <string name="unsuspend">Undo suspend</string>
-    <string name="account_silenced">The account is silenced!</string>
-    <string name="account_unsilenced">The account is no longer silenced!</string>
-    <string name="account_suspended">The account is suspended!</string>
-    <string name="account_unsuspended">The account is no longer suspended!</string>
-    <string name="account_disabled">The account is disabled!</string>
-    <string name="account_undisabled">The account is no longer disabled!</string>
-    <string name="account_warned">The account has been warned!</string>
-    <string name="set_display_admin_menu">Display the admin menu</string>
-    <string name="set_display_admin_toot">Display the admin feature in statuses</string>
-    <string name="allow">Allow</string>
-    <string name="account_approved">The account is approved!</string>
-    <string name="account_rejected">The account is rejected!</string>
-    <string name="assign_to_me">Assign to me</string>
-    <string name="unassign">Unassign</string>
-    <string name="mark_resolved">Mark as resolved</string>
-    <string name="mark_unresolved">Mark as unresolved</string>
-    <string name="toast_empty_content">Empty content!</string>
-    <string name="set_display_fedilab_features_button">Display Fedilab features button</string>
-    <string name="audio">The application needs to access audio recording</string>
-    <string name="voice_message">Voice message</string>
-    <string name="set_quick_reply">Enable quick reply</string>
-    <string name="reply_might_be_useless">The account you are replying might not see your message!</string>
-    <string name="set_remember_position_indication">If disabled, the app will always load last statuses</string>
-    <string name="set_blur_sensitive_indication">If disabled, sensitive media will be hidden with a button</string>
-    <string name="set_long_press_media_indication">Store media in full size with a long press on previews</string>
-    <string name="set_display_timeline_in_list_indication">Add an ellipse button at the top right for listing all tags/instances/lists</string>
-    <string name="live_notif_indication">Keep an open connection to the streaming API for live notifications.</string>
+    <string name="active">Aktif</string>
+    <string name="pending">Bekleyen</string>
+    <string name="disabled">Devre dışı bırakıldı</string>
+    <string name="silenced">Susturuldu</string>
+    <string name="suspended">Askıya alındı</string>
+    <string name="permissions">İzinler</string>
+    <string name="email_status">E-posta durumu</string>
+    <string name="login_status">Oturum açma durumu</string>
+    <string name="joined">Katılım tarihi</string>
+    <string name="recent_ip">En son IP</string>
+    <string name="warn">Uyar</string>
+    <string name="disable">Devre dışı bırak</string>
+    <string name="silence">Sustur</string>
+    <string name="email_user">Kullanıcıyı e-posta ile bilgilendir</string>
+    <string name="custom_warning">Özel uyarı</string>
+    <string name="user">Kullanıcı</string>
+    <string name="moderator">Moderatör</string>
+    <string name="administrator">Yönetici</string>
+    <string name="confirmed">Doğrulandı</string>
+    <string name="unconfirmed">Doğrulanmadı</string>
+    <string name="list_reported_statuses">Bildirilen durumlar</string>
+    <string name="account">Hesap</string>
+    <string name="unsilence">Susturmayı geri al</string>
+    <string name="undisable">Devre dışı bırakmayı geri al</string>
+    <string name="suspend">Askıya al</string>
+    <string name="unsuspend">Askıya almayı geri al</string>
+    <string name="account_silenced">Hesap susturuldu!</string>
+    <string name="account_unsilenced">Hesap artık susturulmuş değil!</string>
+    <string name="account_suspended">Hesap askıya alındı!</string>
+    <string name="account_unsuspended">Hesap artık askıya alınmış değil!</string>
+    <string name="account_disabled">Hesap devre dışı bırakıldı!</string>
+    <string name="account_undisabled">Hesap artık devre dışı değil!</string>
+    <string name="account_warned">Hesap uyarıldı!</string>
+    <string name="set_display_admin_menu">Yönetici menüsünü görüntüle</string>
+    <string name="set_display_admin_toot">Durumlarda yönetici özelliğini göster</string>
+    <string name="allow">İzin ver</string>
+    <string name="account_approved">Hesap onaylandı!</string>
+    <string name="account_rejected">Hesap reddedildi!</string>
+    <string name="assign_to_me">Bana ata</string>
+    <string name="unassign">Atamayı kaldır</string>
+    <string name="mark_resolved">Çözüldü olarak işaretle</string>
+    <string name="mark_unresolved">Çözülmedi olarak işaretle</string>
+    <string name="toast_empty_content">Boş içerik!</string>
+    <string name="set_display_fedilab_features_button">Fedilab özellikleri butonunu göster</string>
+    <string name="audio">Uygulamanın ses kaydetmeye erişmesi gerekiyor</string>
+    <string name="voice_message">Sesli mesaj</string>
+    <string name="set_quick_reply">Hızlı yanıtlamayı etkinleştir</string>
+    <string name="reply_might_be_useless">Cevap verdiğiniz hesap mesajınızı görmeyebilir!</string>
+    <string name="set_remember_position_indication">Devre dışı bırakılırsa, uygulama her zaman son durumları yükleyecektir</string>
+    <string name="set_blur_sensitive_indication">Devre dışı bırakılırsa, hassas medya bir buton ile gizlenecektir</string>
+    <string name="set_long_press_media_indication">Önizlemelere uzun basarak medyayı tam boyutunda kaydedin</string>
+    <string name="set_display_timeline_in_list_indication">Tüm etiketleri/örnekleri/listeleri listelemek için sağ üste bir üç nokta butonu ekle</string>
+    <string name="live_notif_indication">Canlı bildirimler için streaming API\'si ile bir bağlantıyı açık tut.</string>
     <string name="set_enable_time_slot_indication">During the time slot, the app will send notifications. You can reverse (ie: silent) this time slot with the right spinner.</string>
-    <string name="set_display_fedilab_features_button_indication">Display a Fedilab button below profile picture. It is a shortcut for accessing in-app features.</string>
-    <string name="set_quick_reply_indication">Allow to reply directly in timelines below statuses</string>
-    <string name="set_fit_preview_indication">Previews will not be cropped in timelines</string>
-    <string name="set_display_video_preview_indication">Allow to play embedded videos directly in timelines</string>
-    <string name="set_display_content_after_fetch_more_indication">Allow to reverse the way to read statuses that are displayed once tapping the fetch more button</string>
-    <string name="set_security_provider_indication">This option allows to support recent cipher suites. It is useful for older Android devices or if you cannot connect to your instance.</string>
-    <string name="set_video_mode_indication">Exclusively for Peertube videos. Switch this mode if you cannot play them.</string>
-    <string name="featured_hashtags_indication">These tags will allow to filter statuses from profiles. You will have to use the context menu for seeing them.</string>
-    <string name="set_capitalize_indication">Automatically insert a line break after the mention to capitalize the first letter</string>
-    <string name="settings_title_custom_sharing_indication">Allow content creators to share statuses to their RSS feeds</string>
-    <string name="compose">Compose</string>
-    <string name="upload_image_maximum_retry_times">Maximum retry times when uploading media</string>
-    <string name="new_folder">Create a new Folder here</string>
-    <string name="folder_name">Enter the folder name</string>
-    <string name="valid_folder_name">Please enter a valid folder name</string>
-    <string name="folder_exists">This folder already exists.\n Please provide another name for the folder</string>
-    <string name="select">Select</string>
-    <string name="default_directory">Default Directory</string>
-    <string name="folder">Folder</string>
-    <string name="create_folder">Create folder</string>
+    <string name="set_display_fedilab_features_button_indication">Profil resminin altında bir Fedilab butonu göster. Bu, uygulama içi özelliklere erişmek için bir kısayoldur.</string>
+    <string name="set_quick_reply_indication">Doğrudan zaman çizelgelerinde, durumların altında yanıt vermeye izin ver</string>
+    <string name="set_fit_preview_indication">Önizlemeler, zaman çizelgelerinde kırpılmayacak</string>
+    <string name="set_display_video_preview_indication">Gömülü videoları doğrudan zaman çizelgelerinde oynatmaya izin ver</string>
+    <string name="set_display_content_after_fetch_more_indication">Daha fazla getir düğmesine dokunduktan sonra görüntülenen durumları okuma şeklini tersine çevirmeye izin ver</string>
+    <string name="set_security_provider_indication">Bu seçenek en son şifreleme paketlerini desteklemeye izin verir. Eski Android cihazlar için veya örneğinize bağlanamıyorsanız faydalıdır.</string>
+    <string name="set_video_mode_indication">Sadece Peertube videoları için. Eğer onları oynatamıyorsanız bu modu değiştirin.</string>
+    <string name="featured_hashtags_indication">Bu etiketler, durumların profillerden filtrelenmesine olanak tanıyacaktır. Görmek için içerik menüsünü kullanmanız gerekecektir.</string>
+    <string name="set_capitalize_indication">İlk harfi büyük harf yapmak için bahsetmeden sonra otomatik olarak satır sonu karakteri ekle</string>
+    <string name="settings_title_custom_sharing_indication">İçerik oluşturucuların durumlarını RSS yayınlarıyla paylaşmasına izin ver</string>
+    <string name="compose">Oluştur</string>
+    <string name="upload_image_maximum_retry_times">Medyayı karşıya yüklerken maksimum yeniden deneme sayısı</string>
+    <string name="new_folder">Burada yeni bir Klasör oluştur</string>
+    <string name="folder_name">Klasör adını girin</string>
+    <string name="valid_folder_name">Lütfen geçerli bir klasör adı girin</string>
+    <string name="folder_exists">Bu klasör zaten var.\n Lütfen klasör için başka bir isim girin</string>
+    <string name="select">Seç</string>
+    <string name="default_directory">Varsayılan Dizin</string>
+    <string name="folder">Klasör</string>
+    <string name="create_folder">Klasör oluştur</string>
     <string name="set_display_confirm">Display a toast message after an action has been completed (boost, fav, etc.)?</string>
     <string name="muted_instance_exported">Muted instances have been exported!</string>
     <string name="add_instances">Add an instance</string>
@@ -931,6 +944,10 @@
         <item quantity="one">%d vote</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1003,6 +1020,8 @@
     <string name="link_color_title">Linkler</string>
     <string name="link_color">Mesajlardaki linklerin (URL\'ler, bahsedilmeler, etiketler, vb.) rengini değiştirin</string>
     <string name="boost_header_color_title">Başlığı tekrar bloglar</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Tekrar bloglamalar için başlığın rengini değiştirin</string>
     <string name="background_status_title">Gönderiler</string>
     <string name="background_status">Gönderilerin zaman çizelgelerindeki arka plan rengi</string>
@@ -1036,4 +1055,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 90e23c43e..a2cb09982 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -126,6 +126,30 @@
     <string name="date_minutes">%d хв</string>
     <string name="date_hours">%d год</string>
     <string name="date_day">%d д</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="few">%d seconds</item>
+        <item quantity="many">%d seconds</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="few">%d minutes</item>
+        <item quantity="many">%d minutes</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="few">%d hours</item>
+        <item quantity="many">%d hours</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="few">%d days</item>
+        <item quantity="many">%d days</item>
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Попередження</string>
     <string name="toot_placeholder">Що у Вас на думці?</string>
@@ -198,6 +222,7 @@
     <string name="notif_reblog">передмухнув ваш статус</string>
     <string name="notif_favourite">додав до обраного ваш статус</string>
     <string name="notif_follow">підписався(-лась) на вас</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">додати нове сповіщення</item>
         <item quantity="few">додати нове сповіщення</item>
@@ -274,6 +299,7 @@
     <string name="set_notify">Сповістити?</string>
     <string name="set_notif_silent">Тихі сповіщення</string>
     <string name="set_nsfw_timeout">NSFW тимчасовий (секунди, 0 означає off)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Редагувати обліковий запис</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -296,11 +322,6 @@
     <string name="use_javascript">Увімкнути JavaScript</string>
     <string name="expand_cw">Автоматично розкривати Cw</string>
     <string name="use_cookies">Приймати куки від сторонніх сайтів</string>
-    <string-array name="settings_translation">
-        <item>Яндекс</item>
-        <item>DeepL</item>
-        <item>Ні</item>
-    </string-array>
     <string name="your_api_key">Ваш API ключ, можете залишити пустим для Яндекс</string>
     <string-array name="settings_theme">
         <item>Темна</item>
@@ -933,6 +954,12 @@
         <item quantity="many">%d votes</item>
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="few">%d voters</item>
+        <item quantity="many">%d voters</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1005,6 +1032,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1038,4 +1067,45 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 210ed5436..9bccb22c9 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -126,6 +126,18 @@
     <string name="date_minutes">%d m</string>
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="other">%d days</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Cảnh báo</string>
     <string name="toot_placeholder">Bạn đang nghĩ cái gì thế?</string>
@@ -198,6 +210,7 @@
     <string name="notif_reblog">đẩy mạnh tình trạng của bạn</string>
     <string name="notif_favourite">ưu đãi tình trạng của bạn</string>
     <string name="notif_follow">đã theo bạn</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="other">và một thông báo khác
 và %d thông báo khác</item>
@@ -269,6 +282,7 @@ và %d thông báo khác</item>
     <string name="set_notify">Thông báo?</string>
     <string name="set_notif_silent">Thông báo im lặng</string>
     <string name="set_nsfw_timeout">Thời gian chờ của NSFW (giây, 0 có nghĩa là tắt)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Chỉnh sửa tiểu sử</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -291,11 +305,6 @@ và %d thông báo khác</item>
     <string name="use_javascript">Bật Javascript</string>
     <string name="expand_cw">Automatically expand cw</string>
     <string name="use_cookies">Cho phép cookie của bên thứ ba</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>Không</item>
-        <item>Không</item>
-    </string-array>
     <string name="your_api_key">Your API key, you can leave blank for Yandex</string>
     <string-array name="settings_theme">
         <item>Dark</item>
@@ -931,6 +940,9 @@ và %d thông báo khác</item>
     <plurals name="number_of_vote">
         <item quantity="other">%d votes</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1003,6 +1015,8 @@ và %d thông báo khác</item>
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1036,4 +1050,45 @@ và %d thông báo khác</item>
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">Export bookmarks to the instance</string>
+    <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 689e0158e..1ad8a3cb8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -126,6 +126,18 @@
     <string name="date_minutes">%d 分</string>
     <string name="date_hours">%d 小时</string>
     <string name="date_day">%d 天</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="other">%d 秒</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="other">%d 分钟</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="other">%d 小时</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="other">%d 天</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">警告</string>
     <string name="toot_placeholder">你在想什么？</string>
@@ -198,6 +210,7 @@
     <string name="notif_reblog">转嘟了您的状态</string>
     <string name="notif_favourite">收藏了您的状态</string>
     <string name="notif_follow">关注了您</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="other">和另外 %d 条通知</item>
     </plurals>
@@ -268,6 +281,7 @@
     <string name="set_notify">开启通知？</string>
     <string name="set_notif_silent">静音通知</string>
     <string name="set_nsfw_timeout">NSFW 查看超时（秒，0 表示关闭）</string>
+    <string name="set_med_desc_timeout">媒体描述超时(秒，0表示关闭)</string>
     <string name="settings_title_profile">编辑个人资料</string>
     <string name="settings_title_custom_sharing">自定义分享</string>
     <string name="settings_custom_sharing_url">您的自定义分享链接&#8230;</string>
@@ -290,11 +304,6 @@
     <string name="use_javascript">启用 Javascript</string>
     <string name="expand_cw">自动展开带有警告的内容</string>
     <string name="use_cookies">允许第三方 cookie</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>否</item>
-    </string-array>
     <string name="your_api_key">您的 API 密钥，对于 Yandex 您可以留空</string>
     <string-array name="settings_theme">
         <item>暗色</item>
@@ -935,6 +944,9 @@
     <plurals name="number_of_vote">
         <item quantity="other">%d 票</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="other">%d 位投票者</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>单选</item>
         <item>多选</item>
@@ -1006,6 +1018,8 @@
     <string name="link_color_title">链接</string>
     <string name="link_color">更改消息中链接的颜色 (URL、提及、标签等)</string>
     <string name="boost_header_color_title">重发博客标题</string>
+    <string name="displayname_title">更改消息顶部显示名称的颜色</string>
+    <string name="username_title">更改消息顶部用户名的颜色</string>
     <string name="boost_header_color">更改重发博客头的颜色</string>
     <string name="background_status_title">发布</string>
     <string name="background_status">时间线中发布的背景颜色</string>
@@ -1039,4 +1053,45 @@
     <string name="export_theme">导出主题</string>
     <string name="export_theme_title">点击此处以导出当前主题</string>
     <string name="theme_file_error">选择主题文件时出错</string>
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+    <string name="export_bookmarks">导出书签到实例</string>
+    <string name="import_bookmarks">从实例导入书签</string>
+    <string name="user_count">用户数</string>
+    <string name="status_count">状态数</string>
+    <string name="instance_count">实例数</string>
+    <string name="blocked">已阻止</string>
+    <string name="poll_finish_in">结束于 %s</string>
+    <string name="release_note_title">%s 的新功能</string>
+    <string name="follow_account_update">您可以关注我的帐户以获取更新</string>
+    <string name="no_instance_reccord">此实例在 https://instance.social 上不可用</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">已验证身份</string>
+    <string name="verified_by">验证通过 %1$s (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 9208c982f..0573be558 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -126,6 +126,18 @@
     <string name="date_minutes">%d 分鐘</string>
     <string name="date_hours">%d 小時</string>
     <string name="date_day">%d 天</string>
+    <plurals name="date_seconds_polls">
+        <item quantity="other">%d秒</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="other">%d分</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="other">%d小時</item>
+    </plurals>
+    <plurals name="date_day_polls">
+        <item quantity="other">%d天</item>
+    </plurals>
     <!-- TOOT -->
     <string name="toot_cw_placeholder">警告</string>
     <string name="toot_placeholder">您正在想些什麼？</string>
@@ -198,6 +210,7 @@
     <string name="notif_reblog">已轉嘟您的嘟文</string>
     <string name="notif_favourite">將您的嘟文加到最愛</string>
     <string name="notif_follow">關注了您</string>
+    <string name="notif_follow_request">要求追蹤您</string>
     <plurals name="other_notifications">
         <item quantity="other">和另外 %d 個通知</item>
     </plurals>
@@ -268,6 +281,7 @@
     <string name="set_notify">通知？</string>
     <string name="set_notif_silent">靜音通知</string>
     <string name="set_nsfw_timeout">NSFW 檢視逾時（秒，0 代表關閉）</string>
+    <string name="set_med_desc_timeout">媒體描述逾時（秒，0 代表關閉）</string>
     <string name="settings_title_profile">編輯個人資料</string>
     <string name="settings_title_custom_sharing">自訂分享</string>
     <string name="settings_custom_sharing_url">您的自訂分享 URL&#8230;</string>
@@ -290,11 +304,6 @@
     <string name="use_javascript">啟用 Javascript</string>
     <string name="expand_cw">自動展開 cw</string>
     <string name="use_cookies">允許第三方 cookies</string>
-    <string-array name="settings_translation">
-        <item>Yandex</item>
-        <item>DeepL</item>
-        <item>否</item>
-    </string-array>
     <string name="your_api_key">您的 API 金鑰，若為 Yandex 則可留空</string>
     <string-array name="settings_theme">
         <item>暗</item>
@@ -779,7 +788,7 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
     <string name="toast_error_instance_reg">在檢查可用站台時發生了些問題！</string>
     <string name="join_mastodon">加入 Mastodon</string>
     <string name="pickup_instance_category">透過挑選分類，然後按下按鈕來選擇站台。</string>
-    <string name="pickup_instance_peertube">點擊勾選按鈕來選擇站臺。</string>
+    <string name="pickup_instance_peertube">按一下勾選按鈕以選擇站台。</string>
     <string name="users">%1$s 位使用者</string>
     <string name="password_confirm">確認密碼</string>
     <string name="agreement_check">我同意 %1$s 和 %2$s</string>
@@ -934,6 +943,9 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
     <plurals name="number_of_vote">
         <item quantity="other">%d 人投票</item>
     </plurals>
+    <plurals name="number_of_voters">
+        <item quantity="other">%d 位投票者</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>單種選擇</item>
         <item>多種選擇</item>
@@ -978,7 +990,7 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
     <string name="set_hide_status_bar">隱藏 Fedilab 通知列</string>
     <string name="set_hide_status_bar_indication">要隱藏狀態列中的其餘通知，點擊眼睛圖示的按鈕上然後取消勾選「在狀態列中顯示」</string>
     <string name="set_live_type_indication">通知將會每30秒被延遲一次。這將會降低電池的消耗。</string>
-    <string name="live_delayed">即時通知已延遲</string>
+    <string name="live_delayed">延遲即時通知</string>
     <string name="no_live_notif">沒有即時通知</string>
     <string name="no_live_indication">將會每15分鐘擷取一次通知。</string>
     <string name="action_add_notes">新增註記</string>
@@ -987,55 +999,98 @@ Yandex 有適當的隱私權政策，可以在這裡找到：https://yandex.ru/l
     <string name="set_resize_video_indication">允許在維持品質的同時壓縮影片。</string>
     <string name="please_wait_compression">應用程式正在壓縮媒體，可能會很久……</string>
     <string name="change_app_icon_experimental">變更應用程式圖示</string>
-    <string name="click_to_change_the_app_icon">點擊以變更應用程式圖示</string>
+    <string name="click_to_change_the_app_icon">按一下變更應用程式圖示</string>
     <string name="post">張貼</string>
     <string name="post_visibility_tilte">嘟文可見度</string>
-    <string name="add_photo_pixelfed">點選此處以新增照片</string>
+    <string name="add_photo_pixelfed">按一下這裡新增照片</string>
     <string name="add_photo_indication_pixelfed">可用格式：JPEG、PNG、GIF \n\n 最大檔案大小：15 MB \n\n 相簿可以包含最多 4 張照片或影片</string>
     <string name="upload_media">上傳媒體</string>
-    <string name="pixelfed_compose_placeholder">新增可選的選項</string>
+    <string name="pixelfed_compose_placeholder">新增可選標題</string>
     <string name="long_api_error">應用程式從 API %1$s 收到非常長的錯誤訊息</string>
     <string name="message_preview">訊息預覽</string>
     <string name="report_mention">在每個訊息中新增提及</string>
-    <string name="fetch_conversation">擷取對話</string>
-    <string name="order_by">排序由</string>
+    <string name="fetch_conversation">正在擷取對話</string>
+    <string name="order_by">排序依</string>
     <string name="title_video_peertube">影片標題</string>
     <string name="join_peertube">加入 Peertube</string>
-    <string name="agreement_check_peertube">我至少 16 歲並同意此站臺的 %1$s</string>
+    <string name="agreement_check_peertube">我至少 16 歲並同意此站台的 %1$s</string>
     <string name="link_color_title">連結</string>
     <string name="link_color">在訊息中變更連結的顏色（URL、提及、標籤等等）</string>
     <string name="boost_header_color_title">轉發標頭</string>
+    <string name="displayname_title">更改訊息頂部的顯示名稱色彩</string>
+    <string name="username_title">更改訊息頂部的使用者名稱色彩</string>
     <string name="boost_header_color">變更轉發標頭的顏色</string>
-    <string name="background_status_title">貼文</string>
-    <string name="background_status">時間軸中貼文的背景顏色</string>
+    <string name="background_status_title">嘟文</string>
+    <string name="background_status">時間軸中嘟文的背景顏色</string>
     <string name="reset_color">重設顏色</string>
-    <string name="clik_reset">在此點擊以重設您所有自訂的顏色</string>
+    <string name="clik_reset">按一下這裡重設所有自訂顏色</string>
     <string name="reset">重設</string>
     <string name="icons_color_title">圖示</string>
     <string name="icons_color">時間軸底部圖示的顏色</string>
     <string name="pin_tag">釘選此標籤</string>
-    <string name="logo_of_the_instance">站臺圖示</string>
+    <string name="logo_of_the_instance">站台圖示</string>
     <string name="edit_profile">編輯個人資料</string>
     <string name="make_an_action">做動作</string>
     <string name="translation">翻譯</string>
     <string name="image_preview">圖片預覽</string>
     <string name="text_color_title">文字色彩</string>
-    <string name="text_color">變更 pots 中的文字色彩</string>
+    <string name="text_color">變更嘟文／轉嘟／訊息等的文字色彩</string>
     <string name="apply_changes">套用變更</string>
     <string name="restart_message">您必須重新啟動應用程式以套用變更</string>
     <string name="restart">重新啟動</string>
     <string name="pref_custom_theme">使用自訂佈景主題</string>
     <string name="pref_custom_theme_summary">允許覆寫在上方選定的佈景主題的顏色</string>
     <string name="theming">主題</string>
-    <string name="store_before">Store before</string>
-    <string name="data_export_theme">The theme was exported</string>
-    <string name="data_export_theme_success">The theme has been successfully exported in CSV</string>
-    <string name="pref_colored_status_bar_summary">Apply the primary color to the status bar</string>
-    <string name="pref_colored_status_bar_title">Status bar color</string>
-    <string name="restore_default_theme">Restore a default theme</string>
-    <string name="import_theme">Import a theme</string>
-    <string name="import_theme_title">Tap here to import a theme from a previous export</string>
-    <string name="export_theme">Export the theme</string>
-    <string name="export_theme_title">Tap here to export the current theme</string>
-    <string name="theme_file_error">An error occurred when selecting the theme file</string>
+    <string name="store_before">儲存之前</string>
+    <string name="data_export_theme">佈景主題已匯出</string>
+    <string name="data_export_theme_success">佈景主題已成功匯出為 CSV</string>
+    <string name="pref_colored_status_bar_summary">將主要色彩套用到狀態列上</string>
+    <string name="pref_colored_status_bar_title">狀態列色彩</string>
+    <string name="restore_default_theme">恢復預設佈景主題</string>
+    <string name="import_theme">匯入佈景主題</string>
+    <string name="import_theme_title">點擊這裡以從先前匯出的檔案匯入佈景主題</string>
+    <string name="export_theme">匯出佈景主題</string>
+    <string name="export_theme_title">點擊這裡以匯出目前的佈景主題</string>
+    <string name="theme_file_error">選取佈景主題檔案時遇到錯誤</string>
+    <string name="label_theme_picker">佈景主題挑選程式</string>
+    <string name="pref_theme_summary">選取預先安裝的佈景主題</string>
+    <string name="pref_theme_title">佈景主題</string>
+    <string name="pref_colored_navigation_bar_summary">將主要顏色套用到導覽列上</string>
+    <string name="pref_colored_navigation_bar_title">導航列顏色</string>
+    <string name="pref_background_color_summary">應用程式內容的基礎顏色。</string>
+    <string name="pref_background_color_title">背景色彩</string>
+    <string name="pref_accent_color_summary">選取部份使用者界面的強調色彩。</string>
+    <string name="pref_accent_color_title">強調色彩</string>
+    <string name="pref_primary_color_summary">最常顯示在您的應用程式中。</string>
+    <string name="pref_primary_color_title">主要色彩</string>
+    <string name="export_bookmarks">匯出書籤到站臺</string>
+    <string name="import_bookmarks">從站臺匯入書籤</string>
+    <string name="user_count">使用者數量</string>
+    <string name="status_count">狀態數量</string>
+    <string name="instance_count">站臺數量</string>
+    <string name="blocked">已阻擋</string>
+    <string name="poll_finish_in">結束於 %s</string>
+    <string name="release_note_title">%s 新鮮事</string>
+    <string name="follow_account_update">您可以追蹤我的帳號來取得更新</string>
+    <string name="no_instance_reccord">此站臺於 https://instances.social 上不可用</string>
+    <string name="display_full_link">顯示完整連結</string>
+    <string name="share_link">分享連結</string>
+    <string name="link_copy">URL 已複製到剪貼簿</string>
+    <string name="open_other_app">使用其他應用程式開啟</string>
+    <string name="check_redirect">檢查重新導向</string>
+    <string name="no_redirect">此 URL 不會重新導向</string>
+    <string name="redirect_detected">%1$s \n\n重新導向到\n\n %2$s</string>
+    <string name="set_user_agent">變更使用者代理字串</string>
+    <string name="set_user_agent_hint">設定自訂的使用者代理字串或留空</string>
+    <string name="set_user_agent_indication">允許自訂用於 api 呼叫或內建瀏覽器的使用者字串</string>
+    <string name="set_utm_parameters">移除 UTM 參數</string>
+    <string name="set_utm_parameters_indication">應用程式將會在造訪連結前自動移除 UTM 參數</string>
+    <string name="action_trends">趨勢</string>
+    <string name="trending_now">目前趨勢</string>
+    <string name="talking_about">%d 個正在談論</string>
+    <string name="twitter_accounts">Twitter 帳號（透過 Nitter）</string>
+    <string name="list_of_twitter_accounts">以空格分開的 Twitter 使用者名稱</string>
+    <string name="identity_proofs">身份證明</string>
+    <string name="verified_user">已驗證的身份</string>
+    <string name="verified_by">由 %1$s 驗證 (%2$s)</string>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ef430ac0b..16f7dc261 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -34,6 +34,7 @@
     <color name="mastodonC3">#d9e1e8</color>
     <color name="mastodonC3__">#efefef</color>
     <color name="mastodonC4__">#772b90d9</color>
+    <color name="mastodonC4___">#9FBEDD</color>
     <color name="mastodonC4">#2b90d9</color>
 
 
@@ -124,7 +125,7 @@
     <color name="dark_blockquote">#5E68A0</color>
 
     <color name="cyanea_primary_reference">#0288D1</color>
-    <color name="cyanea_accent_reference">#FFA000</color>
+    <color name="cyanea_accent_reference">#2b90d9</color>
 
 
     <color name="dark_icon_theme">#f3f3f3</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 14e37eaeb..0bdca4b63 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -139,6 +139,24 @@
     <string name="date_hours">%d h</string>
     <string name="date_day">%d d</string>
 
+    <plurals name="date_seconds_polls">
+        <item quantity="one">%d second</item>
+        <item quantity="other">%d seconds</item>
+    </plurals>
+    <plurals name="date_minutes_polls">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="date_hours_polls">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+
+    <plurals name="date_day_polls">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
+
     <!-- TOOT -->
     <string name="toot_cw_placeholder">Warning</string>
     <string name="toot_placeholder">What is on your mind?</string>
@@ -220,6 +238,7 @@
     <string name="notif_reblog">boosted your status</string>
     <string name="notif_favourite">favourited your status</string>
     <string name="notif_follow">followed you</string>
+    <string name="notif_follow_request">asked to follow you</string>
     <plurals name="other_notifications">
         <item quantity="one">and another notification</item>
         <item quantity="other">and %d other notifications</item>
@@ -292,6 +311,7 @@
     <string name="set_notify">Notify?</string>
     <string name="set_notif_silent">Silent Notifications</string>
     <string name="set_nsfw_timeout">NSFW view timeout (seconds, 0 means off)</string>
+    <string name="set_med_desc_timeout">Media Description timeout (seconds, 0 means off)</string>
     <string name="settings_title_profile">Edit profile</string>
     <string name="settings_title_custom_sharing">Custom sharing</string>
     <string name="settings_custom_sharing_url">Your custom sharing URL&#8230;</string>
@@ -317,10 +337,10 @@
     <string name="use_cookies">Allow third-party cookies</string>
 
 
-    <string-array name="settings_translation">
+    <string-array name="settings_translation" translatable="false">
         <item>Yandex</item>
         <item>DeepL</item>
-        <item>No</item>
+        <item>Systran</item>
     </string-array>
 
     <string name="your_api_key">Your API key, you can leave blank for Yandex</string>
@@ -651,10 +671,7 @@
     </string-array>
 
 
-    <string name="showcase_instance">
-        In this field, you need to write your instance host name.\nFor example, if you created your account on https://mastodon.social\nJust write <b>mastodon.social</b> (without https://)\n
-        You can start writing first letters and names will be suggested.\n\n
-        ⚠ The Login button will only work if the instance name is valid and the instance is up!
+    <string name="showcase_instance">In this field, you need to write your instance domain.\nFor example, if you created your account on https://mastodon.social\nJust write <b>mastodon.social</b>\nYou can start writing first letters and names will be suggested.
     </string>
     <string name="more_information">More information</string>
 
@@ -1036,6 +1053,10 @@
         <item quantity="other">%d votes</item>
     </plurals>
 
+    <plurals name="number_of_voters">
+        <item quantity="one">%d voter</item>
+        <item quantity="other">%d voters</item>
+    </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>
         <item>Multiple choices</item>
@@ -1113,6 +1134,8 @@
     <string name="link_color_title">Links</string>
     <string name="link_color">Change the color of links (URLs, mentions, tags, etc.) in messages</string>
     <string name="boost_header_color_title">Reblogs header</string>
+    <string name="displayname_title">Change the color of display name at the top of messages</string>
+    <string name="username_title">Change the color of the user name at the top of messages</string>
     <string name="boost_header_color">Change the color of the header for reblogs</string>
     <string name="background_status_title">Posts</string>
     <string name="background_status">Background color of posts in timelines</string>
@@ -1146,6 +1169,50 @@
     <string name="export_theme">Export the theme</string>
     <string name="export_theme_title">Tap here to export the current theme</string>
     <string name="theme_file_error">An error occurred when selecting the theme file</string>
+
+    <string name="label_theme_picker">Theme Picker</string>
+    <string name="pref_theme_summary">Select a pre-installed theme</string>
+    <string name="pref_theme_title">Themes</string>
+    <string name="pref_colored_navigation_bar_summary">Apply the primary color to the navigation bar</string>
+    <string name="pref_colored_navigation_bar_title">Navigation bar color</string>
+    <string name="pref_background_color_summary">The underlying color of the app’s content.</string>
+    <string name="pref_background_color_title">Background color</string>
+    <string name="pref_accent_color_summary">Accents select parts of the UI.</string>
+    <string name="pref_accent_color_title">Accent color</string>
+    <string name="pref_primary_color_summary">Displayed most frequently across your app.</string>
+    <string name="pref_primary_color_title">Primary color</string>
+
+
     <string name="export_bookmarks">Export bookmarks to the instance</string>
     <string name="import_bookmarks">Import bookmarks from the instance</string>
+    <string name="user_count">User count</string>
+    <string name="status_count">Status count</string>
+    <string name="instance_count">Instance count</string>
+    <string name="blocked">Blocked</string>
+    <string name="poll_finish_in">End in %s</string>
+    <string name="release_note_title">What\'s new in %s</string>
+    <string name="follow_account_update">You can follow my account for updates</string>
+    <string name="no_instance_reccord">This instance is not available on https://instances.social</string>
+    <string name="display_full_link">Display full link</string>
+    <string name="share_link">Share link</string>
+    <string name="link_copy">The URL has been copied to the clipboard</string>
+    <string name="open_other_app">Open with another app</string>
+    <string name="check_redirect">Check redirect</string>
+    <string name="no_redirect">This URL does not redirect</string>
+    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>
+    <string name="set_user_agent">Change the user agent</string>
+    <string name="set_user_agent_hint">Set a custom user agent or leave blank</string>
+    <string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
+    <string name="set_utm_parameters">Remove UTM parameters</string>
+    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
+    <string name="action_trends">Trends</string>
+    <string name="trending_now">Trending now</string>
+    <string name="talking_about">%d people talking</string>
+    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>
+    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>
+    <string name="identity_proofs">Identity proofs</string>
+    <string name="verified_user">Verified identity</string>
+    <string name="verified_by">Verified by %1$s (%2$s)</string>
+    <string name="remove_notification">Delete the notification</string>
+    <string name="display_more_options">Display more options</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0aced80cc..a73194a69 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -9,6 +9,7 @@
     <attr name="textColor" type="color" />
     <attr name="linkColor" type="color" />
 
+
     <!-- Light theme -->
     <style name="AppTheme_Fedilab" parent="Theme.Cyanea.Light">
         <item name="cardviewColor">@color/white</item>
@@ -20,6 +21,8 @@
         <item name="textColor">@color/black</item>
         <item name="android:textColor">@color/black</item>
         <item name="linkColor">@color/light_link_toot</item>
+        <item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Light</item>
+        <item name="android:itemBackground">@drawable/menu_selector</item>
     </style>
 
 
@@ -33,6 +36,8 @@
         <item name="textColor">@color/black</item>
         <item name="android:textColor">@color/black</item>
         <item name="linkColor">@color/light_link_toot</item>
+        <item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Light</item>
+        <item name="android:itemBackground">@drawable/menu_selector</item>
     </style>
     <!-- BLACK theme -->
     <style name="AppThemeBlack" parent="Theme.Cyanea.Dark">
@@ -45,6 +50,8 @@
         <item name="textColor">@color/dark_text</item>
         <item name="android:textColor">@color/dark_text</item>
         <item name="linkColor">@color/black_link_toot</item>
+        <item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Dark</item>
+        <item name="android:itemBackground">@drawable/menu_selector</item>
     </style>
 
     <style name="AppThemeBlack_NoActionBar" parent="Theme.Cyanea.Dark.NoActionBar">
@@ -57,6 +64,8 @@
         <item name="textColor">@color/dark_text</item>
         <item name="android:textColor">@color/dark_text</item>
         <item name="linkColor">@color/black_link_toot</item>
+        <item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Dark</item>
+        <item name="android:itemBackground">@drawable/menu_selector</item>
     </style>
 
 
@@ -71,6 +80,8 @@
         <item name="textColor">@color/dark_text</item>
         <item name="android:textColor">@color/dark_text</item>
         <item name="linkColor">@color/dark_link_toot</item>
+        <item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Dark</item>
+        <item name="android:itemBackground">@drawable/menu_selector</item>
     </style>
 
     <style name="AppThemeDark_NoActionBar" parent="Theme.Cyanea.Dark.NoActionBar">
@@ -83,6 +94,8 @@
         <item name="textColor">@color/dark_text</item>
         <item name="android:textColor">@color/dark_text</item>
         <item name="linkColor">@color/dark_link_toot</item>
+        <item name="android:popupMenuStyle">@style/Fedilab.PopupMenu.Dark</item>
+        <item name="android:itemBackground">@drawable/menu_selector</item>
     </style>
 
 
@@ -97,6 +110,7 @@
         <item name="android:textColor">@color/black</item>
         <item name="buttonBarButtonStyle">@style/DialogButton</item>
         <item name="linkColor">@color/light_link_toot</item>
+        <item name="android:windowBackground">@color/cyanea_primary_reference</item>
     </style>
 
     <style name="DialogDark" parent="Cyanea.AlertDialog.Theme.Dark">
@@ -104,6 +118,7 @@
         <item name="android:textColor">@color/dark_text</item>
         <item name="buttonBarButtonStyle">@style/DialogButton</item>
         <item name="linkColor">@color/dark_link_toot</item>
+        <item name="android:windowBackground">@color/cyanea_primary_reference</item>
     </style>
 
     <style name="DialogBlack" parent="Cyanea.AlertDialog.Theme.Dark">
@@ -111,43 +126,65 @@
         <item name="android:textColor">@color/dark_text</item>
         <item name="buttonBarButtonStyle">@style/DialogButton</item>
         <item name="linkColor">@color/black_link_toot</item>
+        <item name="android:windowBackground">@color/cyanea_primary_reference</item>
     </style>
 
     <style name="TransparentLight" parent="Theme.Cyanea.Light">black_icon_theme
         <item name="iconColor">@color/black</item>
         <item name="iconColorMenu">@color/black</item>
-        <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="textColor">@color/black</item>
         <item name="android:textColor">@color/black</item>
         <item name="linkColor">@color/light_link_toot</item>
+        <item name="android:itemBackground">@drawable/menu_selector</item>
     </style>
 
     <style name="TransparentDark" parent="Theme.Cyanea.Dark">
         <item name="iconColor">@color/dark_icon_theme</item>
         <item name="iconColorMenu">@color/dark_icon_theme</item>
-        <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:textColor">@color/dark_text</item>
         <item name="linkColor">@color/dark_link_toot</item>
+        <item name="android:itemBackground">@drawable/menu_selector</item>
     </style>
 
     <style name="TransparentBlack" parent="Theme.Cyanea.Dark">
         <item name="iconColor">@color/black_icon_theme</item>
         <item name="iconColorMenu">@color/dark_icon_theme</item>
-        <item name="android:windowIsTranslucent">true</item>
+
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:textColor">@color/dark_text</item>
         <item name="linkColor">@color/black_link_toot</item>
+        <item name="android:itemBackground">@drawable/menu_selector</item>
+    </style>
+
+    <style name="Fedilab.PopupMenu.Light" parent="Cyanea.PopupMenu.Light">
+        <item name="android:colorBackground">@color/cyanea_primary_reference</item>
+        <item name="android:popupBackground">@color/cyanea_primary_reference</item>
+    </style>
+    <style name="Fedilab.PopupMenu.Dark" parent="Cyanea.PopupMenu.Dark">
+        <item name="android:colorBackground">@color/cyanea_primary_reference</item>
+        <item name="android:popupBackground">@color/cyanea_primary_reference</item>
+    </style>
+
+    <!-- Light theme -->
+    <style name="AppAdminTheme" parent="AppThemeDark">
+
     </style>
 
 
-    <!-- Light theme -->
-    <style name="AppAdminTheme" parent="Theme.Cyanea.Dark">
+    <style name="TabLayoutStyle" parent="Base.Widget.Design.TabLayout">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textAllCaps">true</item>
+    </style>
 
+
+    <style name="colored_button" parent="Widget.AppCompat.Button.Colored">
+        <item name="android:layout_marginStart">5dp</item>
+        <item name="android:layout_marginEnd">5dp</item>
     </style>
 
 </resources>
diff --git a/app/src/main/res/xml/fragment_settings_color.xml b/app/src/main/res/xml/fragment_settings_color.xml
index 4f319f364..158aebbb4 100644
--- a/app/src/main/res/xml/fragment_settings_color.xml
+++ b/app/src/main/res/xml/fragment_settings_color.xml
@@ -32,6 +32,20 @@
         android:title="@string/boost_header_color_title"
         app:iconSpaceReserved="false" />
 
+    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
+        android:defaultValue="-1"
+        android:key="theme_text_header_1_line"
+        android:summary="@string/displayname_title"
+        android:title="@string/display_name"
+        app:iconSpaceReserved="false" />
+
+    <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
+        android:defaultValue="-1"
+        android:key="theme_text_header_2_line"
+        android:summary="@string/username_title"
+        android:title="@string/username"
+        app:iconSpaceReserved="false" />
+
     <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
         android:defaultValue="-1"
         android:key="theme_statuses_color"
diff --git a/fastlane/metadata/android/ca/full_description.txt b/fastlane/metadata/android/ca/full_description.txt
index 41262f1cb..6ca13d082 100644
--- a/fastlane/metadata/android/ca/full_description.txt
+++ b/fastlane/metadata/android/ca/full_description.txt
@@ -14,5 +14,5 @@ L'aplicació té funcionalitats avançades (sobretot per a Pleroma i Mastodont):
 - Silenciar comptes temporalment
 - Executar accions entre els comptes amb pitjada llarga
 - Funcionalitat de traducció
-- Pissarres de creació artística
+- Pissarres amb Art
 - Pissarres de vídeo
diff --git a/fastlane/metadata/android/de/full_description.txt b/fastlane/metadata/android/de/full_description.txt
index 992daaa38..241f15c38 100644
--- a/fastlane/metadata/android/de/full_description.txt
+++ b/fastlane/metadata/android/de/full_description.txt
@@ -1,18 +1,18 @@
-Fedilab is a multifunctional Android client to access the distributed Fediverse, consisting of micro blogging, photo sharing and video hosting.
+Fedilab ist ein multifunktionaler Android-Client für den Zugriff auf das verteilte Fediverse, bestehend aus Microblogging, Foto- und Videoaustausch.
 
-It supports:
+Es unterstützt:
 - Mastodon, Pleroma, Pixelfed, Peertube, GNU Social, Friendica.
 
 
-The app has advanced features (especially for Pleroma and Mastodon):
+Die App verfügt über erweiterte Funktionen (insbesondere für Pleroma und Mastodon):
 
-- Multi-accounts support
-- Schedule messages from the device
-- Schedule boosts
-- Bookmark messages
-- Follow and interact with remote instances
-- Timed mute accounts
-- Cross-account actions with a long press
-- Translation feature
-- Art timelines
-- Video timelines
+- Unterstützung von Mehrfachkonten
+- Zeitgesteuerte Nachrichten vom Smartphone senden
+- Zeitgesteuerte Boosts
+- Lesezeichen für Nachrichten
+- Folgen und Interagieren mit Remote-Instanzen
+- Zeitgesteuerte Stummschaltung von Konten
+- Kontoübergreifende Aktionen mit langem Tastendruck
+- Übersetzungsfunktion
+- Bilder-Zeitleiste
+- Video-Zeitleiste
diff --git a/fastlane/metadata/android/de/short_description.txt b/fastlane/metadata/android/de/short_description.txt
index 13216e790..dcf90e6dd 100644
--- a/fastlane/metadata/android/de/short_description.txt
+++ b/fastlane/metadata/android/de/short_description.txt
@@ -1 +1 @@
-Fedilab is a multifunctional Android client to access the distributed Fediverse
\ No newline at end of file
+Fedilab ist ein multifunktionaler Android-Client für den Zugriff auf das verteilte Fediverse
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/253.txt b/fastlane/metadata/android/en-US/changelogs/253.txt
deleted file mode 100644
index fc6f1021b..000000000
--- a/fastlane/metadata/android/en-US/changelogs/253.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Added
-* Poll notifications
-* Customise notification sounds per type (Android O+)
-
-Changed
-* More filters for UTM parameters
-* Live notifications for Pleroma are back
-* Honour white spaces in toots (emoji art)
-
-Fixed
-* Issues with some Mastodon API due to their special version name
-* Auto-save feature, drafts not deleted after being sent
-* Issue when uploading media due to the file name
-* Issue with the pinch-zoom
-* Polls not displayed in boosts
-
diff --git a/fastlane/metadata/android/en-US/changelogs/257.txt b/fastlane/metadata/android/en-US/changelogs/257.txt
deleted file mode 100644
index c937cf856..000000000
--- a/fastlane/metadata/android/en-US/changelogs/257.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Added
-* Reorder timelines
-* Pin followed instances and lists
-* Hide/Show timelines easily
-* Add an option to hide 🆕 badge on unread toots
-* BBCode support for Pleroma
-
-Changed
-* Display a more informative toast when translation service is disabled
-* Make the preview image fit in the viewer in content description popup
-* Changed some design stuff in notification settings screen
-
-Fixed
-* Move locked account indicator to end of the username
-* Polls with more than 4 choices
-* Follow/Unfollow from toot information
-
diff --git a/fastlane/metadata/android/en-US/changelogs/258.txt b/fastlane/metadata/android/en-US/changelogs/258.txt
deleted file mode 100644
index e27c04627..000000000
--- a/fastlane/metadata/android/en-US/changelogs/258.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed
-* Fix an issue when refreshing polls
-* Fix an issue when accessing to filters
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/259.txt b/fastlane/metadata/android/en-US/changelogs/259.txt
deleted file mode 100644
index fca91459a..000000000
--- a/fastlane/metadata/android/en-US/changelogs/259.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Added
-* Add followed instances directly in the reorder timelines
-* Swipe for removing lists
-* Polls can be filtered in notifications
-
-Changed
-* Remove the follow instances button at the bottom left
-
-Fixed
-* Followed instances not visible in light mode
-* Click on notifications
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/260.txt b/fastlane/metadata/android/en-US/changelogs/260.txt
deleted file mode 100644
index e761c5736..000000000
--- a/fastlane/metadata/android/en-US/changelogs/260.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Added
-* Long press on "Fetch more" will retrieve all missing statuses
-* Long press on media in timelines will download them in full resolution
-* Favourite video from Peertube when following an instance
-
-Fixed
-* Crashes when notifications timeline has been moved
-* Media not uploaded when the filename contains some special characters
-* Fix vote issue on reblogs
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/261.txt b/fastlane/metadata/android/en-US/changelogs/261.txt
deleted file mode 100644
index 9a1596b9d..000000000
--- a/fastlane/metadata/android/en-US/changelogs/261.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Added
-* Blur sensitive media
-* Automatically federate accounts when searching (Mastodon/Pleroma/Peertube/Pixelfed/GNU)
-* Media can be set always as sensitive (synced with Mastodon)
-* Searches on a Peertube timeline filter videos
-
-Changed
-* Add a back button in account viewer
-* Make the menu button dark in light theme for account viewer
-
-Fixed
-* Fix an issue when following an instance
-* Fix layout for tabs when there are few ones
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/264.txt b/fastlane/metadata/android/en-US/changelogs/264.txt
deleted file mode 100644
index 5c75c0339..000000000
--- a/fastlane/metadata/android/en-US/changelogs/264.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Added
-* Cache toots (click on the indicator for refreshing a status)
-* Follow GNU Social instances
-* Add an indicator in TL for bot accounts
-
-Changed
-* Give less space to user name at the top of statuses
-* Improvement with blocking script updates
-
-Fixed
-* Issue with boosts & sensitive media
-* Issue with the Fetch more button
-* Avoid holes in TL after few hours
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/265.txt b/fastlane/metadata/android/en-US/changelogs/265.txt
deleted file mode 100644
index 86b7b9f50..000000000
--- a/fastlane/metadata/android/en-US/changelogs/265.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Added
-* Cache toots (click on the indicator for refreshing a status)
-* Follow GNU Social instances
-* Add an indicator in TL for bot accounts
-
-Changed
-* Give less space to user name at the top of statuses
-* Improvement with blocking script updates
-* Change layout for bookmark & translation buttons
-
-Fixed
-* Issue with boosts & sensitive media
-* Issue with the Fetch more button
-* Avoid holes in TL after few hours
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/267.txt b/fastlane/metadata/android/en-US/changelogs/267.txt
deleted file mode 100644
index 0637c8bd1..000000000
--- a/fastlane/metadata/android/en-US/changelogs/267.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixed
-* Fix a crash on some devices
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/271.txt b/fastlane/metadata/android/en-US/changelogs/271.txt
deleted file mode 100644
index 13584e342..000000000
--- a/fastlane/metadata/android/en-US/changelogs/271.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Added
-- Filter followed instances with tags
-- Allow do disable the remember position feature
-- Bot icon can be disabled
-- Support onion instances over SSL
-- Booster accounts are clickable
-- Proxy available for the built-in browser
-
-Fixed
-- Fixed conversations in compact mode
-- Crashes when importing data with Pleroma
-- Issue when attaching media with cross-account actions
-- Statuses with one char or emoji
-- Top bar hidden with media player.
-- Some old toots at the top
-- Some crashes
diff --git a/fastlane/metadata/android/en-US/changelogs/274.txt b/fastlane/metadata/android/en-US/changelogs/274.txt
deleted file mode 100644
index 65ff04d9a..000000000
--- a/fastlane/metadata/android/en-US/changelogs/274.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Added
-- Peertube playlists
-- Video history timeline for Peertube
-- URLs shortened in toots
-
-Changed
-- Emoji count one char
-- URL length is 23 max in counter
-- Improve split feature
-
-Fixed
-- App name not clickable in toots
-- Custom emoji with cross-account actions
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/276.txt b/fastlane/metadata/android/en-US/changelogs/276.txt
deleted file mode 100644
index 7aa09e371..000000000
--- a/fastlane/metadata/android/en-US/changelogs/276.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Added
-- Add photo editor (can be disabled in settings)
-
-Fixed
-- Crashes with media on Fdroid
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/279.txt b/fastlane/metadata/android/en-US/changelogs/279.txt
deleted file mode 100644
index 91fde205a..000000000
--- a/fastlane/metadata/android/en-US/changelogs/279.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Added
-- Extends polls for Pleroma (not limited to 4 choices)
-
-Changed
-- Media are load in background with a notification for upload
-- Improve polls
-
-Fixed
-- Fix an issue with media upload when the instance uses Cloudflare
-- Several crashes
diff --git a/fastlane/metadata/android/en-US/changelogs/280.txt b/fastlane/metadata/android/en-US/changelogs/280.txt
deleted file mode 100644
index 852e50c32..000000000
--- a/fastlane/metadata/android/en-US/changelogs/280.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Added
-- Allow to mute a conversation
-
-Changed
-- Improve the upload for Peertube
-
-Fixed
-- Fix an issue when using GIF from keyboard
-- Fix issues with Peertube notifications
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/281.txt b/fastlane/metadata/android/en-US/changelogs/281.txt
deleted file mode 100644
index 6fcff4ac6..000000000
--- a/fastlane/metadata/android/en-US/changelogs/281.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Added
-- Add a button to access custom features in statuses
-- Add a News timeline for Fedilab that can be disabled in settings
-
-Fixed
-- Fix an issue with boosts when cached
-- Fix an issue for toots no longer stored in drafts when there is no Internet connection
-- Fix potential crashes on some devices
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/282.txt b/fastlane/metadata/android/en-US/changelogs/282.txt
deleted file mode 100644
index faca46c4f..000000000
--- a/fastlane/metadata/android/en-US/changelogs/282.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Added
-- Sign up on Mastodon with instance suggestions
-
-Changed
-- Panel of features next to the button
-
-Fixed
-- Automatic split toot feature
-- Proxy with upload
-- Long text with the compose activity
-- Overlay with error message and notifications
-- Fix error when uploading image
-- Some other crashes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/283.txt b/fastlane/metadata/android/en-US/changelogs/283.txt
deleted file mode 100644
index 1d8ce8c24..000000000
--- a/fastlane/metadata/android/en-US/changelogs/283.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Changed
-- Reply icon
-
-Fixed
-- CW when composing
-- Error with shortened URLs
-- Always mark media as sensitive
-- NEW badge's letters being transparent
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/284.txt b/fastlane/metadata/android/en-US/changelogs/284.txt
deleted file mode 100644
index ccc0cbab8..000000000
--- a/fastlane/metadata/android/en-US/changelogs/284.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Added
-- Admin and moderation support for Mastodon (enable it in settings)
-- Support for audio with Mastodon (listen and upload)
-
-Changed
-- Remove instance block feature inside the app
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/285.txt b/fastlane/metadata/android/en-US/changelogs/285.txt
deleted file mode 100644
index 353aa7210..000000000
--- a/fastlane/metadata/android/en-US/changelogs/285.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Added
-- Block a whole instance by adding their name
-
-Fixed
-- Fix muting conversation issue
-- Crash with admin feature when no toots were attached to a report
-- Edited images stored in download directory instead of the app cache directory
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/287.txt b/fastlane/metadata/android/en-US/changelogs/287.txt
deleted file mode 100644
index ff4906bea..000000000
--- a/fastlane/metadata/android/en-US/changelogs/287.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-<b>Added</b>
-- Quick reply below statuses: change visibility/emoji picker/auto-completion/switch in full version
-- Send voice messages
-- New audio player
-- Know when it's useless to reply
-
-<b>Changed</b>
-- Improvement with the admin features
-- New images for audio media
-
-<b>Fixed</b>
-- Fix with Peertube searches
-- Some other bug fixes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/288.txt b/fastlane/metadata/android/en-US/changelogs/288.txt
deleted file mode 100644
index c1e8d1bf2..000000000
--- a/fastlane/metadata/android/en-US/changelogs/288.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-<b>Added</b>
-- Moderation feature for Pleroma
-
-<b>Changed</b>
-- Add media with polls with Pleroma
-
-<b>Fixed</b>
-- Behavior of the compose button when scrolling
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/289.txt b/fastlane/metadata/android/en-US/changelogs/289.txt
deleted file mode 100644
index 58358598e..000000000
--- a/fastlane/metadata/android/en-US/changelogs/289.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Changed
-- New settings divided with categories
-
-Fixed
-- Quick reply broken with the compact mode
-- Some crashes in console mode
-- Crashes when using the quick reply
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/290.txt b/fastlane/metadata/android/en-US/changelogs/290.txt
deleted file mode 100644
index eed4e8880..000000000
--- a/fastlane/metadata/android/en-US/changelogs/290.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Changed
-- New settings divided with categories
-- Add more retries when uploads fail (can be defined in settings)
-- Add Fedilab features button to focused statuses
-
-Fixed
-- Fix issue with mentions when composing
-- Quick reply broken with the compact mode
-- Some crashes in console mode
-- Crashes when using the quick reply
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/291.txt b/fastlane/metadata/android/en-US/changelogs/291.txt
deleted file mode 100644
index 84bde2854..000000000
--- a/fastlane/metadata/android/en-US/changelogs/291.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Added
-- Export blocked instances (can be shared with some explanations)
-- Auto save drafts for quick replies
-- Quick reply automatically added below the toot for conversations
-
-Changed
-- Remove peertube.social
-
-Fixed
-- Auto-complete feature with quick reply
-- Remove statuses in timelines after unfollows or timed-mute
-- Fix the fetch more button
-- Medium accounts are no longer opened with the app.
-- Gif media not displayed in media activity
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/292.txt b/fastlane/metadata/android/en-US/changelogs/292.txt
deleted file mode 100644
index 6ee099efe..000000000
--- a/fastlane/metadata/android/en-US/changelogs/292.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Fixed
-- Images when editing profile (Pleroma)
-- Profiles with remote instances (Pleroma)
-- Issue when following Pixelfed instances
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/293.txt b/fastlane/metadata/android/en-US/changelogs/293.txt
deleted file mode 100644
index fa0969d2a..000000000
--- a/fastlane/metadata/android/en-US/changelogs/293.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Added:
-- Crash reports can be sent by email (default: disabled)
-
-Changed
-- User agent reversed to its default value
-- Decrease the number of accounts/statuses/notifications loaded per page (40 -> 20)
-
-Fixed
-- Notification counter issue
-- Fix boost/reply/fav with the news timeline
-- Fix some crashes
diff --git a/fastlane/metadata/android/en-US/changelogs/294.txt b/fastlane/metadata/android/en-US/changelogs/294.txt
deleted file mode 100644
index fa0969d2a..000000000
--- a/fastlane/metadata/android/en-US/changelogs/294.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Added:
-- Crash reports can be sent by email (default: disabled)
-
-Changed
-- User agent reversed to its default value
-- Decrease the number of accounts/statuses/notifications loaded per page (40 -> 20)
-
-Fixed
-- Notification counter issue
-- Fix boost/reply/fav with the news timeline
-- Fix some crashes
diff --git a/fastlane/metadata/android/en-US/changelogs/295.txt b/fastlane/metadata/android/en-US/changelogs/295.txt
deleted file mode 100644
index e29cb1262..000000000
--- a/fastlane/metadata/android/en-US/changelogs/295.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Added:
-- WYSIWYG for Pleroma (can be disabled in settings)
-- Statistics (Your toots -> top right button)
-
-Changed
-- Uploads automatically resized to 4Mb (can be disabled in settings)
-- Remove all exif (not for media orientation)
-- <img> tags are automatically fetched (Pleroma, Friendica, GNU).
-
-Fixed
-- Last lists not removed
-- Play sounds
-- Upload with Friendica & GNU Social
-- Crash when replying to a message
-- Fix interactions with the News timeline
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/296.txt b/fastlane/metadata/android/en-US/changelogs/296.txt
deleted file mode 100644
index a06edf2b2..000000000
--- a/fastlane/metadata/android/en-US/changelogs/296.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Added:
-- Groups for GNU Social
-- Animated custom emojis (can be disabled in settings)
-- Statistics for tags
-
-Changed
-- Emoji picker (bug fix + animation)
-
-
-Fixed
-- Fix an issue when fetching remote accounts
-- Auto-completion with tags
-- Multi-upload broken
-- Issue when sharing GIF
-- Keyboard not closed after a quick reply
diff --git a/fastlane/metadata/android/en-US/changelogs/297.txt b/fastlane/metadata/android/en-US/changelogs/297.txt
deleted file mode 100644
index 75746869e..000000000
--- a/fastlane/metadata/android/en-US/changelogs/297.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Added:
-- Groups for GNU Social
-- Animated custom emojis (can be disabled in settings)
-- Statistics for tags
-
-Changed
-- Emoji picker (bug fix + animation)
-- Improve auto-split feature
-
-
-Fixed
-- Fix an issue when fetching remote accounts
-- Auto-completion with tags
-- Multi-upload broken
-- Issue when sharing GIF
-- Keyboard not closed after a quick reply
diff --git a/fastlane/metadata/android/en-US/changelogs/299.txt b/fastlane/metadata/android/en-US/changelogs/299.txt
deleted file mode 100644
index 171fca3f0..000000000
--- a/fastlane/metadata/android/en-US/changelogs/299.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Added
-- Charts for statistics
-- Cross-account replies and posts (GNU Social and Friendica)
-- Animated banners
-
-Changed
-- Profiles
-- Counter with mentions
-
-Fixed
-- German translations
-- Orientation issue with media editor
-- Issue with GIF no longer loaded
-- Improve custom animated emojis
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/300.txt b/fastlane/metadata/android/en-US/changelogs/300.txt
deleted file mode 100644
index 266964221..000000000
--- a/fastlane/metadata/android/en-US/changelogs/300.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Changed
-- Default banner when missing
-
-Fixed
-- Crashes with Pleroma notifications
-- Crashes when changing the theme
-- Some other bug fixes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/301.txt b/fastlane/metadata/android/en-US/changelogs/301.txt
deleted file mode 100644
index 38d6b28b5..000000000
--- a/fastlane/metadata/android/en-US/changelogs/301.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Added
-- Report accounts from their profile
-
-Fixed
-- Fix recent crashes
-- Search results: Tag list duplicated
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/304.txt b/fastlane/metadata/android/en-US/changelogs/304.txt
deleted file mode 100644
index 9bf41afb0..000000000
--- a/fastlane/metadata/android/en-US/changelogs/304.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Added
-- Network and creation date in profiles
-- Allow to send an invitation an easily create an account with the app
-
-Fixed
-- Fix bookmarks and threads where last message couldn't be expanded
-- Fix lags and some crashes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/306.txt b/fastlane/metadata/android/en-US/changelogs/306.txt
deleted file mode 100644
index 291360399..000000000
--- a/fastlane/metadata/android/en-US/changelogs/306.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Added
-- Add accounts in list from their profile
-- Search are also performed in cache
-- Quoting with ">" have a custom layout
-
-Changed
-- Improve memory usage
-- Cache clearing removes all statuses in cache for the home timeline
-
-Fixed
-- Some crashes
-
-fedilab_morse
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/308.txt b/fastlane/metadata/android/en-US/changelogs/308.txt
deleted file mode 100644
index db8a8f0a7..000000000
--- a/fastlane/metadata/android/en-US/changelogs/308.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Added
-- Select data to remove in database with the cache cleaner
-- Animated emojis in picker
-
-Changed
-- Easier feature for cropping media
-- Improve quotes
-
-Fixed
-- Potential crashes when switching between accounts
-- Autocomplete (Emoji+tag) removed a letter
-- Fix recent crashes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/314.txt b/fastlane/metadata/android/en-US/changelogs/314.txt
deleted file mode 100644
index db8ad6d12..000000000
--- a/fastlane/metadata/android/en-US/changelogs/314.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Added
-- Clear cache when leaving the app (default: disabled)
-- Ability to use an instance of Invidious to play Youtube videos (default: disabled, default instance: invidio.us)
-- Confirmation before unfollowing an account (can be disabled in settings)
-- Shortcut in settings for hiding the remaining notification in status bar.
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/315.txt b/fastlane/metadata/android/en-US/changelogs/315.txt
deleted file mode 100644
index 6b5932a98..000000000
--- a/fastlane/metadata/android/en-US/changelogs/315.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Added
-- Delayed live notifications by default
-- Store in drafts for quick replies
-
-Changed
-- Improve Invidious support (local=true, more URLs detected)
-- Set the type of live notifications (live, delayed, none).
-
-Fixed
-- Unknown URL scheme with built-in browser
-- Crash when clicking on thumbs-up button for Peertube videos with a Mastodon account
diff --git a/fastlane/metadata/android/en-US/changelogs/316.txt b/fastlane/metadata/android/en-US/changelogs/316.txt
deleted file mode 100644
index 27a58f67d..000000000
--- a/fastlane/metadata/android/en-US/changelogs/316.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Added
-- Twitter URLs can be replaced with Nitter (or one of its instances)
-- Take notes for accounts
-- Delayed live notifications
-- Store in drafts for quick replies
-
-Changed
-- Improve Invidious support (local=true, more URLs detected)
-- Set the type of live notifications (live, delayed, none).
-- Improve auto-split feature
-
-Fixed
-- Unknown URL scheme with built-in browser
-- Fix mentions
-- Crash when clicking on thumbs-up button for Peertube videos with a Mastodon account
-- Fix a scrolling issue
-- Fix Peertube playlist 1.4+
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/321.txt b/fastlane/metadata/android/en-US/changelogs/321.txt
deleted file mode 100644
index 0d370ad5f..000000000
--- a/fastlane/metadata/android/en-US/changelogs/321.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Welcome to Pixelfed inside the app with a dedicated layout.
-
-In-app features available:
-- Bookmarks, timed mute, schedule posts, drafts, scheduled boosts, export/import blocked domains.
-
-Deep work for making a dedicated application for Pixelfed. Contact me for bugs/improvements.
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/322.txt b/fastlane/metadata/android/en-US/changelogs/322.txt
deleted file mode 100644
index b3fea4f2f..000000000
--- a/fastlane/metadata/android/en-US/changelogs/322.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Welcome to Pixelfed inside the app with a dedicated layout.
-
-In-app features available:
-- Bookmarks, timed mute, schedule posts, drafts, scheduled boosts, export/import blocked domains.
-
-Deep work for making a dedicated application for Pixelfed. Contact me for bugs/improvements.
diff --git a/fastlane/metadata/android/en-US/changelogs/323.txt b/fastlane/metadata/android/en-US/changelogs/323.txt
deleted file mode 100644
index baeae6948..000000000
--- a/fastlane/metadata/android/en-US/changelogs/323.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Added
-- Preview for the automatic split feature (mentions in each message can be added/removed in a simple click)
-
-Changed
-- Improvement with delayed notifications
-
-Fixed
-- Peertube connection
-- Fix some crashes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/324.txt b/fastlane/metadata/android/en-US/changelogs/324.txt
deleted file mode 100644
index 6f2796001..000000000
--- a/fastlane/metadata/android/en-US/changelogs/324.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Added
-- Preview for the automatic split feature (mentions in each message can be added/removed in a simple click)
-
-Changed
-- Improvement with delayed notifications
-- Replace Twitter names with Nitter
-
-Fixed
-- Fix cross sharing issue with media
-- Improve account switching
-- Peertube connection
-- Fix some crashes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/325.txt b/fastlane/metadata/android/en-US/changelogs/325.txt
deleted file mode 100644
index 8ab79ca88..000000000
--- a/fastlane/metadata/android/en-US/changelogs/325.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Changed
-- Improvements for the media activity
-- Better management of live notifications
-- Add icon for videos (Pixelfed)
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/326.txt b/fastlane/metadata/android/en-US/changelogs/326.txt
deleted file mode 100644
index ee80019e2..000000000
--- a/fastlane/metadata/android/en-US/changelogs/326.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Changed
-- Improvement with the media layout
-- Better management of live notifications
-- Add icon for videos (Pixelfed)
-- Fetch more toots more visible and at the bottom
-
-Fixed
-- Crashes with Android 5
-- Add mentions to a reply (thread)
-- Messages lost when canceling a delete & re-draft.
-- Fix an issue with the auto-split feature
-- Issue with the fetch more button (fav or boost)
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/327.txt b/fastlane/metadata/android/en-US/changelogs/327.txt
deleted file mode 100644
index 9a13ad154..000000000
--- a/fastlane/metadata/android/en-US/changelogs/327.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Added
-- Improve battery drain with delayed notifications
-- Allow to reverse the list of our toots
-- Bottom loader when loading long threads
-
-Fixed
-- Interacting with a post resets quick reply
-- Timed mute does not mute boosts
-- Upload compression for videos badly resized
-- Proxy not working when uploading media
diff --git a/fastlane/metadata/android/en-US/changelogs/328.txt b/fastlane/metadata/android/en-US/changelogs/328.txt
deleted file mode 100644
index ec101f400..000000000
--- a/fastlane/metadata/android/en-US/changelogs/328.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Added
-- Improve battery drain with delayed notifications
-- Allow to reverse the list of "Your toots"
-- Bottom loader when loading long threads
-
-Fixed
-- Interacting with a post resets quick reply
-- Timed mute does not mute boosts
-- Upload compression for videos badly resized
-- Proxy not working when uploading media
-- Fix Peertube discover
-- Fix notifications displayed twice
-- Fix crash with art timeline
diff --git a/fastlane/metadata/android/en-US/changelogs/329.txt b/fastlane/metadata/android/en-US/changelogs/329.txt
deleted file mode 100644
index 87431082a..000000000
--- a/fastlane/metadata/android/en-US/changelogs/329.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Added
-- New layout for timelines
-- Peertube: add a title before uploading
-
-Fixed
-- Notifications not working on some devices
-- Notifications not clickable
-- Issue when sharing media
-- Fix crashes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/331.txt b/fastlane/metadata/android/en-US/changelogs/331.txt
deleted file mode 100644
index 20a7825c9..000000000
--- a/fastlane/metadata/android/en-US/changelogs/331.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Added
-- New layout for timelines
-- Peertube: add a title before uploading
-
-Changed
-- Improve the launch time
-
-Fixed
-- Notifications not working on some devices
-- Notifications not clickable
-- Fix regression with multiple notifications
-- Issue when sharing media
-- Fix crashes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/332.txt b/fastlane/metadata/android/en-US/changelogs/332.txt
deleted file mode 100644
index bd5c494bd..000000000
--- a/fastlane/metadata/android/en-US/changelogs/332.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Added
-- Custom emoji in polls
-
-Fixed
-- Fix missing features for Pleroma accounts
diff --git a/fastlane/metadata/android/en-US/changelogs/342.txt b/fastlane/metadata/android/en-US/changelogs/342.txt
new file mode 100644
index 000000000..2d2b53d36
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/342.txt
@@ -0,0 +1,12 @@
+Added
+- Unshortened URLs can be copied or shared
+- Trends in tags search
+- Image are shared/stored from cache
+- Message when a media is successfully downloaded
+
+Fixed
+- Issue with polls not displayed
+- Notifications not stopped
+- Pleroma wysiwyg
+- Login issue
+- Some crashes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/343.txt b/fastlane/metadata/android/en-US/changelogs/343.txt
new file mode 100644
index 000000000..769ebc05d
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/343.txt
@@ -0,0 +1,6 @@
+Added
+- Follow Nitter feeds (ie: Twitter account timelines)
+
+Fixed
+- Crash issue when no live notifications
+- Trends can't be hidden
diff --git a/fastlane/metadata/android/en-US/changelogs/344.txt b/fastlane/metadata/android/en-US/changelogs/344.txt
new file mode 100644
index 000000000..dd079ee1a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/344.txt
@@ -0,0 +1,14 @@
+Added
+- Original & boost dates added separately
+- Follow request notifications
+- Identity proofs support
+
+Changed
+- Media are preloaded when scrolling
+- Improve live/delayed notifications
+
+Fixed
+- Counter for mentions
+- Preview images displayed twice
+- Media not saved on Android 10+
+- Issue when following instances/pinging tags
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/345.txt b/fastlane/metadata/android/en-US/changelogs/345.txt
new file mode 100644
index 000000000..8bcd296b8
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/345.txt
@@ -0,0 +1,6 @@
+Added
+- Friendica: Authorize/Reject follow requests
+
+Fixed
+- Not cropped media
+- Crash when starting the app
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 992daaa38..568f4d67d 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,5 +1,3 @@
-Fedilab is a multifunctional Android client to access the distributed Fediverse, consisting of micro blogging, photo sharing and video hosting.
-
 It supports:
 - Mastodon, Pleroma, Pixelfed, Peertube, GNU Social, Friendica.
 
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
index 13216e790..b5458a109 100644
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-Fedilab is a multifunctional Android client to access the distributed Fediverse
\ No newline at end of file
+Fedilab is a multifunctional Android client to access the distributed Fediverse, consisting of micro blogging, photo sharing and video hosting.
diff --git a/fastlane/metadata/android/eu/full_description.txt b/fastlane/metadata/android/eu/full_description.txt
index e3388cb89..17223e918 100644
--- a/fastlane/metadata/android/eu/full_description.txt
+++ b/fastlane/metadata/android/eu/full_description.txt
@@ -1,4 +1,4 @@
-Fedilab banatutako Fedibertsoa atzitzeko funtzio anitzeko Android bezeroa da, mikroblogintzarako, argazkiak partekatzeko edo bideoak ostatatzeko erabili daiteke.
+Fedilab Fedibertso banatua atzitzeko funtzio anitzeko Android bezeroa da, mikroblogintzarako, argazkiak partekatzeko, edo bideoak ostatatzeko erabili daiteke.
 
 Hauentzako euskarria du:
 - Mastodon, Pleroma, Pixelfed, Peertube, GNU Social, Friendica.
@@ -9,7 +9,7 @@ Aplikazio honek ezaugarri aurreratuak ditu (bereziki Pleroma eta Mastodonekin):
 - Hainbat kontuentzako euskarria
 - Programatu mezuak gailutik
 - Programatu bultzadak
-- Mezuen laster-marka
+- Mezuen laster-markak
 - Jarraitu urruneko instantziak eta hauekin aritu
 - Isildu kontuak denbora baterako
 - Kontu zeharkako ekintzak luze sakatuz
diff --git a/fastlane/metadata/android/eu/short_description.txt b/fastlane/metadata/android/eu/short_description.txt
index 1b149bea2..2b89a576e 100644
--- a/fastlane/metadata/android/eu/short_description.txt
+++ b/fastlane/metadata/android/eu/short_description.txt
@@ -1 +1 @@
-Fedilab banatutako Fedibertsoa atzitzeko funtzio anitzeko Android bezeroa da
\ No newline at end of file
+Fedilab Fedibertso banatua atzitzeko funtzio anitzeko Android bezeroa da
\ No newline at end of file
diff --git a/fastlane/metadata/android/fa/full_description.txt b/fastlane/metadata/android/fa/full_description.txt
index 992daaa38..54bb6299a 100644
--- a/fastlane/metadata/android/fa/full_description.txt
+++ b/fastlane/metadata/android/fa/full_description.txt
@@ -1,7 +1,7 @@
 Fedilab is a multifunctional Android client to access the distributed Fediverse, consisting of micro blogging, photo sharing and video hosting.
 
-It supports:
-- Mastodon, Pleroma, Pixelfed, Peertube, GNU Social, Friendica.
+این‌ها پشتیبانی می‌شوند:
+ماستدون، پلرمو، پیکسل‌فد، پیرتیوب، گنوسوشال، فرندیکا.
 
 
 The app has advanced features (especially for Pleroma and Mastodon):
diff --git a/fastlane/metadata/android/fa/short_description.txt b/fastlane/metadata/android/fa/short_description.txt
index 13216e790..7dd721c9c 100644
--- a/fastlane/metadata/android/fa/short_description.txt
+++ b/fastlane/metadata/android/fa/short_description.txt
@@ -1 +1 @@
-Fedilab is a multifunctional Android client to access the distributed Fediverse
\ No newline at end of file
+فدیلب یک کارخواه اندرویدی چندکاربرده برای دسترسی به دنیای توزیع‌شدهٔ فدیورس است
\ No newline at end of file
diff --git a/fastlane/metadata/android/pt/full_description.txt b/fastlane/metadata/android/pt/full_description.txt
index 992daaa38..1d439a7b6 100644
--- a/fastlane/metadata/android/pt/full_description.txt
+++ b/fastlane/metadata/android/pt/full_description.txt
@@ -1,16 +1,16 @@
-Fedilab is a multifunctional Android client to access the distributed Fediverse, consisting of micro blogging, photo sharing and video hosting.
+Fedilab é um cliente Android multifuncional para aceder o distribuído Fediverse, composto por microblogging, compartilha de fotos e hospedagem de vídeos.
 
-It supports:
+São suportados:
 - Mastodon, Pleroma, Pixelfed, Peertube, GNU Social, Friendica.
 
 
 The app has advanced features (especially for Pleroma and Mastodon):
 
-- Multi-accounts support
+- Suporte a várias contas
 - Schedule messages from the device
 - Schedule boosts
 - Bookmark messages
-- Follow and interact with remote instances
+- Seguir e interagir com instâncias remotas
 - Timed mute accounts
 - Cross-account actions with a long press
 - Translation feature
diff --git a/fastlane/metadata/android/ru/full_description.txt b/fastlane/metadata/android/ru/full_description.txt
index 992daaa38..abcfbb4d7 100644
--- a/fastlane/metadata/android/ru/full_description.txt
+++ b/fastlane/metadata/android/ru/full_description.txt
@@ -1,18 +1,18 @@
-Fedilab is a multifunctional Android client to access the distributed Fediverse, consisting of micro blogging, photo sharing and video hosting.
+Fedilab - многофункциональный Android-клиент для доступа к распределенной Fediverse, состоящей из микроблогов, обмена фотографиями и хостинга видео.
 
-It supports:
+Он поддерживает:
 - Mastodon, Pleroma, Pixelfed, Peertube, GNU Social, Friendica.
 
 
-The app has advanced features (especially for Pleroma and Mastodon):
+Приложение имеет дополнительные функции (в частности для Pleroma и Mastodon):
 
-- Multi-accounts support
-- Schedule messages from the device
-- Schedule boosts
-- Bookmark messages
-- Follow and interact with remote instances
-- Timed mute accounts
-- Cross-account actions with a long press
-- Translation feature
-- Art timelines
-- Video timelines
+- Поддержка нескольких аккаунтов
+- Планирование сообщений с устройства
+- Планирование бустов
+- Сохранение сообщений в закладки
+- Подписка и взаимодействие с удалёнными инстансами
+- Временное отключение аккаунтов
+- Действия между аккаунтами с длительным нажатием
+- Функция перевода
+- Ленты для искусства
+- Ленты для видео
diff --git a/fastlane/metadata/android/ru/short_description.txt b/fastlane/metadata/android/ru/short_description.txt
index 13216e790..df5bdaa6a 100644
--- a/fastlane/metadata/android/ru/short_description.txt
+++ b/fastlane/metadata/android/ru/short_description.txt
@@ -1 +1 @@
-Fedilab is a multifunctional Android client to access the distributed Fediverse
\ No newline at end of file
+Fedilab - многофункциональный Android-клиент для доступа к распределенной Fediverse
\ No newline at end of file