diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java
index 23a1f6b1..4350d01b 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ResolveInfo;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadFieldsBuilderActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadFieldsBuilderActivity.java
index 0cd8eb70..6b8426b5 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadFieldsBuilderActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadFieldsBuilderActivity.java
@@ -87,7 +87,7 @@ public class UploadFieldsBuilderActivity extends AppCompatActivity {
 
         //Initialize toolbar
         Toolbar toolbar = findViewById(R.id.toolbar);
-        toolbar.setTitle("Upload fields builder");
+        toolbar.setTitle(R.string.upload_fields_builder_toolbar_title);
         setSupportActionBar(toolbar);
         if (getSupportActionBar() != null) {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
diff --git a/app/src/main/res/layout/activity_upload.xml b/app/src/main/res/layout/activity_upload.xml
index c80c3ada..70cbbed2 100644
--- a/app/src/main/res/layout/activity_upload.xml
+++ b/app/src/main/res/layout/activity_upload.xml
@@ -117,25 +117,33 @@
                     android:maxLines="3" />
             </android.support.design.widget.TextInputLayout>
 
-            <android.support.v7.widget.AppCompatButton
-                android:id="@+id/upload_select_file_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:drawablePadding="5dp"
-                android:gravity="center_vertical"
-                android:text="@string/upload_select_file"
-                android:textColor="@color/primary_text" />
-
-            <android.support.v7.widget.AppCompatButton
-                android:id="@+id/upload_upload_button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center_vertical"
-                android:text="@string/upload_upload_button"
-                android:textAlignment="center"
-                android:textColor="@color/accent" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+                <android.support.v7.widget.AppCompatButton
+                    android:id="@+id/upload_select_file_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:drawablePadding="5dp"
+                    android:gravity="center_vertical"
+                    android:text="@string/upload_select_file"
+                    android:textColor="@color/primary_text" />
+
+                <android.support.v7.widget.AppCompatButton
+                    android:id="@+id/upload_upload_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:gravity="center_vertical"
+                    android:text="@string/upload_upload_button"
+                    android:textAlignment="center"
+                    android:textColor="@color/accent" />
+            </LinearLayout>
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6ddc16bc..9f4ce81d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -133,7 +133,7 @@
     <string name="upload_fields_builder_radio_button_sept">September</string>
     <string name="upload_fields_builder_select_year_title">Select year</string>
     <string name="upload_fields_builder_year_hint">Year</string>
-    <string name="upload_fields_builder_submit">Build</string>
+    <string name="upload_fields_builder_submit">Generate</string>
 
     <!--Settings Activity-->
     <string name="action_settings">Settings</string>
@@ -160,4 +160,5 @@
     <string name="pref_category_uploading">Uploading</string>
     <string name="pref_title_uploading_app_signature_enable">App signature</string>
     <string name="pref_summary_uploading_app_signature_enable">If enabled, an \"uploaded from mTHMMY\" message will be inserted at the end of your uploads descriptions</string>
+    <string name="upload_fields_builder_toolbar_title">Upload fields generator</string>
 </resources>