diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
index aae36973..9eb8a9f2 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
@@ -135,6 +135,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> implements View.On
                     if(rtCount > 0)
                         rtCount--;
                     retweeted = false;
+                    database.removeStatus(tweet.retweetId);
                 }
             }
             else if(MODE == FAVORITE) {
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java
index 6cc5a39a..f62b772f 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/TwitterEngine.java
@@ -419,7 +419,7 @@ public class TwitterEngine {
      */
     public void retweet(Tweet tweet) throws TwitterException {
         if(tweet.retweeted) {
-            if(tweet.retweetId > 0)
+            if(tweet.retweetId > tweet.tweetID)
                 deleteTweet(tweet.retweetId);
             else
                 deleteTweet(tweet.tweetID);
diff --git a/app/src/main/res/layout/tweetpage.xml b/app/src/main/res/layout/tweetpage.xml
index cde2a0ce..3e2f4705 100644
--- a/app/src/main/res/layout/tweetpage.xml
+++ b/app/src/main/res/layout/tweetpage.xml
@@ -168,8 +168,8 @@
 
                 <Button
                     android:id="@+id/answer_button"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
                     android:background="@drawable/chat" />
 
                 <TextView
@@ -185,8 +185,8 @@
 
                 <Button
                     android:id="@+id/rt_button_detail"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
                     android:background="@drawable/retweet" />
 
                 <TextView
@@ -202,8 +202,8 @@
 
                 <Button
                     android:id="@+id/fav_button_detail"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
                     android:background="@drawable/favorite" />
 
                 <TextView
@@ -219,8 +219,8 @@
 
                 <Button
                     android:id="@+id/delete"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
                     android:background="@drawable/cross"
                     android:visibility="invisible" />