diff --git a/lib/features/base/widget/application_version_widget.dart b/lib/features/base/widget/application_version_widget.dart
index ea85bd801..81608a987 100644
--- a/lib/features/base/widget/application_version_widget.dart
+++ b/lib/features/base/widget/application_version_widget.dart
@@ -37,16 +37,22 @@ class _ApplicationVersionWidgetState extends State<ApplicationVersionWidget> {
       future: _versionStream,
       builder: (context, snapshot) {
         if (snapshot.hasData) {
-          return Padding(
-            padding: widget.padding ?? const EdgeInsets.only(top: 8),
-            child: Text(
-              '${widget.title ?? 'v.'}${snapshot.data}',
-              textAlign: TextAlign.center,
-              style: widget.textStyle ?? Theme.of(context).textTheme.bodySmall?.copyWith(
-                color: AppColor.steelGray400,
-              ),
+          final versionLabel = Text(
+            '${widget.title ?? 'v.'}${snapshot.data}',
+            textAlign: TextAlign.center,
+            style: widget.textStyle ?? Theme.of(context).textTheme.bodySmall?.copyWith(
+              color: AppColor.steelGray400,
             ),
           );
+
+          if (widget.padding != null) {
+            return Padding(
+              padding: widget.padding!,
+              child: versionLabel,
+            );
+          } else {
+            return versionLabel;
+          }
         } else {
           return const SizedBox.shrink();
         }
diff --git a/lib/features/login/presentation/login_view.dart b/lib/features/login/presentation/login_view.dart
index 466c128fc..1da4465bb 100644
--- a/lib/features/login/presentation/login_view.dart
+++ b/lib/features/login/presentation/login_view.dart
@@ -127,7 +127,7 @@ class LoginView extends BaseLoginView {
               padding: EdgeInsets.only(top: 16),
               child: PrivacyLinkWidget(),
             ),
-            const ApplicationVersionWidget(),
+            const ApplicationVersionWidget(padding: EdgeInsets.only(top: 8)),
           ]
         ),
       )
diff --git a/lib/features/login/presentation/login_view_web.dart b/lib/features/login/presentation/login_view_web.dart
index 78ff2545a..339ff719c 100644
--- a/lib/features/login/presentation/login_view_web.dart
+++ b/lib/features/login/presentation/login_view_web.dart
@@ -73,7 +73,7 @@ class LoginView extends BaseLoginView {
                 padding: EdgeInsets.only(top: 16),
                 child: PrivacyLinkWidget(),
               ),
-              const ApplicationVersionWidget(),
+              const ApplicationVersionWidget(padding: EdgeInsets.only(top: 8)),
             ],
           )
         ),
@@ -221,7 +221,7 @@ class LoginView extends BaseLoginView {
                       padding: EdgeInsets.only(top: 16),
                       child: PrivacyLinkWidget()
                     ),
-                    const ApplicationVersionWidget(),
+                    const ApplicationVersionWidget(padding: EdgeInsets.only(top: 8)),
                   ],
                 )
               ),
diff --git a/lib/features/mailbox/presentation/mailbox_view.dart b/lib/features/mailbox/presentation/mailbox_view.dart
index 3570ed281..821bc8ce9 100644
--- a/lib/features/mailbox/presentation/mailbox_view.dart
+++ b/lib/features/mailbox/presentation/mailbox_view.dart
@@ -40,13 +40,21 @@ class MailboxView extends BaseMailboxView {
                 child: _buildListMailbox(context),
               ),
             ),
-            const QuotasView(),
+            QuotasView(
+              labelStyle: Theme.of(context).textTheme.bodySmall?.copyWith(
+                color: AppColor.steelGray400,
+              ),
+              labelMaxLines: 1,
+              padding: const EdgeInsetsDirectional.only(
+                start: 24,
+                end: 23,
+                top: 16,
+              ),
+            ),
             Container(
-              width: double.infinity,
-              color: Colors.white,
-              padding: const EdgeInsets.all(16),
+              alignment: AlignmentDirectional.centerStart,
+              padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
               child: ApplicationVersionWidget(
-                padding: EdgeInsets.zero,
                 title: '${AppLocalizations.of(context).version} ',
               ),
             ),
diff --git a/lib/features/mailbox/presentation/mailbox_view_web.dart b/lib/features/mailbox/presentation/mailbox_view_web.dart
index e8ec4e337..bbdd128c9 100644
--- a/lib/features/mailbox/presentation/mailbox_view_web.dart
+++ b/lib/features/mailbox/presentation/mailbox_view_web.dart
@@ -79,7 +79,6 @@ class MailboxView extends BaseMailboxView {
                   ? AppColor.colorBgDesktop
                   : Colors.white,
               child: ApplicationVersionWidget(
-                padding: EdgeInsets.zero,
                 title: '${AppLocalizations.of(context).version.toLowerCase()} ',
               ),
             ),
diff --git a/lib/features/manage_account/presentation/menu/manage_account_menu_view.dart b/lib/features/manage_account/presentation/menu/manage_account_menu_view.dart
index 2387fb7ab..0f866b353 100644
--- a/lib/features/manage_account/presentation/menu/manage_account_menu_view.dart
+++ b/lib/features/manage_account/presentation/menu/manage_account_menu_view.dart
@@ -31,7 +31,9 @@ class ManageAccountMenuView extends GetWidget<ManageAccountMenuController> {
                        padding: const EdgeInsetsDirectional.only(top: 16, bottom: 16, start: 16),
                        child: Row(children: [
                          ApplicationLogoWidthTextWidget(),
-                         const ApplicationVersionWidget()
+                         const ApplicationVersionWidget(
+                           padding: EdgeInsets.only(top: 8),
+                         ),
                        ])
                    ),
                  if (!controller.responsiveUtils.isWebDesktop(context))
@@ -156,7 +158,6 @@ class ManageAccountMenuView extends GetWidget<ManageAccountMenuController> {
                      : AlignmentDirectional.center,
                    padding: const EdgeInsets.all(16),
                    child: ApplicationVersionWidget(
-                     padding: EdgeInsets.zero,
                      title: '${AppLocalizations.of(context).version.toLowerCase()} ',
                    ),
                  ),
diff --git a/lib/features/quotas/presentation/quotas_view.dart b/lib/features/quotas/presentation/quotas_view.dart
index d73769732..8c4b78113 100644
--- a/lib/features/quotas/presentation/quotas_view.dart
+++ b/lib/features/quotas/presentation/quotas_view.dart
@@ -12,8 +12,15 @@ import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
 class QuotasView extends GetWidget<QuotasController> {
 
   final EdgeInsetsGeometry? padding;
+  final TextStyle? labelStyle;
+  final int? labelMaxLines;
 
-  const QuotasView({super.key, this.padding});
+  const QuotasView({
+    super.key,
+    this.padding,
+    this.labelStyle,
+    this.labelMaxLines,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -52,12 +59,12 @@ class QuotasView extends GetWidget<QuotasController> {
                     Flexible(
                       child: Text(
                         AppLocalizations.of(context).storageQuotas,
-                        style: const TextStyle(
+                        style: labelStyle ?? const TextStyle(
                           fontSize: QuotasViewStyles.labelTextSize,
                           fontWeight: QuotasViewStyles.labelFontWeight,
                           color: QuotasViewStyles.labelTextColor,
                         ),
-                        maxLines: 2,
+                        maxLines: labelMaxLines ?? 2,
                         overflow: TextOverflow.ellipsis,
                       ),
                     ),
@@ -89,12 +96,12 @@ class QuotasView extends GetWidget<QuotasController> {
                 const SizedBox(height: QuotasViewStyles.space),
                 Text(
                   octetQuota.getQuotasStateTitle(context),
-                  style: TextStyle(
+                  style: labelStyle ?? TextStyle(
                     fontSize: QuotasViewStyles.progressStateTextSize,
                     fontWeight: QuotasViewStyles.progressStateFontWeight,
                     color: octetQuota.getQuotasStateTitleColor(),
                   ),
-                  maxLines: 2,
+                  maxLines: labelMaxLines ?? 2,
                   overflow: TextOverflow.ellipsis,
                 )
               ],