diff --git a/resources/.android_assets b/resources/.android_assets
new file mode 100644
index 000000000..d095f8e6f
--- /dev/null
+++ b/resources/.android_assets
@@ -0,0 +1 @@
+base_density:xxxhdpi
diff --git a/resources/Twidere Launcher Icons.sketch b/resources/Twidere Launcher Icons.sketch
new file mode 100644
index 000000000..c8ea76f1e
Binary files /dev/null and b/resources/Twidere Launcher Icons.sketch differ
diff --git a/twidere/build.gradle b/twidere/build.gradle
index cda791a60..db6e14a27 100644
--- a/twidere/build.gradle
+++ b/twidere/build.gradle
@@ -150,4 +150,19 @@ task svgToDrawable(type: SvgDrawableTask) {
     outputFormat = 'PNG'
 
     outputType = 'drawable'
+}
+
+task svgToMipmap(type: SvgDrawableTask) {
+    // specify where to pick SVG from
+    from = files('src/main/svg/mipmap')
+    // specify the android res folder
+    to = file('src/main/res-svg2png')
+    // override files only if necessary
+    overwriteMode = 'ifModified'
+    // let generate PNG for the following densities only
+    targetedDensities = ['hdpi', 'mdpi', 'xhdpi', 'xxhdpi', 'xxxhdpi']
+    // output format of the generated resources
+    outputFormat = 'PNG'
+
+    outputType = 'mipmap'
 }
\ No newline at end of file
diff --git a/twidere/web_hi_res_512.png b/twidere/ic_launcher-web.png
similarity index 100%
rename from twidere/web_hi_res_512.png
rename to twidere/ic_launcher-web.png
diff --git a/twidere/src/main/.gitignore b/twidere/src/main/.gitignore
index 2292473dc..2fb2d57e0 100644
--- a/twidere/src/main/.gitignore
+++ b/twidere/src/main/.gitignore
@@ -1,2 +1,2 @@
-# Those files generated on compile, so there's no need to include them in VCSw
+# Those files generated on compile, so there's no need to include them in VCS
 res-svg2png/
\ No newline at end of file
diff --git a/twidere/src/main/java/org/mariotaku/twidere/service/BackgroundOperationService.java b/twidere/src/main/java/org/mariotaku/twidere/service/BackgroundOperationService.java
index 7e91426bb..7f1495478 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/service/BackgroundOperationService.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/service/BackgroundOperationService.java
@@ -527,7 +527,9 @@ public class BackgroundOperationService extends IntentService implements Constan
                 final Twitter twitter = TwitterAPIFactory.getTwitterInstance(this, account.account_id, true, true);
                 final TwitterUpload upload = TwitterAPIFactory.getTwitterInstance(this, account.account_id, true, true, TwitterUpload.class);
                 final StatusUpdate status = new StatusUpdate(shortenedText);
-                status.inReplyToStatusId(statusUpdate.in_reply_to_status_id);
+                if (statusUpdate.in_reply_to_status_id > 0) {
+                    status.inReplyToStatusId(statusUpdate.in_reply_to_status_id);
+                }
                 if (statusUpdate.location != null) {
                     status.location(ParcelableLocation.toGeoLocation(statusUpdate.location));
                 }