diff --git a/app/build.gradle b/app/build.gradle
index dd8b7c5e..eabe325f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         applicationId 'com.stevenschoen.putionew'
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 107
-        versionName '4.0.5'
+        versionCode 108
+        versionName '4.0.6'
         multiDexEnabled true
     }
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3c04c95a..3ecafbbf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,9 +60,10 @@
 				android:name="android.app.default_searchable"
 				android:value=".activities.Putio"/>
 		</activity>
-		<activity android:name=".activities.LoginActivity"/>
+		<activity android:name=".LoginActivity"/>
 		<activity
-			android:name=".activities.FileFinished"
+			android:label="@string/downloadfinishedopentitle"
+			android:name=".files.FileFinishedActivity"
 			android:theme="@style/Putio.Dialog"/>
 		<activity
 			android:name=".transfers.AddTransferActivity"
diff --git a/app/src/main/java/com/stevenschoen/putionew/activities/LoginActivity.java b/app/src/main/java/com/stevenschoen/putionew/LoginActivity.java
similarity index 98%
rename from app/src/main/java/com/stevenschoen/putionew/activities/LoginActivity.java
rename to app/src/main/java/com/stevenschoen/putionew/LoginActivity.java
index 7c398ae1..90cdfb96 100644
--- a/app/src/main/java/com/stevenschoen/putionew/activities/LoginActivity.java
+++ b/app/src/main/java/com/stevenschoen/putionew/LoginActivity.java
@@ -1,4 +1,4 @@
-package com.stevenschoen.putionew.activities;
+package com.stevenschoen.putionew;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -15,9 +15,6 @@
 import android.webkit.WebViewClient;
 import android.widget.Toast;
 
-import com.stevenschoen.putionew.PutioActivity;
-import com.stevenschoen.putionew.R;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
diff --git a/app/src/main/java/com/stevenschoen/putionew/PutioActivity.java b/app/src/main/java/com/stevenschoen/putionew/PutioActivity.java
index 94c467fd..5bceae39 100644
--- a/app/src/main/java/com/stevenschoen/putionew/PutioActivity.java
+++ b/app/src/main/java/com/stevenschoen/putionew/PutioActivity.java
@@ -20,7 +20,6 @@
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
-import com.stevenschoen.putionew.activities.LoginActivity;
 import com.stevenschoen.putionew.cast.BaseCastActivity;
 import com.stevenschoen.putionew.files.FilesFragment;
 import com.stevenschoen.putionew.fragments.Account;
diff --git a/app/src/main/java/com/stevenschoen/putionew/PutioOpenFileService.java b/app/src/main/java/com/stevenschoen/putionew/PutioOpenFileService.java
deleted file mode 100644
index 84c350af..00000000
--- a/app/src/main/java/com/stevenschoen/putionew/PutioOpenFileService.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.stevenschoen.putionew;
-
-import android.app.DownloadManager;
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.database.Cursor;
-import android.os.IBinder;
-
-import com.stevenschoen.putionew.activities.FileFinished;
-
-public class PutioOpenFileService extends Service {
-	DownloadManager downloadManager;
-	long[] downloadIds;
-	int id;
-	String filename;
-	int mode;
-
-	@Override
-	public void onCreate() {
-		super.onCreate();
-
-		downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
-	}
-
-	@Override
-	public int onStartCommand(Intent intent, int flags, int startId) {
-		this.downloadIds = intent.getExtras().getLongArray("downloadIds");
-		this.id = intent.getExtras().getInt("id");
-		this.filename = intent.getExtras().getString("filename");
-		this.mode = intent.getExtras().getInt("mode");
-
-		IntentFilter intentFilter = new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE);
-		registerReceiver(downloadReceiver, intentFilter);
-		// We want this service to continue running until it is explicitly
-		// stopped, so return sticky.
-		return Service.START_STICKY;
-	}
-
-	private BroadcastReceiver downloadReceiver = new BroadcastReceiver() {
-		@Override
-		public void onReceive(Context arg0, Intent arg1) {
-            if (mode != PutioUtils.ACTION_NOTHING) {
-                for (long downloadId : downloadIds) {
-                    DownloadManager.Query query = new DownloadManager.Query();
-                    query.setFilterById(downloadId);
-                    Cursor cursor = downloadManager.query(query);
-
-                    if (cursor.moveToFirst()) {
-                        int columnIndex = cursor
-                                .getColumnIndex(DownloadManager.COLUMN_STATUS);
-                        int status = cursor.getInt(columnIndex);
-                        int columnReason = cursor
-                                .getColumnIndex(DownloadManager.COLUMN_REASON);
-                        int reason = cursor.getInt(columnReason);
-
-                        switch (status) {
-                            case DownloadManager.STATUS_SUCCESSFUL:
-                                Intent finishedIntent = new Intent(PutioOpenFileService.this, FileFinished.class);
-                                finishedIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                finishedIntent.putExtra("downloadId", downloadId);
-                                finishedIntent.putExtra("id", id);
-                                finishedIntent.putExtra("filename", filename);
-                                finishedIntent.putExtra("mode", mode);
-                                startActivity(finishedIntent);
-                                break;
-                            case DownloadManager.STATUS_FAILED:
-                                break;
-                            case DownloadManager.STATUS_PAUSED:
-                                break;
-                            case DownloadManager.STATUS_PENDING:
-                                break;
-                            case DownloadManager.STATUS_RUNNING:
-                                break;
-                        }
-                    }
-                }
-            }
-		}
-
-	};
-
-	@Override
-	public void onDestroy() {
-		unregisterReceiver(downloadReceiver);
-	}
-
-	@Override
-	public IBinder onBind(Intent arg0) {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/stevenschoen/putionew/PutioOpenFileService.kt b/app/src/main/java/com/stevenschoen/putionew/PutioOpenFileService.kt
new file mode 100644
index 00000000..4e0bfca5
--- /dev/null
+++ b/app/src/main/java/com/stevenschoen/putionew/PutioOpenFileService.kt
@@ -0,0 +1,79 @@
+package com.stevenschoen.putionew
+
+import android.app.DownloadManager
+import android.app.Service
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.net.Uri
+import android.os.IBinder
+import com.stevenschoen.putionew.files.FileFinishedActivity
+
+class PutioOpenFileService : Service() {
+
+    companion object {
+        const val EXTRA_DOWNLOAD_ID = "download_id"
+    }
+
+    lateinit var downloadManager: DownloadManager
+
+    var downloadId: Long = -1
+
+    override fun onCreate() {
+        super.onCreate()
+
+        downloadManager = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+    }
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
+
+        this.downloadId = intent.extras.getLong(EXTRA_DOWNLOAD_ID, -1)
+
+        val intentFilter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
+        registerReceiver(downloadReceiver, intentFilter)
+
+        return Service.START_STICKY
+    }
+
+    private val downloadReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            val query = DownloadManager.Query().setFilterById(downloadId)
+            val cursor = downloadManager.query(query)
+
+            if (cursor.moveToFirst()) {
+                val status = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS))
+                when (status) {
+                    DownloadManager.STATUS_SUCCESSFUL -> {
+                        val title = cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_TITLE))
+                        val uri = Uri.parse(cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)))
+                        val type = cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_MEDIA_TYPE))
+
+                        val finishedIntent = Intent(this@PutioOpenFileService, FileFinishedActivity::class.java).apply {
+                            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            putExtra(FileFinishedActivity.EXTRA_NAME, title)
+                            putExtra(FileFinishedActivity.EXTRA_URI, uri)
+                            putExtra(FileFinishedActivity.EXTRA_MEDIA_TYPE, type)
+                        }
+                        startActivity(finishedIntent)
+
+                        stopSelf()
+                    }
+                    DownloadManager.STATUS_FAILED -> { }
+                    DownloadManager.STATUS_PAUSED -> { }
+                    DownloadManager.STATUS_PENDING -> { }
+                    DownloadManager.STATUS_RUNNING -> { }
+                }
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        unregisterReceiver(downloadReceiver)
+    }
+
+    override fun onBind(intent: Intent?): IBinder? {
+        return null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/stevenschoen/putionew/PutioUtils.java b/app/src/main/java/com/stevenschoen/putionew/PutioUtils.java
index c5cd1ef1..4ee673b9 100644
--- a/app/src/main/java/com/stevenschoen/putionew/PutioUtils.java
+++ b/app/src/main/java/com/stevenschoen/putionew/PutioUtils.java
@@ -55,6 +55,7 @@
 import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
@@ -199,14 +200,13 @@ public long[] call(Object... args) {
 			public void call(long[] downloadIds) {
 				switch (actionWhenDone) {
 					case ACTION_OPEN:
+						if (files.length > 1) {
+							throw new IllegalArgumentException("Download started with ACTION_OPEN but more than one file: " + Arrays.toString(files));
+						}
 						Intent serviceOpenIntent = new Intent(activity, PutioOpenFileService.class);
-						serviceOpenIntent.putExtra("downloadIds", downloadIds);
-						serviceOpenIntent.putExtra("id", files[0].id);
-						serviceOpenIntent.putExtra("filename", files[0].name);
-						serviceOpenIntent.putExtra("mode", actionWhenDone);
+						serviceOpenIntent.putExtra(PutioOpenFileService.EXTRA_DOWNLOAD_ID, downloadIds[0]);
 						activity.startService(serviceOpenIntent);
-						Toast.makeText(activity, activity.getString(R.string.downloadwillopen),
-								Toast.LENGTH_LONG).show();
+						Toast.makeText(activity, activity.getString(R.string.downloadwillopen), Toast.LENGTH_LONG).show();
 						break;
 					case ACTION_NOTHING:
 						Toast.makeText(activity, activity.getString(R.string.downloadstarted), Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/com/stevenschoen/putionew/activities/FileFinished.java b/app/src/main/java/com/stevenschoen/putionew/activities/FileFinished.java
deleted file mode 100644
index 42ec0e8a..00000000
--- a/app/src/main/java/com/stevenschoen/putionew/activities/FileFinished.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.stevenschoen.putionew.activities;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.stevenschoen.putionew.PutioUtils;
-import com.stevenschoen.putionew.R;
-
-public class FileFinished extends Activity {
-	private int mode;
-	
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setTheme(R.style.Putio_Dialog);
-		setContentView(R.layout.dialog_filefinished);
-		
-		TextView textBody = (TextView) findViewById(R.id.text_downloadfinished_body);
-		textBody.setText(String.format(getString(R.string.downloadfinishedbody), getIntent().getExtras().getString("filename")));
-		
-		mode = getIntent().getExtras().getInt("mode");
-		
-		Button buttonAction = (Button) findViewById(R.id.button_filefinished_action);
-		switch (mode) {
-			case PutioUtils.ACTION_OPEN:
-				buttonAction.setText(getString(R.string.open));
-				break;
-		}
-		buttonAction.setOnClickListener(new OnClickListener() {
-			
-			@Override
-			public void onClick(View v) {
-				int id = getIntent().getExtras().getInt("id");
-				switch (mode) {
-				case PutioUtils.ACTION_OPEN:
-					PutioUtils.openDownloadedId(id, FileFinished.this);
-					break;
-				}
-	
-				finish();
-			}
-		});
-
-		Button buttonOk = (Button) findViewById(R.id.button_filefinished_ok);
-		buttonOk.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				finish();
-			}
-		});
-	}
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/stevenschoen/putionew/files/FileFinishedActivity.kt b/app/src/main/java/com/stevenschoen/putionew/files/FileFinishedActivity.kt
new file mode 100644
index 00000000..55147354
--- /dev/null
+++ b/app/src/main/java/com/stevenschoen/putionew/files/FileFinishedActivity.kt
@@ -0,0 +1,43 @@
+package com.stevenschoen.putionew.files
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.widget.Button
+import android.widget.TextView
+import com.stevenschoen.putionew.R
+
+class FileFinishedActivity : AppCompatActivity() {
+
+    companion object {
+        const val EXTRA_NAME = "name"
+        const val EXTRA_URI = "uri"
+        const val EXTRA_MEDIA_TYPE = "type"
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.dialog_filefinished)
+
+        val name = intent.extras.getString(EXTRA_NAME)
+
+        val messageView = findViewById(R.id.text_downloadfinished_body) as TextView
+        messageView.text = String.format(getString(R.string.downloadfinishedbody), name)
+
+        val openView = findViewById(R.id.button_filefinished_action) as Button
+        openView.setOnClickListener {
+            val uri = intent.extras.getParcelable<Uri>(EXTRA_URI)
+            val type = intent.extras.getString(EXTRA_MEDIA_TYPE)
+            val intent = Intent(Intent.ACTION_VIEW).apply {
+                setDataAndType(uri, type)
+            }
+            startActivity(Intent.createChooser(intent, null))
+
+            finish()
+        }
+
+        val okView = findViewById(R.id.button_filefinished_ok) as Button
+        okView.setOnClickListener { finish() }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/stevenschoen/putionew/files/FileListFragment.kt b/app/src/main/java/com/stevenschoen/putionew/files/FileListFragment.kt
index 9733db41..920ca03d 100644
--- a/app/src/main/java/com/stevenschoen/putionew/files/FileListFragment.kt
+++ b/app/src/main/java/com/stevenschoen/putionew/files/FileListFragment.kt
@@ -154,7 +154,7 @@ abstract class FileListFragment<CallbacksClass: FileListFragment.Callbacks> : Rx
             val downloadFragment = Fragment.instantiate(context, DownloadIndividualOrZipFragment::class.java.name) as DownloadIndividualOrZipFragment
             downloadFragment.show(childFragmentManager, FolderFragment.FRAGTAG_DOWNLOAD_INDIVIDUALORZIP)
         } else if (checkedFiles.size == 1) {
-            PutioApplication.get(context).putioUtils.downloadFiles(activity, PutioUtils.ACTION_NOTHING, *checkedFiles.toTypedArray())
+            PutioApplication.get(context).putioUtils.downloadFiles(activity, PutioUtils.ACTION_NOTHING, checkedFiles.first())
         } else {
             throw IllegalStateException("Download started with no file IDs!")
         }
@@ -198,7 +198,6 @@ abstract class FileListFragment<CallbacksClass: FileListFragment.Callbacks> : Rx
                     }
                     override fun onDownloadSelected() {
                         selectionDownloadFiles()
-                        filesAdapter!!.clearChecked()
                     }
                     override fun onCopyLinkSelected() {
                         selectionCopyLinks()
@@ -243,6 +242,7 @@ abstract class FileListFragment<CallbacksClass: FileListFragment.Callbacks> : Rx
                 childFragment.callbacks = object : DownloadIndividualOrZipFragment.Callbacks {
                     override fun onIndividualSelected() {
                         PutioApplication.get(context).putioUtils.downloadFiles(activity, PutioUtils.ACTION_NOTHING, *getCheckedFiles().toTypedArray())
+                        filesAdapter!!.clearChecked()
                     }
                     override fun onZipSelected() {
                         val checkedFiles = getCheckedFiles()
@@ -255,6 +255,7 @@ abstract class FileListFragment<CallbacksClass: FileListFragment.Callbacks> : Rx
                                     error.printStackTrace()
                                     Toast.makeText(context, R.string.network_error, Toast.LENGTH_SHORT).show()
                                 })
+                        filesAdapter!!.clearChecked()
                     }
                     override fun onCanceled() { }
                 }
diff --git a/app/src/main/java/com/stevenschoen/putionew/tv/TvActivity.java b/app/src/main/java/com/stevenschoen/putionew/tv/TvActivity.java
index 4bd6874e..34eac996 100644
--- a/app/src/main/java/com/stevenschoen/putionew/tv/TvActivity.java
+++ b/app/src/main/java/com/stevenschoen/putionew/tv/TvActivity.java
@@ -5,10 +5,10 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 
+import com.stevenschoen.putionew.LoginActivity;
 import com.stevenschoen.putionew.PutioApplication;
 import com.stevenschoen.putionew.PutioUtils;
 import com.stevenschoen.putionew.R;
-import com.stevenschoen.putionew.activities.LoginActivity;
 
 /**
  * Created by simonreggiani on 15-01-10.
diff --git a/app/src/main/res/layout/dialog_filefinished.xml b/app/src/main/res/layout/dialog_filefinished.xml
index f6ddb25f..0e9505f8 100644
--- a/app/src/main/res/layout/dialog_filefinished.xml
+++ b/app/src/main/res/layout/dialog_filefinished.xml
@@ -1,53 +1,39 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="12dp"
-        android:paddingLeft="?attr/dialogPreferredPadding"
-        android:paddingRight="?attr/dialogPreferredPadding"
-        android:paddingTop="@dimen/abc_dialog_padding_top_material"
-        android:text="@string/downloadfinishedopentitle"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+	<TextView
+		android:id="@+id/text_downloadfinished_body"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="?attr/dialogPreferredPadding"
+		android:layout_marginRight="?attr/dialogPreferredPadding"
+		android:layout_marginTop="12dp"
+		android:text="@string/downloadfinishedbody"
+		android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+	<LinearLayout
+		android:id="@+id/buttonbar"
+		style="@style/ButtonBar"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content">
 
-        <TextView
-            android:id="@+id/text_downloadfinished_body"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="?attr/dialogPreferredPadding"
-            android:layout_marginRight="?attr/dialogPreferredPadding"
-            android:text="@string/downloadfinishedbody"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+		<Button
+			android:id="@+id/button_filefinished_ok"
+			style="@style/ButtonBar.Button.Transparent"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/ok"
+			tools:ignore="ButtonOrder"/>
 
-        <LinearLayout
-            android:id="@+id/buttonbar"
-            style="@style/ButtonBar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-            <Button
-                android:id="@+id/button_filefinished_ok"
-                style="@style/ButtonBar.Button.Transparent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/ok"
-                tools:ignore="ButtonOrder" />
-
-            <Button
-                android:id="@+id/button_filefinished_action"
-                style="@style/ButtonBar.Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="Open" />
-        </LinearLayout>
-    </LinearLayout>
+		<Button
+			android:id="@+id/button_filefinished_action"
+			style="@style/ButtonBar.Button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/open"/>
+	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_redownload.xml b/app/src/main/res/layout/dialog_redownload.xml
index c5a2321b..b413b9d8 100644
--- a/app/src/main/res/layout/dialog_redownload.xml
+++ b/app/src/main/res/layout/dialog_redownload.xml
@@ -1,42 +1,43 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="12dp">
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:paddingTop="12dp">
 
-    <TextView
-        android:id="@+id/text_redownloadbody"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="?attr/dialogPreferredPadding"
-        android:layout_marginRight="?attr/dialogPreferredPadding"
-        android:text="@string/redownloadfordlbody" />
+	<TextView
+		android:id="@+id/text_redownloadbody"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="?attr/dialogPreferredPadding"
+		android:layout_marginRight="?attr/dialogPreferredPadding"
+		android:text="@string/redownloadfordlbody"/>
 
-    <LinearLayout
-        android:id="@+id/buttonbar"
-        style="@style/ButtonBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/text_redownloadbody">
+	<LinearLayout
+		android:id="@+id/buttonbar"
+		style="@style/ButtonBar"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/text_redownloadbody">
 
-        <Button
-            android:id="@+id/button_redownload_cancel"
-            style="@style/ButtonBar.Button.Transparent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/cancel" />
+		<Button
+			android:id="@+id/button_redownload_cancel"
+			style="@style/ButtonBar.Button.Transparent"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/cancel"/>
 
-        <Button
-            android:id="@+id/button_redownload_download"
-            style="@style/ButtonBar.Button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/redownload" />
+		<Button
+			android:id="@+id/button_redownload_download"
+			style="@style/ButtonBar.Button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/redownload"/>
 
-        <Button
-            android:id="@+id/button_redownload_open"
-            style="@style/ButtonBar.Button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/open" />
-    </LinearLayout>
+		<Button
+			android:id="@+id/button_redownload_open"
+			style="@style/ButtonBar.Button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/open"/>
+	</LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_individualorzip.xml b/app/src/main/res/layout/download_individualorzip.xml
index b1ce8920..55d99d81 100644
--- a/app/src/main/res/layout/download_individualorzip.xml
+++ b/app/src/main/res/layout/download_individualorzip.xml
@@ -7,8 +7,10 @@
 
 	<android.support.v7.widget.Toolbar
 		android:id="@+id/download_individualorzip_toolbar"
-		android:layout_width="match_parent"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
 		app:navigationIcon="@drawable/ic_toolbar_nav_close_black"
 		app:title="@string/download_files"/>
 
@@ -32,7 +34,7 @@
 		android:layout_marginBottom="16dp"
 		android:layout_marginTop="32dp"
 		android:text="@string/zip"
-		app:layout_constraintBottom_toBottomOf="@+id/download_individualorzip_root"
+		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="@+id/download_individualorzip_root"
 		app:layout_constraintTop_toBottomOf="@+id/download_individualorzip_body"/>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a612e011..fb861ffc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -78,7 +78,10 @@
 
 	<style name="ButtonBar">
 		<item name="android:theme">@style/Theme.Putio</item>
-		<item name="android:layout_margin">16dp</item>
+		<item name="android:layout_marginLeft">16dp</item>
+		<item name="android:layout_marginRight">16dp</item>
+		<item name="android:layout_marginTop">16dp</item>
+		<item name="android:layout_marginBottom">8dp</item>
 		<item name="android:layout_gravity">bottom|end</item>
 		<item name="android:layout_alignParentRight">true</item>
 		<item name="android:layout_alignParentEnd">true</item>