diff --git a/app/.gitignore b/app/.gitignore
index 796b96d1c..e493cfc4f 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,2 @@
 /build
+app-release.apk
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 0202e99be..d8a06d480 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.0-alpha.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary true
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7de530cf8..480c07b6c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_logo"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
new file mode 100644
index 000000000..6b0126e91
Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ
diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
index cbc4b2131..e7937bcff 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
@@ -28,7 +28,6 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.text.method.LinkMovementMethod;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountFragment.java b/app/src/main/java/com/keylesspalace/tusky/AccountFragment.java
index 08d6ec0b0..af619231c 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountFragment.java
@@ -45,6 +45,8 @@ import java.util.Map;
 
 public class AccountFragment extends Fragment implements AccountActionListener,
         FooterActionListener {
+    private static final String TAG = "Account";
+
     public enum Type {
         FOLLOWS,
         FOLLOWERS,
@@ -166,7 +168,7 @@ public class AccountFragment extends Fragment implements AccountActionListener,
                         try {
                             accounts = Account.parse(response);
                         } catch (JSONException e) {
-                            onFetchAccountsFailure();
+                            onFetchAccountsFailure(e);
                             return;
                         }
                         onFetchAccountsSuccess(accounts, fromId != null);
@@ -175,7 +177,7 @@ public class AccountFragment extends Fragment implements AccountActionListener,
                 new Response.ErrorListener() {
                     @Override
                     public void onErrorResponse(VolleyError error) {
-                        onFetchAccountsFailure();
+                        onFetchAccountsFailure(error);
                     }
                 }) {
             @Override
@@ -201,8 +203,9 @@ public class AccountFragment extends Fragment implements AccountActionListener,
         showFetchAccountsRetry(false);
     }
 
-    private void onFetchAccountsFailure() {
+    private void onFetchAccountsFailure(Exception exception) {
         showFetchAccountsRetry(true);
+        Log.e(TAG, "Fetch failure: " + exception.getMessage());
     }
 
     private void showFetchAccountsRetry(boolean show) {
diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index e3278a1cd..82e4ab4da 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -404,8 +404,9 @@ public class ComposeActivity extends AppCompatActivity {
 
     private void readyStatus(final String content, final String visibility,
                              final boolean sensitive, final String spoilerText) {
-        final ProgressDialog dialog = ProgressDialog.show(this, "Finishing Media Upload",
-                "Uploading...", true, true);
+        final ProgressDialog dialog = ProgressDialog.show(
+                this, getString(R.string.dialog_title_finishing_media_upload),
+                getString(R.string.dialog_message_uploading_media), true, true);
         final AsyncTask<Void, Void, Boolean> waitForMediaTask =
                 new AsyncTask<Void, Void, Boolean>() {
                     @Override
@@ -734,6 +735,10 @@ public class ComposeActivity extends AppCompatActivity {
             Uri uri = data.getData();
             ContentResolver contentResolver = getContentResolver();
             Cursor cursor = getContentResolver().query(uri, null, null, null, null);
+            if (cursor == null) {
+                displayTransientError(R.string.error_media_upload_opening);
+                return;
+            }
             int sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE);
             cursor.moveToFirst();
             long mediaSize = cursor.getLong(sizeIndex);
diff --git a/app/src/main/java/com/keylesspalace/tusky/Log.java b/app/src/main/java/com/keylesspalace/tusky/Log.java
new file mode 100644
index 000000000..5a55af78a
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/Log.java
@@ -0,0 +1,51 @@
+/* Copyright 2017 Andrew Dawson
+ *
+ * This file is part of Tusky.
+ *
+ * Tusky is free software: you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky. If not, see
+ * <http://www.gnu.org/licenses/>. */
+
+package com.keylesspalace.tusky;
+
+/**A wrapper for android.util.Log that allows for disabling logging, such as for release builds.*/
+public class Log {
+    private static final boolean LOGGING_ENABLED = BuildConfig.DEBUG;
+
+    public static void i(String tag, String string) {
+        if (LOGGING_ENABLED) {
+            android.util.Log.i(tag, string);
+        }
+    }
+
+    public static void e(String tag, String string) {
+        if (LOGGING_ENABLED) {
+            android.util.Log.e(tag, string);
+        }
+    }
+
+    public static void d(String tag, String string) {
+        if (LOGGING_ENABLED) {
+            android.util.Log.d(tag, string);
+        }
+    }
+
+    public static void v(String tag, String string) {
+        if (LOGGING_ENABLED) {
+            android.util.Log.v(tag, string);
+        }
+    }
+
+    public static void w(String tag, String string) {
+        if (LOGGING_ENABLED) {
+            android.util.Log.w(tag, string);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
index 39352fe3a..4f80550b6 100644
--- a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
@@ -24,7 +24,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -129,6 +128,7 @@ public class LoginActivity extends AppCompatActivity {
                 parameters.put("client_name", getString(R.string.app_name));
                 parameters.put("redirect_uris", getOauthRedirectUri());
                 parameters.put("scopes", OAUTH_SCOPES);
+                parameters.put("website", getString(R.string.app_website));
             } catch (JSONException e) {
                 Log.e(TAG, "Unable to build the form data for the authentication request.");
                 return;
diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
index 82b921dc8..5ef86cbfc 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
@@ -27,7 +27,6 @@ import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -137,7 +136,7 @@ public class MainActivity extends AppCompatActivity {
                                 id = response.getString("id");
                                 username = response.getString("acct");
                             } catch (JSONException e) {
-                                onFetchUserInfoFailure();
+                                onFetchUserInfoFailure(e);
                                 return;
                             }
                             onFetchUserInfoSuccess(id, username);
@@ -146,7 +145,7 @@ public class MainActivity extends AppCompatActivity {
                     new Response.ErrorListener() {
                         @Override
                         public void onErrorResponse(VolleyError error) {
-                            onFetchUserInfoFailure();
+                            onFetchUserInfoFailure(error);
                         }
                     }) {
                 @Override
@@ -171,9 +170,9 @@ public class MainActivity extends AppCompatActivity {
         editor.apply();
     }
 
-    private void onFetchUserInfoFailure() {
+    private void onFetchUserInfoFailure(Exception exception) {
         //TODO: help
-        Log.e(TAG, "Failed to fetch the logged-in user's info.");
+        Log.e(TAG, "Failed to fetch user info. " + exception.getMessage());
     }
 
     /* @Unused: For Firebase push notifications, useless for now.
diff --git a/app/src/main/java/com/keylesspalace/tusky/NotificationsFragment.java b/app/src/main/java/com/keylesspalace/tusky/NotificationsFragment.java
index 7cf6b25b5..9209b1eb3 100644
--- a/app/src/main/java/com/keylesspalace/tusky/NotificationsFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/NotificationsFragment.java
@@ -42,6 +42,8 @@ import java.util.Map;
 
 public class NotificationsFragment extends SFragment implements
         SwipeRefreshLayout.OnRefreshListener, StatusActionListener, FooterActionListener {
+    private static final String TAG = "Notifications"; // logging tag
+
     private SwipeRefreshLayout swipeRefreshLayout;
     private RecyclerView recyclerView;
     private NotificationsAdapter adapter;
@@ -108,13 +110,13 @@ public class NotificationsFragment extends SFragment implements
                             List<Notification> notifications = Notification.parse(response);
                             onFetchNotificationsSuccess(notifications, fromId != null);
                         } catch (JSONException e) {
-                            onFetchNotificationsFailure();
+                            onFetchNotificationsFailure(e);
                         }
                     }
                 }, new Response.ErrorListener() {
                     @Override
                     public void onErrorResponse(VolleyError error) {
-                        onFetchNotificationsFailure();
+                        onFetchNotificationsFailure(error);
                     }
                 }) {
             @Override
@@ -141,9 +143,10 @@ public class NotificationsFragment extends SFragment implements
         swipeRefreshLayout.setRefreshing(false);
     }
 
-    private void onFetchNotificationsFailure() {
+    private void onFetchNotificationsFailure(Exception exception) {
         showFetchTimelineRetry(true);
         swipeRefreshLayout.setRefreshing(false);
+        Log.e(TAG, "Fetch failure: " + exception.getMessage());
     }
 
     private void showFetchTimelineRetry(boolean show) {
diff --git a/app/src/main/java/com/keylesspalace/tusky/PullNotificationService.java b/app/src/main/java/com/keylesspalace/tusky/PullNotificationService.java
index a32bc993f..d69189c5f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/PullNotificationService.java
+++ b/app/src/main/java/com/keylesspalace/tusky/PullNotificationService.java
@@ -26,7 +26,6 @@ import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.TaskStackBuilder;
-import android.util.Log;
 
 import com.android.volley.AuthFailureError;
 import com.android.volley.Response;
@@ -44,7 +43,8 @@ import java.util.List;
 import java.util.Map;
 
 public class PullNotificationService extends IntentService {
-    private final int NOTIFY_ID = 6; // This is an arbitrary number.
+    private static final int NOTIFY_ID = 6; // This is an arbitrary number.
+    private static final String TAG = "PullNotifications";
 
     public PullNotificationService() {
         super("Tusky Pull Notification Service");
@@ -76,7 +76,7 @@ public class PullNotificationService extends IntentService {
                         try {
                             notifications = Notification.parse(response);
                         } catch (JSONException e) {
-                            onCheckNotificationsFailure();
+                            onCheckNotificationsFailure(e);
                             return;
                         }
                         onCheckNotificationsSuccess(notifications, lastUpdate);
@@ -84,7 +84,7 @@ public class PullNotificationService extends IntentService {
                 }, new Response.ErrorListener() {
                     @Override
                     public void onErrorResponse(VolleyError error) {
-                        onCheckNotificationsFailure();
+                        onCheckNotificationsFailure(error);
                     }
                 }) {
             @Override
@@ -134,9 +134,9 @@ public class PullNotificationService extends IntentService {
         }
     }
 
-    private void onCheckNotificationsFailure() {
+    private void onCheckNotificationsFailure(Exception exception) {
         //TODO: not sure if just logging here is enough?
-        Log.e("Error", "Could not check notifications in the service.");
+        Log.e(TAG, "Failed to check notifications. " + exception.getMessage());
     }
 
     private static class MentionResult {
@@ -193,7 +193,7 @@ public class PullNotificationService extends IntentService {
         if (preferences.getBoolean("notificationStyleVibrate", false)) {
             builder.setVibrate(new long[] { 500, 500 });
         }
-        if (preferences.getBoolean("notificationStyleLight", true)) {
+        if (preferences.getBoolean("notificationStyleLight", false)) {
             builder.setLights(0xFF00FF8F, 300, 1000);
         }
         for (int i = 0; i < mentions.size(); i++) {
diff --git a/app/src/main/java/com/keylesspalace/tusky/SFragment.java b/app/src/main/java/com/keylesspalace/tusky/SFragment.java
index 515b838ce..a4652ec78 100644
--- a/app/src/main/java/com/keylesspalace/tusky/SFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/SFragment.java
@@ -24,7 +24,6 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/TimelineFragment.java
index 208a05f98..5cebce5ea 100644
--- a/app/src/main/java/com/keylesspalace/tusky/TimelineFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/TimelineFragment.java
@@ -24,7 +24,6 @@ import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index cde69bccc..8bdc44597 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index c133a0cbd..52603b698 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index bfa42f0e7..88090fec8 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 324e72cdd..3b5fa2c88 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index aee44e138..94bd03d73 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cf188b6b3..31f4c4b3d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <resources>
     <string name="app_name">Tusky</string>
+    <string name="app_website">http://tusky.keylesspalace.com</string>
 
     <string name="oauth_scheme">com.keylesspalace.tusky</string>
     <string name="oauth_redirect_host">oauth2redirect</string>
@@ -112,6 +113,8 @@
         websites.\n\nSo, find the address of one you\'d like to join and enter it here. This will
         direct you there to either make an account or log in.
     </string>
+    <string name="dialog_title_finishing_media_upload">Finishing Media Upload</string>
+    <string name="dialog_message_uploading_media">Uploading…</string>
 
     <string name="visibility_public">Show on public timeline</string>
     <string name="visibility_unlisted">Do not display on public timeline</string>