diff --git a/lib/components/app_top_bar.dart b/lib/components/app_top_bar.dart
index 5743a637d..3645ac08a 100644
--- a/lib/components/app_top_bar.dart
+++ b/lib/components/app_top_bar.dart
@@ -27,7 +27,7 @@ class AppTopBar extends StatelessWidget {
       height: 110,
       width: double.maxFinite,
       child: Padding(
-        padding: const EdgeInsets.only(right: 24.0),
+        padding: const EdgeInsets.only(right: 17.0),
         child: Row(
           crossAxisAlignment: CrossAxisAlignment.center,
           mainAxisAlignment: MainAxisAlignment.end,
diff --git a/lib/components/profile_card.dart b/lib/components/profile_card.dart
index 54de4f719..12962c64f 100644
--- a/lib/components/profile_card.dart
+++ b/lib/components/profile_card.dart
@@ -722,10 +722,21 @@ class ProfileCardHeader extends StatelessWidget {
     if (primaryName.length > 20) {
       return truncateString(walletAddress, offsetStart: 10, offsetEnd: 10);
     }
+    var offsetStart = primaryName.length ~/ 2;
+    var offsetEnd = primaryName.length ~/ 2;
+
+    if (offsetStart < 6) {
+      offsetStart = 3;
+    }
+
+    if (offsetEnd < 6) {
+      offsetEnd = 3;
+    }
+
     return truncateString(
       walletAddress,
-      offsetStart: primaryName.length ~/ 2,
-      offsetEnd: primaryName.length ~/ 2,
+      offsetStart: offsetStart,
+      offsetEnd: offsetEnd,
     );
   }