diff --git a/lib/widgets/address_book_card.dart b/lib/widgets/address_book_card.dart
index c9ac86052..329e35fdf 100644
--- a/lib/widgets/address_book_card.dart
+++ b/lib/widgets/address_book_card.dart
@@ -9,6 +9,8 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/theme/stack_colors.dart';
 import 'package:stackwallet/utilities/util.dart';
+import 'package:stackwallet/widgets/conditional_parent.dart';
+import 'package:stackwallet/widgets/expandable.dart';
 import 'package:stackwallet/widgets/rounded_white_container.dart';
 
 class AddressBookCard extends ConsumerStatefulWidget {
@@ -19,7 +21,7 @@ class AddressBookCard extends ConsumerStatefulWidget {
   }) : super(key: key);
 
   final String contactId;
-  final bool? indicatorDown;
+  final ExpandableState? indicatorDown;
 
   @override
   ConsumerState<AddressBookCard> createState() => _AddressBookCardState();
@@ -58,108 +60,111 @@ class _AddressBookCardState extends ConsumerState<AddressBookCard> {
       }
     }
 
-    return RoundedWhiteContainer(
-      padding: const EdgeInsets.all(4),
-      child: RawMaterialButton(
-        // splashColor: Theme.of(context).extension<StackColors>()!.highlight,
-        padding: const EdgeInsets.all(0),
-        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(
-            Constants.size.circularBorderRadius,
-          ),
-        ),
-        onPressed: () {
-          showDialog<void>(
-            context: context,
-            useSafeArea: true,
-            barrierDismissible: true,
-            builder: (_) => ContactPopUp(
-              contactId: contact.id,
+    return ConditionalParent(
+      condition: !isDesktop,
+      child: Row(
+        children: [
+          Container(
+            width: 32,
+            height: 32,
+            decoration: BoxDecoration(
+              color: contact.id == "default"
+                  ? Theme.of(context)
+                      .extension<StackColors>()!
+                      .myStackContactIconBG
+                  : Theme.of(context)
+                      .extension<StackColors>()!
+                      .textFieldDefaultBG,
+              borderRadius: BorderRadius.circular(32),
             ),
-          );
-        },
-        child: Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: Row(
-            children: [
-              Container(
-                width: 32,
-                height: 32,
-                decoration: BoxDecoration(
-                  color: contact.id == "default"
-                      ? Theme.of(context)
-                          .extension<StackColors>()!
-                          .myStackContactIconBG
-                      : Theme.of(context)
-                          .extension<StackColors>()!
-                          .textFieldDefaultBG,
-                  borderRadius: BorderRadius.circular(32),
-                ),
-                child: contact.id == "default"
+            child: contact.id == "default"
+                ? Center(
+                    child: SvgPicture.asset(
+                      Assets.svg.stackIcon(context),
+                      width: 20,
+                    ),
+                  )
+                : contact.emojiChar != null
                     ? Center(
-                        child: SvgPicture.asset(
-                          Assets.svg.stackIcon(context),
-                          width: 20,
-                        ),
+                        child: Text(contact.emojiChar!),
                       )
-                    : contact.emojiChar != null
-                        ? Center(
-                            child: Text(contact.emojiChar!),
-                          )
-                        : Center(
-                            child: SvgPicture.asset(
-                              Assets.svg.user,
-                              width: 18,
-                            ),
-                          ),
-              ),
-              const SizedBox(
-                width: 12,
-              ),
-              if (isDesktop)
+                    : Center(
+                        child: SvgPicture.asset(
+                          Assets.svg.user,
+                          width: 18,
+                        ),
+                      ),
+          ),
+          const SizedBox(
+            width: 12,
+          ),
+          if (isDesktop)
+            Text(
+              contact.name,
+              style: STextStyles.itemSubtitle12(context),
+            ),
+          if (isDesktop)
+            const SizedBox(
+              width: 16,
+            ),
+          if (isDesktop)
+            Text(
+              coinsString,
+              style: STextStyles.label(context),
+            ),
+          if (!isDesktop)
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
                 Text(
                   contact.name,
                   style: STextStyles.itemSubtitle12(context),
                 ),
-              if (isDesktop)
                 const SizedBox(
-                  width: 16,
+                  height: 4,
                 ),
-              if (isDesktop)
                 Text(
                   coinsString,
                   style: STextStyles.label(context),
                 ),
-              if (!isDesktop)
-                Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      contact.name,
-                      style: STextStyles.itemSubtitle12(context),
-                    ),
-                    const SizedBox(
-                      height: 4,
-                    ),
-                    Text(
-                      coinsString,
-                      style: STextStyles.label(context),
-                    ),
-                  ],
-                ),
-              if (isDesktop) const Spacer(),
-              // if (isDesktop)
-              //   SvgPicture.asset(
-              //     widget.indicatorDown == true
-              //         ? Assets.svg.chevronDown
-              //         : Assets.svg.chevronUp,
-              //     width: 10,
-              //     height: 5,
-              //     color:
-              //         Theme.of(context).extension<StackColors>()!.textSubtitle2,
-              //   ),
-            ],
+              ],
+            ),
+          if (isDesktop) const Spacer(),
+          if (isDesktop)
+            SvgPicture.asset(
+              widget.indicatorDown == ExpandableState.collapsed
+                  ? Assets.svg.chevronDown
+                  : Assets.svg.chevronUp,
+              width: 10,
+              height: 5,
+              color: Theme.of(context).extension<StackColors>()!.textSubtitle2,
+            ),
+        ],
+      ),
+      builder: (child) => RoundedWhiteContainer(
+        padding: const EdgeInsets.all(4),
+        child: RawMaterialButton(
+          // splashColor: Theme.of(context).extension<StackColors>()!.highlight,
+          padding: const EdgeInsets.all(0),
+          materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(
+              Constants.size.circularBorderRadius,
+            ),
+          ),
+          onPressed: () {
+            showDialog<void>(
+              context: context,
+              useSafeArea: true,
+              barrierDismissible: true,
+              builder: (_) => ContactPopUp(
+                contactId: contact.id,
+              ),
+            );
+          },
+          child: Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: child,
           ),
         ),
       ),