diff --git a/gradle.properties b/gradle.properties
index e8b10e2b5..b1f478013 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-android.enableAapt2=false
+android.enableAapt2=true
diff --git a/src/main/res/layout/view_server_file_item.xml b/src/main/res/layout/view_server_file_item.xml
index bb32527f1..a21de85a9 100644
--- a/src/main/res/layout/view_server_file_item.xml
+++ b/src/main/res/layout/view_server_file_item.xml
@@ -50,12 +50,13 @@
 
             <TextView
                 android:id="@+id/text"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="5"
-                android:paddingEnd="8dp"
+                android:paddingEnd="0dp"
                 android:paddingStart="0dp"
                 android:ellipsize="end"
+                android:layout_toLeftOf="@+id/more_options"
                 android:maxLines="1"
                 tools:text="File Name"
                 android:textSize="@dimen/text_medium" />