diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 00000000..fb7f4a8a
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5cd135a0..7f3ebf04 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,8 +5,9 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="/opt/Gradle/gradle-6.6.1" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -14,6 +15,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 61c09ccd..d29d0997 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -3,6 +3,11 @@
     <option name="myName" value="Project Default" />
     <inspection_tool class="AndroidLintClickableViewAccessibility" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CanBeFinal" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="REPORT_CLASSES" value="false" />
+      <option name="REPORT_METHODS" value="false" />
+      <option name="REPORT_FIELDS" value="true" />
+    </inspection_tool>
     <inspection_tool class="DuplicateExpressions" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="InnerClassMayBeStatic" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2e003d82..70193702 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -44,7 +44,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index a5666c67..37a7ffd5 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Shitter.iml" filepath="$PROJECT_DIR$/.idea/Shitter.iml" group="Shitter" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" group="Shitter/app" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/Shitter.iml" filepath="$PROJECT_DIR$/.idea/Shitter.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Shitter.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Shitter.app.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 40b807f4..9f0306fb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId 'org.nuclearfog.twidda'
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 22
-        versionName '1.7.14'
+        versionCode 23
+        versionName '1.7.15'
         vectorDrawables.useSupportLibrary true
     }
 
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java b/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java
index e11eea7d..f98ae0d3 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java
@@ -38,8 +38,8 @@ import org.nuclearfog.twidda.backend.LocationListLoader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
 import org.nuclearfog.twidda.backend.engine.TwitterEngine;
 import org.nuclearfog.twidda.backend.items.TrendLocation;
-import org.nuclearfog.twidda.backend.tools.ErrorHandler;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.ErrorHandler;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.DatabaseAdapter;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/DirectMessage.java b/app/src/main/java/org/nuclearfog/twidda/activity/DirectMessage.java
index 9d39fe28..df797fce 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/DirectMessage.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/DirectMessage.java
@@ -14,7 +14,7 @@ import androidx.viewpager.widget.ViewPager;
 
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.adapter.FragmentAdapter;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 /**
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/ListDetail.java b/app/src/main/java/org/nuclearfog/twidda/activity/ListDetail.java
index 8f210d73..e839f5eb 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/ListDetail.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/ListDetail.java
@@ -14,7 +14,7 @@ import com.google.android.material.tabs.TabLayout.Tab;
 
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.adapter.FragmentAdapter;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 /**
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/LoginActivity.java b/app/src/main/java/org/nuclearfog/twidda/activity/LoginActivity.java
index 95e034e1..6a906155 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/LoginActivity.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/LoginActivity.java
@@ -22,8 +22,8 @@ import androidx.appcompat.widget.Toolbar;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.Registration;
 import org.nuclearfog.twidda.backend.engine.EngineException;
-import org.nuclearfog.twidda.backend.tools.ErrorHandler;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.ErrorHandler;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.security.NoSuchAlgorithmException;
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/MediaViewer.java b/app/src/main/java/org/nuclearfog/twidda/activity/MediaViewer.java
index 481ab6bb..114735ea 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/MediaViewer.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/MediaViewer.java
@@ -28,7 +28,7 @@ import org.nuclearfog.twidda.backend.ImageLoader;
 import org.nuclearfog.twidda.backend.ImageSaver;
 import org.nuclearfog.twidda.backend.engine.EngineException;
 import org.nuclearfog.twidda.backend.holder.ImageHolder;
-import org.nuclearfog.twidda.backend.tools.ErrorHandler;
+import org.nuclearfog.twidda.backend.utils.ErrorHandler;
 import org.nuclearfog.zoomview.ZoomView;
 
 import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/MessagePopup.java b/app/src/main/java/org/nuclearfog/twidda/activity/MessagePopup.java
index 3b1f98cf..63874087 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/MessagePopup.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/MessagePopup.java
@@ -24,8 +24,8 @@ import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.MessageUploader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
 import org.nuclearfog.twidda.backend.holder.MessageHolder;
-import org.nuclearfog.twidda.backend.tools.ErrorHandler;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.ErrorHandler;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java b/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
index 5952f768..195497fc 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
@@ -34,8 +34,8 @@ import org.nuclearfog.twidda.backend.ProfileUpdater;
 import org.nuclearfog.twidda.backend.engine.EngineException;
 import org.nuclearfog.twidda.backend.holder.UserHolder;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
-import org.nuclearfog.twidda.backend.tools.ErrorHandler;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.ErrorHandler;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/TweetActivity.java b/app/src/main/java/org/nuclearfog/twidda/activity/TweetActivity.java
index 9498b032..dc191074 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/TweetActivity.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/TweetActivity.java
@@ -35,8 +35,8 @@ import org.nuclearfog.twidda.backend.TweetLoader;
 import org.nuclearfog.twidda.backend.TweetLoader.Action;
 import org.nuclearfog.twidda.backend.engine.EngineException;
 import org.nuclearfog.twidda.backend.items.Tweet;
-import org.nuclearfog.twidda.backend.tools.ErrorHandler;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.ErrorHandler;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.text.NumberFormat;
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/TweetPopup.java b/app/src/main/java/org/nuclearfog/twidda/activity/TweetPopup.java
index 62dcf8a6..9876b675 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/TweetPopup.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/TweetPopup.java
@@ -28,8 +28,8 @@ import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.TweetUploader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
 import org.nuclearfog.twidda.backend.holder.TweetHolder;
-import org.nuclearfog.twidda.backend.tools.ErrorHandler;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.ErrorHandler;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.LinkedList;
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/TwitterList.java b/app/src/main/java/org/nuclearfog/twidda/activity/TwitterList.java
index 2f407057..ec858bcf 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/TwitterList.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/TwitterList.java
@@ -10,7 +10,7 @@ import androidx.viewpager.widget.ViewPager;
 
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.adapter.FragmentAdapter;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 /**
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/UserDetail.java b/app/src/main/java/org/nuclearfog/twidda/activity/UserDetail.java
index 4b08da47..a6b4fd24 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/UserDetail.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/UserDetail.java
@@ -10,7 +10,7 @@ import androidx.viewpager.widget.ViewPager;
 
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.adapter.FragmentAdapter;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 /**
diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java b/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java
index 02fdfe80..df7efea8 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/UserProfile.java
@@ -37,8 +37,8 @@ import org.nuclearfog.twidda.backend.ProfileLoader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
 import org.nuclearfog.twidda.backend.items.UserRelation;
-import org.nuclearfog.twidda.backend.tools.ErrorHandler;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.ErrorHandler;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.text.NumberFormat;
diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/ListAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/ListAdapter.java
index 36a3349d..a806f630 100644
--- a/app/src/main/java/org/nuclearfog/twidda/adapter/ListAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/adapter/ListAdapter.java
@@ -18,7 +18,7 @@ import com.squareup.picasso.Picasso;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.items.TwitterList;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.text.NumberFormat;
@@ -28,7 +28,7 @@ import java.util.List;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
-import static org.nuclearfog.twidda.backend.tools.TimeString.getTimeString;
+import static org.nuclearfog.twidda.backend.utils.TimeString.getTimeString;
 
 /**
  * Adapter class for user lists
@@ -37,11 +37,11 @@ import static org.nuclearfog.twidda.backend.tools.TimeString.getTimeString;
  */
 public class ListAdapter extends Adapter<ListAdapter.ListHolder> {
 
-    private ListClickListener listener;
-    private NumberFormat formatter;
-    private GlobalSettings settings;
+    private final ListClickListener listener;
+    private final NumberFormat formatter;
+    private final GlobalSettings settings;
 
-    private List<TwitterList> data;
+    private final List<TwitterList> data;
 
 
     public ListAdapter(ListClickListener listener, GlobalSettings settings) {
diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/MessageAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/MessageAdapter.java
index f0719b28..a4f3d0a4 100644
--- a/app/src/main/java/org/nuclearfog/twidda/adapter/MessageAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/adapter/MessageAdapter.java
@@ -22,14 +22,14 @@ import org.nuclearfog.tag.Tagger.OnTagClickListener;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.items.Message;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
-import static org.nuclearfog.twidda.backend.tools.TimeString.getTimeString;
+import static org.nuclearfog.twidda.backend.utils.TimeString.getTimeString;
 
 /**
  * Adapter class for direct messages list
@@ -38,10 +38,10 @@ import static org.nuclearfog.twidda.backend.tools.TimeString.getTimeString;
  */
 public class MessageAdapter extends Adapter<MessageAdapter.MessageHolder> {
 
-    private OnItemSelected itemClickListener;
-    private GlobalSettings settings;
+    private final OnItemSelected itemClickListener;
+    private final GlobalSettings settings;
 
-    private List<Message> messages;
+    private final List<Message> messages;
 
 
     public MessageAdapter(OnItemSelected itemClickListener, GlobalSettings settings) {
diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/TrendAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/TrendAdapter.java
index 513bae19..6ced7cc8 100644
--- a/app/src/main/java/org/nuclearfog/twidda/adapter/TrendAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/adapter/TrendAdapter.java
@@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.items.TwitterTrend;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.text.NumberFormat;
@@ -32,11 +32,11 @@ import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
  */
 public class TrendAdapter extends Adapter<TrendAdapter.ItemHolder> {
 
-    private TrendClickListener itemClickListener;
-    private GlobalSettings settings;
-    private NumberFormat formatter;
+    private final TrendClickListener itemClickListener;
+    private final GlobalSettings settings;
+    private final NumberFormat formatter;
 
-    private List<TwitterTrend> trends;
+    private final List<TwitterTrend> trends;
 
 
     public TrendAdapter(TrendClickListener itemClickListener, GlobalSettings settings) {
diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java
index 1c5d818d..d7a2472f 100644
--- a/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java
@@ -22,7 +22,7 @@ import org.nuclearfog.tag.Tagger;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.items.Tweet;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.text.NumberFormat;
@@ -33,7 +33,7 @@ import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 import static androidx.recyclerview.widget.RecyclerView.NO_ID;
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
-import static org.nuclearfog.twidda.backend.tools.TimeString.getTimeString;
+import static org.nuclearfog.twidda.backend.utils.TimeString.getTimeString;
 
 /**
  * Adapter class for tweet list
@@ -47,12 +47,12 @@ public class TweetAdapter extends Adapter<ViewHolder> {
     private static final int VIEW_GAP = 1;
     private static final int MIN_COUNT = 2;
 
-    private TweetClickListener itemClickListener;
-    private NumberFormat formatter;
-    private GlobalSettings settings;
+    private final TweetClickListener itemClickListener;
+    private final NumberFormat formatter;
+    private final GlobalSettings settings;
     private int loadingIndex;
 
-    private List<Tweet> tweets;
+    private final List<Tweet> tweets;
 
 
     public TweetAdapter(TweetClickListener itemClickListener, GlobalSettings settings) {
diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java
index 715b5853..32358fca 100644
--- a/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java
@@ -20,7 +20,7 @@ import com.squareup.picasso.Picasso;
 import org.nuclearfog.twidda.R;
 import org.nuclearfog.twidda.backend.holder.UserListHolder;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
-import org.nuclearfog.twidda.backend.tools.FontTool;
+import org.nuclearfog.twidda.backend.utils.FontTool;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.ArrayList;
@@ -42,10 +42,10 @@ public class UserAdapter extends Adapter<ViewHolder> {
     private static final int ITEM_USER = 0;
     private static final int ITEM_GAP = 1;
 
-    private UserClickListener itemClickListener;
-    private GlobalSettings settings;
+    private final UserClickListener itemClickListener;
+    private final GlobalSettings settings;
 
-    private List<TwitterUser> users;
+    private final List<TwitterUser> users;
     private long nextCursor;
     private int loadingIndex;
 
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/tools/ErrorHandler.java b/app/src/main/java/org/nuclearfog/twidda/backend/utils/ErrorHandler.java
similarity index 98%
rename from app/src/main/java/org/nuclearfog/twidda/backend/tools/ErrorHandler.java
rename to app/src/main/java/org/nuclearfog/twidda/backend/utils/ErrorHandler.java
index f19fd990..16dbb9e1 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/tools/ErrorHandler.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/utils/ErrorHandler.java
@@ -1,4 +1,4 @@
-package org.nuclearfog.twidda.backend.tools;
+package org.nuclearfog.twidda.backend.utils;
 
 import android.content.Context;
 import android.widget.Toast;
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/tools/FontTool.java b/app/src/main/java/org/nuclearfog/twidda/backend/utils/FontTool.java
similarity index 97%
rename from app/src/main/java/org/nuclearfog/twidda/backend/tools/FontTool.java
rename to app/src/main/java/org/nuclearfog/twidda/backend/utils/FontTool.java
index 2d4fe89e..a564d57c 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/tools/FontTool.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/utils/FontTool.java
@@ -1,4 +1,4 @@
-package org.nuclearfog.twidda.backend.tools;
+package org.nuclearfog.twidda.backend.utils;
 
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/tools/TimeString.java b/app/src/main/java/org/nuclearfog/twidda/backend/utils/TimeString.java
similarity index 94%
rename from app/src/main/java/org/nuclearfog/twidda/backend/tools/TimeString.java
rename to app/src/main/java/org/nuclearfog/twidda/backend/utils/TimeString.java
index 38418bdd..7ffce3b2 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/tools/TimeString.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/utils/TimeString.java
@@ -1,4 +1,4 @@
-package org.nuclearfog.twidda.backend.tools;
+package org.nuclearfog.twidda.backend.utils;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/app/src/main/java/org/nuclearfog/twidda/fragment/ListFragment.java b/app/src/main/java/org/nuclearfog/twidda/fragment/ListFragment.java
index fdd6d3ec..a28d951f 100644
--- a/app/src/main/java/org/nuclearfog/twidda/fragment/ListFragment.java
+++ b/app/src/main/java/org/nuclearfog/twidda/fragment/ListFragment.java
@@ -26,7 +26,7 @@ import org.nuclearfog.twidda.adapter.ListAdapter.ListClickListener;
 import org.nuclearfog.twidda.backend.TwitterListLoader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
 import org.nuclearfog.twidda.backend.items.TwitterList;
-import org.nuclearfog.twidda.backend.tools.ErrorHandler;
+import org.nuclearfog.twidda.backend.utils.ErrorHandler;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.List;
diff --git a/app/src/main/java/org/nuclearfog/twidda/fragment/MessageFragment.java b/app/src/main/java/org/nuclearfog/twidda/fragment/MessageFragment.java
index 944a3535..8a017ed0 100644
--- a/app/src/main/java/org/nuclearfog/twidda/fragment/MessageFragment.java
+++ b/app/src/main/java/org/nuclearfog/twidda/fragment/MessageFragment.java
@@ -30,7 +30,7 @@ import org.nuclearfog.twidda.backend.MessageListLoader;
 import org.nuclearfog.twidda.backend.TrendListLoader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
 import org.nuclearfog.twidda.backend.items.Message;
-import org.nuclearfog.twidda.backend.tools.ErrorHandler;
+import org.nuclearfog.twidda.backend.utils.ErrorHandler;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.List;
diff --git a/app/src/main/java/org/nuclearfog/twidda/fragment/TrendFragment.java b/app/src/main/java/org/nuclearfog/twidda/fragment/TrendFragment.java
index cbbfdddd..46e729e0 100644
--- a/app/src/main/java/org/nuclearfog/twidda/fragment/TrendFragment.java
+++ b/app/src/main/java/org/nuclearfog/twidda/fragment/TrendFragment.java
@@ -22,7 +22,7 @@ import org.nuclearfog.twidda.adapter.TrendAdapter.TrendClickListener;
 import org.nuclearfog.twidda.backend.TrendListLoader;
 import org.nuclearfog.twidda.backend.engine.EngineException;
 import org.nuclearfog.twidda.backend.items.TwitterTrend;
-import org.nuclearfog.twidda.backend.tools.ErrorHandler;
+import org.nuclearfog.twidda.backend.utils.ErrorHandler;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.List;
diff --git a/app/src/main/java/org/nuclearfog/twidda/fragment/TweetFragment.java b/app/src/main/java/org/nuclearfog/twidda/fragment/TweetFragment.java
index b3d14b26..b5bf8e1b 100644
--- a/app/src/main/java/org/nuclearfog/twidda/fragment/TweetFragment.java
+++ b/app/src/main/java/org/nuclearfog/twidda/fragment/TweetFragment.java
@@ -23,7 +23,7 @@ import org.nuclearfog.twidda.backend.TweetListLoader;
 import org.nuclearfog.twidda.backend.TweetListLoader.Action;
 import org.nuclearfog.twidda.backend.engine.EngineException;
 import org.nuclearfog.twidda.backend.items.Tweet;
-import org.nuclearfog.twidda.backend.tools.ErrorHandler;
+import org.nuclearfog.twidda.backend.utils.ErrorHandler;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import java.util.List;
diff --git a/app/src/main/java/org/nuclearfog/twidda/fragment/UserFragment.java b/app/src/main/java/org/nuclearfog/twidda/fragment/UserFragment.java
index 50bb2f40..58a14cf8 100644
--- a/app/src/main/java/org/nuclearfog/twidda/fragment/UserFragment.java
+++ b/app/src/main/java/org/nuclearfog/twidda/fragment/UserFragment.java
@@ -24,7 +24,7 @@ import org.nuclearfog.twidda.backend.UserListLoader.Action;
 import org.nuclearfog.twidda.backend.engine.EngineException;
 import org.nuclearfog.twidda.backend.holder.UserListHolder;
 import org.nuclearfog.twidda.backend.items.TwitterUser;
-import org.nuclearfog.twidda.backend.tools.ErrorHandler;
+import org.nuclearfog.twidda.backend.utils.ErrorHandler;
 import org.nuclearfog.twidda.database.GlobalSettings;
 
 import static android.os.AsyncTask.Status.FINISHED;
diff --git a/app/src/main/res/layout/page_tweet.xml b/app/src/main/res/layout/page_tweet.xml
index 54b1671f..907d51ac 100644
--- a/app/src/main/res/layout/page_tweet.xml
+++ b/app/src/main/res/layout/page_tweet.xml
@@ -1,265 +1,273 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/tweet_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     android:fitsSystemWindows="true">
 
-    <com.google.android.material.appbar.AppBarLayout
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/tweet_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@android:color/transparent">
+        android:layout_height="@dimen/tweet_toolbar_height" />
 
-        <com.google.android.material.appbar.CollapsingToolbarLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed">
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent">
 
-            <LinearLayout
+            <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical">
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/tweet_toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/tweet_toolbar_height" />
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
                 <LinearLayout
-                    android:id="@+id/tweet_head"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:paddingLeft="@dimen/tweet_layout_margin"
-                    android:paddingRight="@dimen/tweet_layout_margin"
-                    android:visibility="invisible">
+                    android:orientation="vertical">
 
                     <LinearLayout
+                        android:id="@+id/tweet_head"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <androidx.cardview.widget.CardView
-                            android:layout_width="@dimen/tweet_profile"
-                            android:layout_height="@dimen/tweet_profile">
-
-                            <ImageView
-                                android:id="@+id/profileimage_detail"
-                                android:layout_width="@dimen/tweet_profile"
-                                android:layout_height="@dimen/tweet_profile"
-                                android:contentDescription="@string/profile_image" />
-
-                        </androidx.cardview.widget.CardView>
+                        android:layout_height="match_parent"
+                        android:orientation="vertical"
+                        android:paddingLeft="@dimen/tweet_layout_margin"
+                        android:paddingRight="@dimen/tweet_layout_margin"
+                        android:visibility="invisible">
 
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/tweet_layout_margin"
-                            android:layout_marginLeft="@dimen/tweet_layout_margin"
-                            android:layout_marginBottom="@dimen/tweet_layout_margin"
-                            android:gravity="center"
-                            android:orientation="vertical">
+                            android:orientation="horizontal">
 
-                            <TextView
-                                android:id="@+id/usernamedetail"
+                            <androidx.cardview.widget.CardView
+                                android:layout_width="@dimen/tweet_profile"
+                                android:layout_height="@dimen/tweet_profile">
+
+                                <ImageView
+                                    android:id="@+id/profileimage_detail"
+                                    android:layout_width="@dimen/tweet_profile"
+                                    android:layout_height="@dimen/tweet_profile"
+                                    android:contentDescription="@string/profile_image" />
+
+                            </androidx.cardview.widget.CardView>
+
+                            <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:drawablePadding="@dimen/tweet_padding_drawable"
-                                android:singleLine="true" />
+                                android:layout_marginStart="@dimen/tweet_layout_margin"
+                                android:layout_marginLeft="@dimen/tweet_layout_margin"
+                                android:layout_marginBottom="@dimen/tweet_layout_margin"
+                                android:gravity="center"
+                                android:orientation="vertical">
 
-                            <TextView
-                                android:id="@+id/scrnamedetail"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:drawablePadding="@dimen/tweet_padding_drawable"
-                                android:singleLine="true" />
+                                <TextView
+                                    android:id="@+id/usernamedetail"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:drawablePadding="@dimen/tweet_padding_drawable"
+                                    android:singleLine="true" />
 
-                            <TextView
-                                android:id="@+id/timedetail"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:singleLine="true"
-                                android:textSize="@dimen/tweet_textsize_date" />
+                                <TextView
+                                    android:id="@+id/scrnamedetail"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:drawablePadding="@dimen/tweet_padding_drawable"
+                                    android:singleLine="true" />
+
+                                <TextView
+                                    android:id="@+id/timedetail"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:singleLine="true"
+                                    android:textSize="@dimen/tweet_textsize_date" />
+
+                            </LinearLayout>
 
                         </LinearLayout>
 
-                    </LinearLayout>
-
-                    <Button
-                        android:id="@+id/answer_reference_detail"
-                        style="@style/Widget.AppCompat.Button.Borderless"
-                        android:layout_width="wrap_content"
-                        android:layout_height="@dimen/tweet_button_answer_height"
-                        android:background="@drawable/button"
-                        android:paddingLeft="@dimen/tweet_button_padding"
-                        android:paddingRight="@dimen/tweet_button_padding"
-                        android:singleLine="true"
-                        android:textSize="@dimen/tweet_textsize_api"
-                        android:visibility="gone" />
-
-                    <TextView
-                        android:id="@+id/tweet_detailed"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/tweet_layout_margin"
-                        android:layout_marginBottom="@dimen/tweet_layout_margin"
-                        android:fadeScrollbars="false"
-                        android:linksClickable="true"
-                        android:maxLines="@integer/tweet_test_max_lines"
-                        android:scrollbars="vertical"
-                        android:textSize="@dimen/tweet_textsize"
-                        android:visibility="gone" />
-
-                    <ImageButton
-                        android:id="@+id/tweet_media_attach"
-                        android:layout_width="@dimen/tweet_button_media_width"
-                        android:layout_height="@dimen/tweet_button_media_height"
-                        android:layout_gravity="center"
-                        android:layout_margin="@dimen/tweet_media_button_margin"
-                        android:background="@drawable/button"
-                        android:contentDescription="@string/image_preview_button"
-                        android:visibility="gone" />
-
-                    <TextView
-                        android:id="@+id/tweet_sensitive"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/tweet_sensitive_media"
-                        android:drawablePadding="@dimen/tweet_padding_drawable"
-                        app:drawableLeftCompat="@drawable/sensitive"
-                        app:drawableStartCompat="@drawable/sensitive"
-                        android:paddingLeft="@dimen/tweet_button_padding"
-                        android:paddingRight="@dimen/tweet_button_padding"
-                        android:textSize="@dimen/tweet_textsize_api"
-                        android:singleLine="true"
-                        android:visibility="gone" />
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <TextView
-                            android:id="@+id/tweet_location_name"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:drawablePadding="@dimen/tweet_padding_drawable"
-                            android:singleLine="true"
-                            android:textSize="@dimen/tweet_textsize_locale"
-                            android:visibility="gone"
-                            app:drawableLeftCompat="@drawable/userlocation"
-                            app:drawableStartCompat="@drawable/userlocation" />
-
                         <Button
-                            android:id="@+id/tweet_location_coordinate"
+                            android:id="@+id/answer_reference_detail"
                             style="@style/Widget.AppCompat.Button.Borderless"
                             android:layout_width="wrap_content"
-                            android:layout_height="@dimen/tweet_button_location"
-                            android:layout_marginLeft="@dimen/tweet_button_margin"
-                            android:layout_marginRight="@dimen/tweet_button_margin"
+                            android:layout_height="@dimen/tweet_button_answer_height"
                             android:background="@drawable/button"
                             android:paddingLeft="@dimen/tweet_button_padding"
                             android:paddingRight="@dimen/tweet_button_padding"
                             android:singleLine="true"
-                            android:textSize="@dimen/tweet_textsize_locale"
+                            android:textSize="@dimen/tweet_textsize_api"
                             android:visibility="gone" />
 
+                        <TextView
+                            android:id="@+id/tweet_detailed"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/tweet_layout_margin"
+                            android:layout_marginBottom="@dimen/tweet_layout_margin"
+                            android:fadeScrollbars="false"
+                            android:linksClickable="true"
+                            android:maxLines="@integer/tweet_test_max_lines"
+                            android:scrollbars="vertical"
+                            android:textSize="@dimen/tweet_textsize"
+                            android:visibility="gone" />
+
+                        <ImageButton
+                            android:id="@+id/tweet_media_attach"
+                            android:layout_width="@dimen/tweet_button_media_width"
+                            android:layout_height="@dimen/tweet_button_media_height"
+                            android:layout_gravity="center"
+                            android:layout_margin="@dimen/tweet_media_button_margin"
+                            android:background="@drawable/button"
+                            android:contentDescription="@string/image_preview_button"
+                            android:visibility="gone" />
+
+                        <TextView
+                            android:id="@+id/tweet_sensitive"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:drawablePadding="@dimen/tweet_padding_drawable"
+                            android:paddingLeft="@dimen/tweet_button_padding"
+                            android:paddingRight="@dimen/tweet_button_padding"
+                            android:singleLine="true"
+                            android:text="@string/tweet_sensitive_media"
+                            android:textSize="@dimen/tweet_textsize_api"
+                            android:visibility="gone"
+                            app:drawableLeftCompat="@drawable/sensitive"
+                            app:drawableStartCompat="@drawable/sensitive" />
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:id="@+id/tweet_location_name"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:drawablePadding="@dimen/tweet_padding_drawable"
+                                android:singleLine="true"
+                                android:textSize="@dimen/tweet_textsize_locale"
+                                android:visibility="gone"
+                                app:drawableLeftCompat="@drawable/userlocation"
+                                app:drawableStartCompat="@drawable/userlocation" />
+
+                            <Button
+                                android:id="@+id/tweet_location_coordinate"
+                                style="@style/Widget.AppCompat.Button.Borderless"
+                                android:layout_width="wrap_content"
+                                android:layout_height="@dimen/tweet_button_location"
+                                android:layout_marginLeft="@dimen/tweet_button_margin"
+                                android:layout_marginRight="@dimen/tweet_button_margin"
+                                android:background="@drawable/button"
+                                android:paddingLeft="@dimen/tweet_button_padding"
+                                android:paddingRight="@dimen/tweet_button_padding"
+                                android:singleLine="true"
+                                android:textSize="@dimen/tweet_textsize_locale"
+                                android:visibility="gone" />
+
+                        </LinearLayout>
+
+                        <TextView
+                            android:id="@+id/used_api"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:linksClickable="false"
+                            android:singleLine="true"
+                            android:textSize="@dimen/tweet_textsize_api" />
+
                     </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/used_api"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:linksClickable="false"
+                </LinearLayout>
+
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/tweet_foot"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:addStatesFromChildren="false"
+                    android:orientation="horizontal"
+                    android:padding="@dimen/tweet_layout_padding"
+                    android:visibility="invisible">
+
+                    <Button
+                        android:id="@+id/tweet_answer"
+                        style="@style/Widget.AppCompat.Button.Borderless"
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/tweet_button_height"
+                        android:layout_marginLeft="@dimen/tweet_button_margin"
+                        android:layout_marginRight="@dimen/tweet_button_margin"
+                        android:layout_weight="1"
+                        android:background="@drawable/button"
+                        android:drawablePadding="@dimen/tweet_padding_drawable"
+                        android:paddingLeft="@dimen/tweet_button_padding"
+                        android:paddingRight="@dimen/tweet_button_padding"
                         android:singleLine="true"
-                        android:textSize="@dimen/tweet_textsize_api" />
+                        app:drawableLeftCompat="@drawable/answer"
+                        app:drawableStartCompat="@drawable/answer" />
+
+                    <Button
+                        android:id="@+id/tweet_retweet"
+                        style="@style/Widget.AppCompat.Button.Borderless"
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/tweet_button_height"
+                        android:layout_marginLeft="@dimen/tweet_button_margin"
+                        android:layout_marginRight="@dimen/tweet_button_margin"
+                        android:layout_weight="1"
+                        android:background="@drawable/button"
+                        android:drawablePadding="@dimen/tweet_padding_drawable"
+                        android:paddingLeft="@dimen/tweet_button_padding"
+                        android:paddingRight="@dimen/tweet_button_padding"
+                        android:singleLine="true"
+                        app:drawableLeftCompat="@drawable/retweet"
+                        app:drawableStartCompat="@drawable/retweet" />
+
+                    <Button
+                        android:id="@+id/tweet_favorit"
+                        style="@style/Widget.AppCompat.Button.Borderless"
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/tweet_button_height"
+                        android:layout_marginLeft="@dimen/tweet_button_margin"
+                        android:layout_marginRight="@dimen/tweet_button_margin"
+                        android:layout_weight="1"
+                        android:background="@drawable/button"
+                        android:drawablePadding="@dimen/tweet_padding_drawable"
+                        android:paddingLeft="@dimen/tweet_button_padding"
+                        android:paddingRight="@dimen/tweet_button_padding"
+                        android:singleLine="true"
+                        app:drawableLeftCompat="@drawable/favorite"
+                        app:drawableStartCompat="@drawable/favorite" />
 
                 </LinearLayout>
 
-            </LinearLayout>
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:id="@+id/tweet_foot"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:addStatesFromChildren="false"
-                android:orientation="horizontal"
-                android:padding="@dimen/tweet_layout_padding"
-                android:visibility="invisible">
-
-                <Button
-                    android:id="@+id/tweet_answer"
-                    style="@style/Widget.AppCompat.Button.Borderless"
-                    android:layout_width="0dp"
-                    android:layout_height="@dimen/tweet_button_height"
-                    android:layout_marginLeft="@dimen/tweet_button_margin"
-                    android:layout_marginRight="@dimen/tweet_button_margin"
-                    android:layout_weight="1"
-                    android:background="@drawable/button"
-                    android:drawablePadding="@dimen/tweet_padding_drawable"
-                    android:paddingLeft="@dimen/tweet_button_padding"
-                    android:paddingRight="@dimen/tweet_button_padding"
-                    android:singleLine="true"
-                    app:drawableLeftCompat="@drawable/answer"
-                    app:drawableStartCompat="@drawable/answer" />
-
-                <Button
-                    android:id="@+id/tweet_retweet"
-                    style="@style/Widget.AppCompat.Button.Borderless"
-                    android:layout_width="0dp"
-                    android:layout_height="@dimen/tweet_button_height"
-                    android:layout_marginLeft="@dimen/tweet_button_margin"
-                    android:layout_marginRight="@dimen/tweet_button_margin"
-                    android:layout_weight="1"
-                    android:background="@drawable/button"
-                    android:drawablePadding="@dimen/tweet_padding_drawable"
-                    android:paddingLeft="@dimen/tweet_button_padding"
-                    android:paddingRight="@dimen/tweet_button_padding"
-                    android:singleLine="true"
-                    app:drawableLeftCompat="@drawable/retweet"
-                    app:drawableStartCompat="@drawable/retweet" />
-
-                <Button
-                    android:id="@+id/tweet_favorit"
-                    style="@style/Widget.AppCompat.Button.Borderless"
-                    android:layout_width="0dp"
-                    android:layout_height="@dimen/tweet_button_height"
-                    android:layout_marginLeft="@dimen/tweet_button_margin"
-                    android:layout_marginRight="@dimen/tweet_button_margin"
-                    android:layout_weight="1"
-                    android:background="@drawable/button"
-                    android:drawablePadding="@dimen/tweet_padding_drawable"
-                    android:paddingLeft="@dimen/tweet_button_padding"
-                    android:paddingRight="@dimen/tweet_button_padding"
-                    android:singleLine="true"
-                    app:drawableLeftCompat="@drawable/favorite"
-                    app:drawableStartCompat="@drawable/favorite" />
+                <androidx.viewpager.widget.ViewPager
+                    android:id="@+id/tweet_pager"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent" />
 
             </LinearLayout>
 
-            <androidx.viewpager.widget.ViewPager
-                android:id="@+id/tweet_pager"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+        </androidx.core.widget.NestedScrollView>
 
-        </LinearLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    </androidx.core.widget.NestedScrollView>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v19/styles.xml b/app/src/main/res/values-v21/styles.xml
similarity index 83%
rename from app/src/main/res/values-v19/styles.xml
rename to app/src/main/res/values-v21/styles.xml
index f16e4b89..edcb9ffe 100644
--- a/app/src/main/res/values-v19/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="colorAccent">@android:color/white</item>
         <item name="android:colorBackground">@android:color/black</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:windowAnimationStyle">@style/TransactionPending</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:textAllCaps">false</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 38472065..b8342a60 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="dark_transparent">#af000000</color>
     <color name="half_transparent">#40000000</color>
     <color name="bright_transparent">#afffffff</color>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6a1e5ee8..3f964761 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8b40606f..f8a979b7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 02 12:22:03 CEST 2020
+#Tue Oct 13 13:09:08 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip