diff --git a/lib/widgets/contactrow.dart b/lib/widgets/contactrow.dart
index a6276ae8..ef8027c3 100644
--- a/lib/widgets/contactrow.dart
+++ b/lib/widgets/contactrow.dart
@@ -65,7 +65,7 @@ class _ContactRowState extends State<ContactRow> {
       splashFactory: InkSplash.splashFactory,
       child: Ink(
           color: selected ? Provider.of<Settings>(context).theme.backgroundHilightElementColor : Colors.transparent,
-          child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
+          child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [
             Padding(
                 padding: const EdgeInsets.all(6.0), //border size
                 child: ProfileImage(
@@ -79,7 +79,7 @@ class _ContactRowState extends State<ContactRow> {
                 )),
             Expanded(
                 child: Padding(
-                    padding: EdgeInsets.all(10.0),
+                    padding: EdgeInsets.all(6.0),
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -87,7 +87,7 @@ class _ContactRowState extends State<ContactRow> {
                       children: [
                         Container(
                             clipBehavior: Clip.hardEdge,
-                            height: Provider.of<Settings>(context).fontScaling * 14.0 + 10.0,
+                            height: Provider.of<Settings>(context).fontScaling * 14.0 + 5.0,
                             decoration: BoxDecoration(),
                             child: Text(
                               contact.augmentedNickname(context).trim() + (contact.messageDraft.isEmpty() ? "" : "*"),
@@ -120,7 +120,7 @@ class _ContactRowState extends State<ContactRow> {
                             )),
                         Container(
                           padding: EdgeInsets.all(0),
-                          height: Provider.of<Settings>(context).fontScaling * 14.0 + 10.0,
+                          height: Provider.of<Settings>(context).fontScaling * 14.0 + 5.0,
                           child: contact.isInvitation == true
                               ? Wrap(alignment: WrapAlignment.start, direction: Axis.vertical, children: <Widget>[
                                   Padding(
diff --git a/lib/widgets/profilerow.dart b/lib/widgets/profilerow.dart
index bb5b5366..65fb34a1 100644
--- a/lib/widgets/profilerow.dart
+++ b/lib/widgets/profilerow.dart
@@ -43,11 +43,14 @@ class _ProfileRowState extends State<ProfileRow> {
                       border: profile.isOnline ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor)),
               Expanded(
                   child: Column(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                mainAxisSize: MainAxisSize.min,
                 children: [
                   Container(
                       height: 18.0 * Provider.of<Settings>(context).fontScaling + 10.0,
                       clipBehavior: Clip.hardEdge,
                       decoration: BoxDecoration(),
+                      padding: EdgeInsets.all(5.0),
                       child: Text(
                         profile.nickname,
                         semanticsLabel: profile.nickname,