diff --git a/app/src/main/res/layout/page_login.xml b/app/src/main/res/layout/page_login.xml
index 4cf7ae1f..2809ff55 100644
--- a/app/src/main/res/layout/page_login.xml
+++ b/app/src/main/res/layout/page_login.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_horizontal"
@@ -39,10 +38,8 @@
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
             android:hint="@string/pin"
-            android:importantForAutofill="no"
             android:inputType="numberPassword"
-            android:singleLine="true"
-            tools:targetApi="o" />
+            android:singleLine="true" />
 
         <ImageButton
             android:id="@+id/clipboard"
diff --git a/app/src/main/res/layout/page_tweet.xml b/app/src/main/res/layout/page_tweet.xml
index e1d7fdce..e574498b 100644
--- a/app/src/main/res/layout/page_tweet.xml
+++ b/app/src/main/res/layout/page_tweet.xml
@@ -127,6 +127,7 @@
                         android:id="@+id/image_attach"
                         android:layout_width="@dimen/button_size"
                         android:layout_height="@dimen/button_size"
+                        android:layout_margin="@dimen/tweet_icon_margin"
                         android:contentDescription="@string/image_preview_button"
                         android:visibility="gone"
                         app:srcCompat="@drawable/preview" />
@@ -165,7 +166,7 @@
                     android:layout_width="@dimen/tweet_page_icon"
                     android:layout_height="@dimen/tweet_page_icon"
                     android:layout_marginEnd="@dimen/icon_margin"
-                    android:layout_marginRight="@dimen/icon_margin"
+                    android:layout_marginRight="@dimen/tweet_icon_margin"
                     android:contentDescription="@string/answer_button"
                     app:srcCompat="@drawable/chat" />
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 503dbfcd..3f284b19 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -34,7 +34,7 @@
 
     <!--TWEET PAGE-->
     <dimen name="tweet_profile">56dp</dimen>
-    <dimen name="tweet_page_icon">16dp</dimen>
+    <dimen name="tweet_page_icon">20dp</dimen>
 
     <!--DM POPUP-->
     <dimen name="dm_icon_margin">5dp</dimen>