diff --git a/app/build.gradle b/app/build.gradle
index fb576e364..80e7097fb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "fr.gouv.etalab.mastodon"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 161
-        versionName "1.17.5"
+        versionCode 162
+        versionName "1.17.6"
     }
     flavorDimensions "default"
     buildTypes {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
index 5ddec7ab4..a02245fc1 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
@@ -1592,7 +1592,6 @@ public abstract class BaseMainActivity extends BaseActivity
                     b.putString("accountId", extras.getString(INTENT_TARGETED_ACCOUNT));
                     intentShow.putExtras(b);
                     startActivity(intentShow);
-
                 }
             }else if( extras.getInt(INTENT_ACTION) == SEARCH_INSTANCE){
                 String instance = extras.getString(INSTANCE_NAME);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java
index 38d8e62ba..57f526b94 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/jobs/NotificationsSyncJob.java
@@ -241,7 +241,7 @@ public class NotificationsSyncJob extends Job {
             intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK );
             intent.putExtra(INTENT_ACTION, NOTIFICATION_INTENT);
             intent.putExtra(PREF_KEY_ID, account.getId());
-            if( targeted_account != null )
+            if( targeted_account != null && notifType == Helper.NotifType.FOLLLOW)
                 intent.putExtra(INTENT_TARGETED_ACCOUNT, targeted_account);
             intent.putExtra(PREF_INSTANCE, account.getInstance());
             long notif_id = Long.parseLong(account.getId());
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java b/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java
index dddb75df1..9f01bfee0 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java
@@ -275,8 +275,9 @@ public class LiveNotificationService extends Service implements NetworkStateRece
                             intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
                             intent.putExtra(INTENT_ACTION, NOTIFICATION_INTENT);
                             intent.putExtra(PREF_KEY_ID, account.getId());
-                            if (targeted_account != null)
+                            if (targeted_account != null) {
                                 intent.putExtra(INTENT_TARGETED_ACCOUNT, targeted_account);
+                            }
                             long notif_id = Long.parseLong(account.getId());
                             final int notificationId = ((notif_id + 1) > 2147483647) ? (int) (2147483647 - notif_id - 1) : (int) (notif_id + 1);
                             if (notification.getAccount().getAvatar() != null) {
diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml
index 27c592133..913041829 100644
--- a/app/src/main/res/layout-sw600dp/activity_toot.xml
+++ b/app/src/main/res/layout-sw600dp/activity_toot.xml
@@ -117,6 +117,7 @@
                     android:id="@+id/toot_cw"
                     android:padding="5dp"
                     android:text="@string/cw"
+                    android:layout_gravity="center"
                     style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
                     android:layout_width="50dp"
                     android:layout_height="50dp" />
@@ -124,12 +125,14 @@
                     android:id="@+id/toot_emoji"
                     android:minHeight="0dp"
                     android:minWidth="0dp"
+                    android:layout_gravity="center"
                     android:padding="2dp"
+                    android:scaleType="fitXY"
                     android:src="@drawable/emoji_one_category_smileysandpeople"
                     style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
-                   />
+                    />
                 <TextView
                     android:id="@+id/toot_space_left"
                     android:layout_width="0dp"
diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index 9b2e09c5a..d04686de8 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -118,6 +118,7 @@
                     android:id="@+id/toot_cw"
                     android:padding="5dp"
                     android:text="@string/cw"
+                    android:layout_gravity="center"
                     style="@style/Base.Widget.AppCompat.Button.Borderless.Colored"
                     android:layout_width="40dp"
                     android:layout_height="40dp" />