diff --git a/public/themes/arya-blue/theme.css b/public/themes/arya-blue/theme.css
index d572c5fd5..75fa3cb3f 100644
--- a/public/themes/arya-blue/theme.css
+++ b/public/themes/arya-blue/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/arya-green/theme.css b/public/themes/arya-green/theme.css
index 3fca540ca..cbcf21c64 100644
--- a/public/themes/arya-green/theme.css
+++ b/public/themes/arya-green/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/arya-orange/theme.css b/public/themes/arya-orange/theme.css
index 5d7c248b7..55c07410e 100644
--- a/public/themes/arya-orange/theme.css
+++ b/public/themes/arya-orange/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/arya-purple/theme.css b/public/themes/arya-purple/theme.css
index 3676b70ce..5d2099fd3 100644
--- a/public/themes/arya-purple/theme.css
+++ b/public/themes/arya-purple/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/bootstrap4-dark-blue/theme.css b/public/themes/bootstrap4-dark-blue/theme.css
index ebbd43f3e..5c43924a4 100644
--- a/public/themes/bootstrap4-dark-blue/theme.css
+++ b/public/themes/bootstrap4-dark-blue/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/bootstrap4-dark-purple/theme.css b/public/themes/bootstrap4-dark-purple/theme.css
index b2398ff01..ae36debfc 100644
--- a/public/themes/bootstrap4-dark-purple/theme.css
+++ b/public/themes/bootstrap4-dark-purple/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/bootstrap4-light-blue/theme.css b/public/themes/bootstrap4-light-blue/theme.css
index 624a8ddd9..0fdb0ccf8 100644
--- a/public/themes/bootstrap4-light-blue/theme.css
+++ b/public/themes/bootstrap4-light-blue/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/bootstrap4-light-purple/theme.css b/public/themes/bootstrap4-light-purple/theme.css
index b21c7b604..edf6b7a21 100644
--- a/public/themes/bootstrap4-light-purple/theme.css
+++ b/public/themes/bootstrap4-light-purple/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/luna-amber/theme.css b/public/themes/luna-amber/theme.css
index bd6d51a18..021587620 100644
--- a/public/themes/luna-amber/theme.css
+++ b/public/themes/luna-amber/theme.css
@@ -2835,7 +2835,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 0.571rem 0.857rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/luna-blue/theme.css b/public/themes/luna-blue/theme.css
index 4eaaaf884..7a9120e0a 100644
--- a/public/themes/luna-blue/theme.css
+++ b/public/themes/luna-blue/theme.css
@@ -2835,7 +2835,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 0.571rem 0.857rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/luna-green/theme.css b/public/themes/luna-green/theme.css
index 11435cf05..6c3f7c094 100644
--- a/public/themes/luna-green/theme.css
+++ b/public/themes/luna-green/theme.css
@@ -2835,7 +2835,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 0.571rem 0.857rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/luna-pink/theme.css b/public/themes/luna-pink/theme.css
index ecc859223..1e202be35 100644
--- a/public/themes/luna-pink/theme.css
+++ b/public/themes/luna-pink/theme.css
@@ -2835,7 +2835,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 0.571rem 0.857rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/md-dark-deeppurple/theme.css b/public/themes/md-dark-deeppurple/theme.css
index 111e93b7f..b2b7e0279 100644
--- a/public/themes/md-dark-deeppurple/theme.css
+++ b/public/themes/md-dark-deeppurple/theme.css
@@ -2868,7 +2868,7 @@
   height: 4px;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/md-dark-indigo/theme.css b/public/themes/md-dark-indigo/theme.css
index d2e34c96c..f85b31ee7 100644
--- a/public/themes/md-dark-indigo/theme.css
+++ b/public/themes/md-dark-indigo/theme.css
@@ -2868,7 +2868,7 @@
   height: 4px;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/md-light-deeppurple/theme.css b/public/themes/md-light-deeppurple/theme.css
index 255ca0f2d..036018ed0 100644
--- a/public/themes/md-light-deeppurple/theme.css
+++ b/public/themes/md-light-deeppurple/theme.css
@@ -2868,7 +2868,7 @@
   height: 4px;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/md-light-indigo/theme.css b/public/themes/md-light-indigo/theme.css
index 0a91b65e1..dff4e99be 100644
--- a/public/themes/md-light-indigo/theme.css
+++ b/public/themes/md-light-indigo/theme.css
@@ -2868,7 +2868,7 @@
   height: 4px;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/mdc-dark-deeppurple/theme.css b/public/themes/mdc-dark-deeppurple/theme.css
index 298093c3a..7fb6cbd76 100644
--- a/public/themes/mdc-dark-deeppurple/theme.css
+++ b/public/themes/mdc-dark-deeppurple/theme.css
@@ -2868,7 +2868,7 @@
   height: 4px;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 0.75rem 0.75rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/mdc-dark-indigo/theme.css b/public/themes/mdc-dark-indigo/theme.css
index 6235933d5..c527f3a82 100644
--- a/public/themes/mdc-dark-indigo/theme.css
+++ b/public/themes/mdc-dark-indigo/theme.css
@@ -2868,7 +2868,7 @@
   height: 4px;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 0.75rem 0.75rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/mdc-light-deeppurple/theme.css b/public/themes/mdc-light-deeppurple/theme.css
index 383a2c68f..2969db0d3 100644
--- a/public/themes/mdc-light-deeppurple/theme.css
+++ b/public/themes/mdc-light-deeppurple/theme.css
@@ -2868,7 +2868,7 @@
   height: 4px;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 0.75rem 0.75rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/mdc-light-indigo/theme.css b/public/themes/mdc-light-indigo/theme.css
index 9d5ef52c3..a4d574752 100644
--- a/public/themes/mdc-light-indigo/theme.css
+++ b/public/themes/mdc-light-indigo/theme.css
@@ -2868,7 +2868,7 @@
   height: 4px;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 0.75rem 0.75rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/nova-accent/theme.css b/public/themes/nova-accent/theme.css
index d5dd9d5da..729ea1993 100644
--- a/public/themes/nova-accent/theme.css
+++ b/public/themes/nova-accent/theme.css
@@ -2827,7 +2827,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 0.571rem 0.857rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/nova-alt/theme.css b/public/themes/nova-alt/theme.css
index bb051ec7e..a866b362d 100644
--- a/public/themes/nova-alt/theme.css
+++ b/public/themes/nova-alt/theme.css
@@ -2835,7 +2835,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 0.571rem 0.857rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/nova-vue/theme.css b/public/themes/nova-vue/theme.css
index 1a010608a..1c8d151a4 100644
--- a/public/themes/nova-vue/theme.css
+++ b/public/themes/nova-vue/theme.css
@@ -2835,7 +2835,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 0.571rem 0.857rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/nova/theme.css b/public/themes/nova/theme.css
index f1ded05cb..f48fdecc3 100644
--- a/public/themes/nova/theme.css
+++ b/public/themes/nova/theme.css
@@ -2835,7 +2835,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 0.571rem 0.857rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/rhea/theme.css b/public/themes/rhea/theme.css
index 05a7d5496..f0cb7d1c0 100644
--- a/public/themes/rhea/theme.css
+++ b/public/themes/rhea/theme.css
@@ -2827,7 +2827,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 0.571rem 0.857rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/saga-blue/theme.css b/public/themes/saga-blue/theme.css
index 4dd92c094..8d02aa5f0 100644
--- a/public/themes/saga-blue/theme.css
+++ b/public/themes/saga-blue/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/saga-green/theme.css b/public/themes/saga-green/theme.css
index 97e002230..c5e801d24 100644
--- a/public/themes/saga-green/theme.css
+++ b/public/themes/saga-green/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/saga-orange/theme.css b/public/themes/saga-orange/theme.css
index bef1b461c..b3c5938d7 100644
--- a/public/themes/saga-orange/theme.css
+++ b/public/themes/saga-orange/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/vela-blue/theme.css b/public/themes/vela-blue/theme.css
index 94e7d8902..789633b29 100644
--- a/public/themes/vela-blue/theme.css
+++ b/public/themes/vela-blue/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/vela-green/theme.css b/public/themes/vela-green/theme.css
index b3be360d0..c432fa3b4 100644
--- a/public/themes/vela-green/theme.css
+++ b/public/themes/vela-green/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/vela-orange/theme.css b/public/themes/vela-orange/theme.css
index cae181923..9e4dbcfec 100644
--- a/public/themes/vela-orange/theme.css
+++ b/public/themes/vela-orange/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/public/themes/vela-purple/theme.css b/public/themes/vela-purple/theme.css
index 1ce8ec64b..29c5499fd 100644
--- a/public/themes/vela-purple/theme.css
+++ b/public/themes/vela-purple/theme.css
@@ -2852,7 +2852,7 @@
   height: 0.25rem;
 }
 .p-fileupload .p-fileupload-row > div {
-  margin-right: 0.5rem;
+  padding: 1rem 1rem;
 }
 
 .p-fileupload-choose:not(.p-disabled):hover {
diff --git a/src/components/fileupload/FileUpload.vue b/src/components/fileupload/FileUpload.vue
index 9e908ce67..64a6e705f 100755
--- a/src/components/fileupload/FileUpload.vue
+++ b/src/components/fileupload/FileUpload.vue
@@ -362,6 +362,15 @@ export default {
     align-items: center;
 }
 
+.p-fileupload-row > div {
+    flex: 1 1 auto;
+    width: 25%;
+}
+
+.p-fileupload-row > div:last-child {
+    text-align: right;
+}
+
 .p-fileupload-content .p-progressbar {
     width: 100%;
     position: absolute;