diff --git a/lib/services/upload/Uploader.dart b/lib/services/upload/Uploader.dart
index 2b3570b..da02c97 100644
--- a/lib/services/upload/Uploader.dart
+++ b/lib/services/upload/Uploader.dart
@@ -64,7 +64,7 @@ class Uploader {
     } catch (e) {
       print(e);
       ScaffoldMessenger.of(context).hideCurrentSnackBar();
-      ScaffoldMessenger.of(context).showSnackBar(errorSnackBar(context, "An error occurred while uploading"));
+      ScaffoldMessenger.of(context).showSnackBar(errorSnackBar(context, appStrings(context).uploadError_title));
     }
 
     await _showUploadNotification(result);
@@ -72,7 +72,6 @@ class Uploader {
 
   void upload(XFile photo, String category) async {
     Map<String, String> queries = {"format":"json", "method": "pwg.images.upload"};
-
     List<int> imageData = await photo.readAsBytes();
 
     Dio dio = new Dio(
@@ -143,7 +142,7 @@ class Uploader {
     } on DioError catch (e) {
       print('Dio upload chunk error $e');
       ScaffoldMessenger.of(context).hideCurrentSnackBar();
-      ScaffoldMessenger.of(context).showSnackBar(errorSnackBar(context, "An error occurred while uploading"));
+      ScaffoldMessenger.of(context).showSnackBar(errorSnackBar(context, appStrings(context).uploadError_title));
       return Future.value(null);
     }
   }
diff --git a/lib/views/CategoryViewPage.dart b/lib/views/CategoryViewPage.dart
index ad31aa1..a74eb61 100644
--- a/lib/views/CategoryViewPage.dart
+++ b/lib/views/CategoryViewPage.dart
@@ -430,7 +430,7 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    Text('Loading files'),
+                    Text(appStrings(context).loadingHUD_label),
                     CircularProgressIndicator(),
                   ],
                 ),
@@ -446,7 +446,6 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
                     builder: (context) => UploadGalleryViewPage(imageData: images, category: widget.category)
                 )).whenComplete(() {
                   setState(() {
-                    // API.uploader.createDio();
                     print('After upload'); // refresh
                   });
                 });
@@ -464,7 +463,20 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
             foregroundColor: _theme.floatingActionButtonTheme.foregroundColor,
             onTap: () async {
               try {
+                ScaffoldMessenger.of(context).removeCurrentSnackBar();
+                ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                  content: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(appStrings(context).loadingHUD_label),
+                      CircularProgressIndicator(),
+                    ],
+                  ),
+                  duration: Duration(days: 365),
+                ));
                 final XFile image = await ImagePicker().pickImage(source: ImageSource.camera);
+                ScaffoldMessenger.of(context).removeCurrentSnackBar();
                 if(image != null) {
                   Navigator.push(context, MaterialPageRoute(
                       builder: (context) => UploadGalleryViewPage(imageData: [image], category: widget.category)