diff --git a/lib/dashboard/drawer/blockchain_settings/blockchain_settings/view/blockchain_settings_menu.dart b/lib/dashboard/drawer/blockchain_settings/blockchain_settings/view/blockchain_settings_menu.dart
index a76435d85..6f36a6648 100644
--- a/lib/dashboard/drawer/blockchain_settings/blockchain_settings/view/blockchain_settings_menu.dart
+++ b/lib/dashboard/drawer/blockchain_settings/blockchain_settings/view/blockchain_settings_menu.dart
@@ -46,7 +46,6 @@ class BlockchainSettingsView extends StatelessWidget {
               Navigator.of(context).push<void>(ManageAccountsPage.route());
             },
           ),
-          const SizedBox(height: Sizes.spaceSmall),
           DrawerItem(
             title: l10n.manageConnectedApps,
             onTap: () {
@@ -61,7 +60,6 @@ class BlockchainSettingsView extends StatelessWidget {
               );
             },
           ),
-          const SizedBox(height: Sizes.spaceSmall),
           DrawerItem(
             title: l10n.blockchainNetwork,
             onTap: () async {
diff --git a/lib/dashboard/drawer/src/view/check_linkedin_profile.dart b/lib/dashboard/drawer/src/view/check_linkedin_profile.dart
index 5661d5f6e..def725bf6 100644
--- a/lib/dashboard/drawer/src/view/check_linkedin_profile.dart
+++ b/lib/dashboard/drawer/src/view/check_linkedin_profile.dart
@@ -46,9 +46,6 @@ class CheckForLinkedInProfileView extends StatelessWidget {
                   width: MediaQuery.of(context).size.shortestSide * 0.5,
                   showPoweredBy: true,
                 ),
-                const SizedBox(
-                  height: Sizes.spaceSmall,
-                ),
                 DrawerItem(
                   title: l10n.scanAndDisplay,
                   onTap: () async {
diff --git a/lib/dashboard/drawer/src/widgets/drawer_item.dart b/lib/dashboard/drawer/src/widgets/drawer_item.dart
index 53c05eb98..847b4880d 100644
--- a/lib/dashboard/drawer/src/widgets/drawer_item.dart
+++ b/lib/dashboard/drawer/src/widgets/drawer_item.dart
@@ -20,73 +20,81 @@ class DrawerItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return TransparentInkWell(
-      onTap: onTap,
-      child: Container(
-        padding: const EdgeInsets.all(Sizes.spaceSmall),
-        decoration: BoxDecoration(
-          color: Theme.of(context).colorScheme.surfaceContainer,
-          borderRadius: const BorderRadius.all(
-            Radius.circular(
-              Sizes.normalRadius,
+    return Padding(
+      padding: const EdgeInsets.all(Sizes.spaceSmall / 2),
+      child: TransparentInkWell(
+        onTap: onTap,
+        child: Container(
+          padding: const EdgeInsets.all(Sizes.spaceSmall),
+          decoration: BoxDecoration(
+            color: Theme.of(context).colorScheme.surfaceContainer,
+            borderRadius: const BorderRadius.all(
+              Radius.circular(
+                Sizes.normalRadius,
+              ),
             ),
           ),
-        ),
-        child: SizedBox(
-          width: double.infinity,
-          child: Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              Expanded(
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      title,
-                      style: Theme.of(context).textTheme.titleMedium!.copyWith(
-                            color: isDisabled
-                                ? Theme.of(context)
-                                    .colorScheme
-                                    .onSurface
-                                    .withOpacity(0.6)
-                                : null,
-                            fontWeight: FontWeight.bold,
-                          ),
-                    ),
-                    if (subtitle != null) ...[
-                      const SizedBox(height: Sizes.space2XSmall),
+          child: SizedBox(
+            width: double.infinity,
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Expanded(
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
                       Text(
-                        subtitle!,
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              color: isDisabled
-                                  ? Theme.of(context)
-                                      .colorScheme
-                                      .onSurface
-                                      .withOpacity(0.6)
-                                  : null,
-                            ),
+                        title,
+                        style:
+                            Theme.of(context).textTheme.titleMedium!.copyWith(
+                                  color: isDisabled
+                                      ? Theme.of(context)
+                                          .colorScheme
+                                          .onSurface
+                                          .withOpacity(0.6)
+                                      : null,
+                                  fontWeight: FontWeight.bold,
+                                ),
                       ),
+                      if (subtitle != null) ...[
+                        const SizedBox(height: Sizes.space2XSmall),
+                        Text(
+                          subtitle!,
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                    color: isDisabled
+                                        ? Theme.of(context)
+                                            .colorScheme
+                                            .onSurface
+                                            .withOpacity(0.6)
+                                        : null,
+                                  ),
+                        ),
+                      ],
                     ],
-                  ],
-                ),
-              ),
-              if (trailing != null)
-                trailing!
-              else ...[
-                const SizedBox(width: 16),
-                Icon(
-                  Icons.chevron_right,
-                  size: Sizes.icon2x,
-                  color: isDisabled
-                      ? Theme.of(context).colorScheme.onSurface.withOpacity(0.6)
-                      : Theme.of(context)
-                          .colorScheme
-                          .onSurface
-                          .withOpacity(0.6),
+                  ),
                 ),
+                if (trailing != null)
+                  trailing!
+                else ...[
+                  const SizedBox(width: 16),
+                  Icon(
+                    Icons.chevron_right,
+                    size: Sizes.icon2x,
+                    color: isDisabled
+                        ? Theme.of(context)
+                            .colorScheme
+                            .onSurface
+                            .withOpacity(0.6)
+                        : Theme.of(context)
+                            .colorScheme
+                            .onSurface
+                            .withOpacity(0.6),
+                  ),
+                ],
               ],
-            ],
+            ),
           ),
         ),
       ),
diff --git a/lib/dashboard/drawer/ssi/backup/src/view/backup_menu.dart b/lib/dashboard/drawer/ssi/backup/src/view/backup_menu.dart
index 780ddff33..353c8d955 100644
--- a/lib/dashboard/drawer/ssi/backup/src/view/backup_menu.dart
+++ b/lib/dashboard/drawer/ssi/backup/src/view/backup_menu.dart
@@ -44,7 +44,6 @@ class BackupView extends StatelessWidget {
                   width: MediaQuery.of(context).size.shortestSide * 0.5,
                   showPoweredBy: true,
                 ),
-                const SizedBox(height: Sizes.spaceSmall),
                 DrawerItem(
                   title: l10n.backupCredential,
                   onTap: () async {
diff --git a/lib/dashboard/drawer/ssi/restore/src/view/restore_menu.dart b/lib/dashboard/drawer/ssi/restore/src/view/restore_menu.dart
index c3bdd7a8f..ffa81310c 100644
--- a/lib/dashboard/drawer/ssi/restore/src/view/restore_menu.dart
+++ b/lib/dashboard/drawer/ssi/restore/src/view/restore_menu.dart
@@ -44,9 +44,6 @@ class RestoreView extends StatelessWidget {
                   width: MediaQuery.of(context).size.shortestSide * 0.5,
                   showPoweredBy: true,
                 ),
-                const SizedBox(
-                  height: Sizes.spaceSmall,
-                ),
                 DrawerItem(
                   title: l10n.restoreCredential,
                   onTap: () async {
diff --git a/lib/dashboard/drawer/ssi/src/view/ssi_menu.dart b/lib/dashboard/drawer/ssi/src/view/ssi_menu.dart
index 431607832..1745f4584 100644
--- a/lib/dashboard/drawer/ssi/src/view/ssi_menu.dart
+++ b/lib/dashboard/drawer/ssi/src/view/ssi_menu.dart
@@ -49,17 +49,11 @@ class SSIView extends StatelessWidget {
           ),
           const DrawerLogo(),
           if (displayManageDecentralizedId)
-            Column(
-              children: [
-                DrawerItem(
-                  title: l10n.manageDecentralizedID,
-                  onTap: () {
-                    Navigator.of(context).push<void>(DidMenu.route());
-                  },
-                ),
-                const SizedBox(height: Sizes.spaceSmall),
-
-              ],
+            DrawerItem(
+              title: l10n.manageDecentralizedID,
+              onTap: () {
+                Navigator.of(context).push<void>(DidMenu.route());
+              },
             ),
           DrawerItem(
             title: l10n.backup,
@@ -67,21 +61,18 @@ class SSIView extends StatelessWidget {
               await Navigator.of(context).push<void>(BackupMenu.route());
             },
           ),
-          const SizedBox(height: Sizes.spaceSmall),
           DrawerItem(
             title: l10n.restore,
             onTap: () async {
               await Navigator.of(context).push<void>(RestoreMenu.route());
             },
           ),
-          const SizedBox(height: Sizes.spaceSmall),
           DrawerItem(
             title: l10n.searchCredentials,
             onTap: () {
               Navigator.of(context).push<void>(SearchPage.route());
             },
           ),
-          const SizedBox(height: Sizes.spaceSmall),
           if (context.read<ProfileCubit>().state.model.profileType ==
               ProfileType.custom) ...[
             DrawerItem(
@@ -90,7 +81,6 @@ class SSIView extends StatelessWidget {
                 Navigator.of(context).push<void>(Oidc4vcSettingMenu.route());
               },
             ),
-            const SizedBox(height: Sizes.spaceSmall),
             DrawerItem(
               title: l10n.trustFramework,
               onTap: () async {
diff --git a/lib/dashboard/drawer/ssi/trust_framework/view/trust_framework_page.dart b/lib/dashboard/drawer/ssi/trust_framework/view/trust_framework_page.dart
index 4bd2a6878..f09a52878 100644
--- a/lib/dashboard/drawer/ssi/trust_framework/view/trust_framework_page.dart
+++ b/lib/dashboard/drawer/ssi/trust_framework/view/trust_framework_page.dart
@@ -93,6 +93,17 @@ class TrustFrameworkPage extends StatelessWidget {
                           );
                     },
                   ),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: Sizes.spaceSmall,
+                    ),
+                    child: Divider(
+                      color: Theme.of(context)
+                          .colorScheme
+                          .onSurface
+                          .withOpacity(0.12),
+                    ),
+                  ),
                 ],
               ),
               Padding(
@@ -102,12 +113,23 @@ class TrustFrameworkPage extends StatelessWidget {
                   style: Theme.of(context).textTheme.labelMedium,
                 ),
               ),
-              const GroupedSection(
+              GroupedSection(
                 children: [
-                  IssuerVerifierSelector(
+                  const IssuerVerifierSelector(
                     title: 'EBSI',
                     isChecked: true,
                   ),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(
+                      horizontal: Sizes.spaceSmall,
+                    ),
+                    child: Divider(
+                      color: Theme.of(context)
+                          .colorScheme
+                          .onSurface
+                          .withOpacity(0.12),
+                    ),
+                  ),
                 ],
               ),
             ],
diff --git a/lib/dashboard/drawer/wallet_security/src/view/wallet_security_menu.dart b/lib/dashboard/drawer/wallet_security/src/view/wallet_security_menu.dart
index 5b2f33dd6..e7669f557 100644
--- a/lib/dashboard/drawer/wallet_security/src/view/wallet_security_menu.dart
+++ b/lib/dashboard/drawer/wallet_security/src/view/wallet_security_menu.dart
@@ -57,7 +57,6 @@ class WalletSecurityView extends StatelessWidget {
                   );
                 },
               ),
-              const SizedBox(height: Sizes.spaceSmall),
               DrawerItem(
                 title: l10n.showWalletRecoveryPhrase,
                 subtitle: l10n.showWalletRecoveryPhraseSubtitle,
@@ -85,7 +84,6 @@ class WalletSecurityView extends StatelessWidget {
                   }
                 },
               ),
-              const SizedBox(height: Sizes.spaceSmall),
               if (context.read<ProfileCubit>().state.model.profileType ==
                   ProfileType.custom)
                 DrawerItem(
diff --git a/lib/dashboard/drawer/wallet_settings/view/wallet_settings_menu.dart b/lib/dashboard/drawer/wallet_settings/view/wallet_settings_menu.dart
index bd0541346..4c07cd35c 100644
--- a/lib/dashboard/drawer/wallet_settings/view/wallet_settings_menu.dart
+++ b/lib/dashboard/drawer/wallet_settings/view/wallet_settings_menu.dart
@@ -48,7 +48,6 @@ class WalletSettingsMenuView extends StatelessWidget {
               await Navigator.of(context).push<void>(LanguageSettings.route());
             },
           ),
-          const SizedBox(height: Sizes.spaceSmall),
           DrawerItem(
             title: l10n.themeSettings,
             subtitle: l10n.themeSettingsDescription,
diff --git a/test/app/shared/widget/custom_listtile_card_test.dart b/test/app/shared/widget/custom_listtile_card_test.dart
index ecc77b837..e6d3e9860 100644
--- a/test/app/shared/widget/custom_listtile_card_test.dart
+++ b/test/app/shared/widget/custom_listtile_card_test.dart
@@ -24,9 +24,6 @@ void main() {
     expect(find.text('Test Title'), findsOneWidget);
     expect(find.text('Test Subtitle'), findsOneWidget);
     expect(find.byType(Image), findsOneWidget);
-    expect(find.byType(Icon), findsOneWidget);
-
-    expect(find.byIcon(Icons.thumb_up), findsOneWidget);
 
     await tester.tap(find.byType(ListTile));
     expect(triggerred, isTrue);