diff --git a/app/build.gradle b/app/build.gradle
index c2902e52..9a22d857 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId 'org.nuclearfog.twidda'
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 35
-        versionName '1.8.11'
+        versionCode 36
+        versionName '1.8.12'
         // limiting language support for smaller APK size
         resConfigs 'en', 'de-rDE', 'zh-rCN'
         vectorDrawables.useSupportLibrary true
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 308f0cd1..eb643491 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/ProfileEditor.java
@@ -72,7 +72,6 @@ public class ProfileEditor extends MediaActivity implements OnClickListener, OnP
     private Dialog loadingCircle, closeDialog;
     private AlertDialog errorDialog;
 
-    @Nullable
     private User user;
     private String profileLink, bannerLink;
 
@@ -283,26 +282,24 @@ public class ProfileEditor extends MediaActivity implements OnClickListener, OnP
      * Set current user's information
      */
     private void setUser() {
-        if (user != null) {
-            if (user.hasProfileImage()) {
-                String pbLink = user.getImageLink();
-                if (!user.hasDefaultProfileImage())
-                    pbLink += PROFILE_IMG_HIGH_RES;
-                Picasso.get().load(pbLink).transform(new RoundedCornersTransformation(5, 0)).into(profile_image);
-            }
-            if (user.hasBannerImage()) {
-                String bnLink = user.getBannerLink() + BANNER_IMG_MID_RES;
-                Picasso.get().load(bnLink).into(profile_banner, this);
-                addBannerBtn.setVisibility(INVISIBLE);
-                changeBannerBtn.setVisibility(VISIBLE);
-            } else {
-                addBannerBtn.setVisibility(VISIBLE);
-                changeBannerBtn.setVisibility(INVISIBLE);
-            }
-            name.setText(user.getUsername());
-            link.setText(user.getLink());
-            loc.setText(user.getLocation());
-            bio.setText(user.getBio());
+        if (user.hasProfileImage()) {
+            String pbLink = user.getImageLink();
+            if (!user.hasDefaultProfileImage())
+                pbLink += PROFILE_IMG_HIGH_RES;
+            Picasso.get().load(pbLink).transform(new RoundedCornersTransformation(5, 0)).into(profile_image);
         }
+        if (user.hasBannerImage()) {
+            String bnLink = user.getBannerLink() + BANNER_IMG_MID_RES;
+            Picasso.get().load(bnLink).into(profile_banner, this);
+            addBannerBtn.setVisibility(INVISIBLE);
+            changeBannerBtn.setVisibility(VISIBLE);
+        } else {
+            addBannerBtn.setVisibility(VISIBLE);
+            changeBannerBtn.setVisibility(INVISIBLE);
+        }
+        name.setText(user.getUsername());
+        link.setText(user.getLink());
+        loc.setText(user.getLocation());
+        bio.setText(user.getBio());
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/page_editprofile.xml b/app/src/main/res/layout/page_editprofile.xml
index 81615be3..9b90e99a 100644
--- a/app/src/main/res/layout/page_editprofile.xml
+++ b/app/src/main/res/layout/page_editprofile.xml
@@ -21,8 +21,8 @@
     <Button
         android:id="@+id/edit_add_banner"
         style="@style/FeedbackButton"
-        android:layout_width="88dp"
-        android:layout_height="20dp"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/editprofile_button_height"
         android:paddingLeft="@dimen/editprofile_button_padding"
         android:paddingRight="@dimen/editprofile_button_padding"
         android:text="@string/editprofile_add_banner"
diff --git a/app/src/main/res/layout/page_tweet.xml b/app/src/main/res/layout/page_tweet.xml
index d66d8288..4fcdadfe 100644
--- a/app/src/main/res/layout/page_tweet.xml
+++ b/app/src/main/res/layout/page_tweet.xml
@@ -106,6 +106,7 @@
                         android:paddingLeft="@dimen/tweet_button_padding"
                         android:paddingRight="@dimen/tweet_button_padding"
                         android:textSize="@dimen/tweet_textsize_small"
+                        android:minWidth="0dp"
                         android:visibility="invisible"
                         app:layout_constraintHorizontal_bias="0.0"
                         app:layout_constraintHorizontal_chainStyle="packed"
@@ -123,6 +124,7 @@
                         android:paddingLeft="@dimen/tweet_button_padding"
                         android:paddingRight="@dimen/tweet_button_padding"
                         android:textSize="@dimen/tweet_textsize_small"
+                        android:minWidth="0dp"
                         android:visibility="invisible"
                         app:layout_constraintHorizontal_chainStyle="packed"
                         app:layout_constraintStart_toEndOf="@id/tweet_answer_reference"
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 8ed92b09..95756970 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -116,7 +116,7 @@
     <string name="error_connection_failed">Verbindung fehlgeschlagen!</string>
     <string name="enter_username">Nutzernamen eingeben</string>
     <string name="profile_banner">Profilbanner</string>
-    <string name="editprofile_add_banner">Profilbanner hinzufügen</string>
+    <string name="editprofile_add_banner">Banner einfügen</string>
     <string name="error_invalid_link">Ungültiger Link!</string>
     <string name="settings_app_information">App und Lizenzinformationen unter:</string>
     <string name="error_rate_limit">Zu viele Anfragen! Bitte 15 Minuten warten!</string>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3a6fcee5..e278ba32 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -56,6 +56,8 @@
     <dimen name="editprofile_layout_margin">5dp</dimen>
     <dimen name="editprofile_layout_padding">20dp</dimen>
     <dimen name="editprofile_button_padding">5dp</dimen>
+    <dimen name="editprofile_button_height">20sp</dimen>
+    <dimen name="editprofile_button_width">120sp</dimen>
     <dimen name="editprofile_edittext_padding">5dp</dimen>
     <dimen name="editprofile_bio_min_height">150dp</dimen>
     <dimen name="editprofile_image">@dimen/profile_image_size</dimen>