diff --git a/src/components/common/SongInfo.tsx b/src/components/common/SongInfo.tsx
index ae4d367..3da05d6 100644
--- a/src/components/common/SongInfo.tsx
+++ b/src/components/common/SongInfo.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { 
   IonModal, IonContent, 
-  IonButton, IonIcon, IonList, IonItem, IonLabel
+  IonButton, IonIcon
 } from '@ionic/react';
 import { 
   add, heart, heartOutline, ban, checkmark, people
@@ -11,7 +11,7 @@ import { selectIsAdmin, selectFavorites, selectSongs, selectQueue } from '../../
 import { useActions } from '../../hooks/useActions';
 import { useModal } from '../../hooks/useModalContext';
 
-import { ModalHeader } from './ModalHeader';
+import { ModalHeader, InfiniteScrollList, SongItem } from './index';
 import { SongInfoDisplay } from './SongItem';
 import type { Song, QueueItem } from '../../types';
 
@@ -152,24 +152,23 @@ const SongInfo: React.FC<SongInfoProps> = ({ isOpen, onClose, song }) => {
         />
         
         <IonContent>
-          <div className="p-4">
-            {artistSongs.length > 0 ? (
-              <IonList>
-                {artistSongs.map((artistSong) => (
-                  <IonItem key={artistSong.path}>
-                    <IonLabel>
-                      <div className="text-base font-bold">{artistSong.title}</div>
-                      <div className="text-sm text-gray-500 dark:text-gray-400">{artistSong.path}</div>
-                    </IonLabel>
-                  </IonItem>
-                ))}
-              </IonList>
-            ) : (
-              <div className="p-4 text-center text-gray-500 dark:text-gray-400">
-                No other songs found by this artist
-              </div>
+          <InfiniteScrollList
+            items={artistSongs}
+            isLoading={false}
+            hasMore={false}
+            onLoadMore={() => {}}
+            renderItem={(song) => (
+              <SongItem
+                song={song}
+                context="search"
+                showAddButton={true}
+                showInfoButton={true}
+                showFavoriteButton={false}
+              />
             )}
-          </div>
+            emptyTitle="No songs found"
+            emptyMessage="No other songs found by this artist"
+          />
         </IonContent>
       </IonModal>
     </>
diff --git a/src/features/Artists/Artists.tsx b/src/features/Artists/Artists.tsx
index 5097dc0..1509b1c 100644
--- a/src/features/Artists/Artists.tsx
+++ b/src/features/Artists/Artists.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
-import { IonSearchbar, IonModal, IonContent, IonItem } from '@ionic/react';
+import { IonSearchbar, IonModal, IonContent } from '@ionic/react';
 import { list } from 'ionicons/icons';
-import { InfiniteScrollList, SongItem, ListItem, NumberDisplay, ModalHeader } from '../../components/common';
+import { InfiniteScrollList, SongItem, ListItem, ModalHeader } from '../../components/common';
 import { useArtists } from '../../hooks';
 import { useAppSelector } from '../../redux';
 import { selectSongs } from '../../redux';
@@ -83,61 +83,23 @@ const Artists: React.FC = () => {
           <ModalHeader title={`Songs by ${selectedArtist}`} onClose={handleCloseArtistSongs} />
           
           <IonContent>
-            <div style={{ padding: '10px' }}>
-              <InfiniteScrollList
-                items={selectedArtistSongs}
-                isLoading={false}
-                hasMore={false}
-                onLoadMore={() => {}}
-                renderItem={(song, index) => (
-                  <IonItem 
-                    key={song.key} 
-                    detail={false} 
-                    style={{ 
-                      '--min-height': '60px', 
-                      '--border-style': 'none',
-                      '--padding-start': '0',
-                      '--padding-end': '0',
-                      '--inner-padding-start': '0',
-                      '--inner-padding-end': '0',
-                      '--padding-top': '0',
-                      '--padding-bottom': '0',
-                      margin: '5px 0',
-                      display: 'flex',
-                      alignItems: 'center'
-                    }}
-                  >
-                    {/* Number */}
-                    <div style={{ 
-                      flexShrink: 0,
-                      display: 'flex',
-                      alignItems: 'center'
-                    }}>
-                      <NumberDisplay number={index + 1} />
-                    </div>
-                    
-                    {/* Song Item Content - placed directly after NumberDisplay like in ListItem */}
-                    <div style={{ 
-                      flex: 1,
-                      display: 'flex',
-                      alignItems: 'center'
-                    }}>
-                      <div style={{ width: '100%' }}>
-                        <SongItem
-                          song={song}
-                          context="search"
-                          showAddButton={true}
-                          showInfoButton={true}
-                          showFavoriteButton={false}
-                        />
-                      </div>
-                    </div>
-                  </IonItem>
-                )}
-                emptyTitle="No songs found"
-                emptyMessage="This artist has no songs in the catalog"
-              />
-            </div>
+            <InfiniteScrollList
+              items={selectedArtistSongs}
+              isLoading={false}
+              hasMore={false}
+              onLoadMore={() => {}}
+              renderItem={(song) => (
+                <SongItem
+                  song={song}
+                  context="search"
+                  showAddButton={true}
+                  showInfoButton={true}
+                  showFavoriteButton={false}
+                />
+              )}
+              emptyTitle="No songs found"
+              emptyMessage="This artist has no songs in the catalog"
+            />
           </IonContent>
         </IonModal>