diff --git a/jam-ui/src/components/client/JKSessionAudioInputs.js b/jam-ui/src/components/client/JKSessionAudioInputs.js
index fab80e5f4..16a722f6e 100644
--- a/jam-ui/src/components/client/JKSessionAudioInputs.js
+++ b/jam-ui/src/components/client/JKSessionAudioInputs.js
@@ -18,7 +18,7 @@ const JKSessionAudioInputs = ({ myTracks, chat, mixerHelper, isRemote = false, m
               const serverInstrument = typeof instrumentId === 'number'
                 ? convertClientInstrumentToServer(instrumentId)
                 : (instrumentId || track.track?.instrument);
-              const instrumentIcon = getInstrumentIcon45(serverInstrument);
+              //const instrumentIcon = getInstrumentIcon45(serverInstrument);
 
               // Select the appropriate mixer based on mixType:
               // - 'personal': Audio Mix view (what I hear) - uses personalMixers
@@ -36,7 +36,7 @@ const JKSessionAudioInputs = ({ myTracks, chat, mixerHelper, isRemote = false, m
                   <JKSessionMyTrack
                     {...track}
                     mixers={selectedMixers}
-                    instrumentIcon={instrumentIcon}
+                    instrument={serverInstrument}
                     mode={mixerHelper.mixMode}
                     isRemote={isRemote}
                   /></div>
@@ -47,7 +47,7 @@ const JKSessionAudioInputs = ({ myTracks, chat, mixerHelper, isRemote = false, m
                 key="chat"
                 {...chat}
                 trackName="Chat"
-                instrumentIcon="/assets/content/icon_instrument_headphones45.png"
+                instrument="headphones"
                 hasMixer={true}
                 isChat={true}
                 isRemote={isRemote}
diff --git a/jam-ui/src/components/client/JKSessionMyTrack.js b/jam-ui/src/components/client/JKSessionMyTrack.js
index 01a59ee0c..c4e3ba627 100644
--- a/jam-ui/src/components/client/JKSessionMyTrack.js
+++ b/jam-ui/src/components/client/JKSessionMyTrack.js
@@ -18,15 +18,15 @@ import { selectSessionId, updateParticipantTrackInstrument, updateUserTrack } fr
 import { syncTracksToServer } from '../../services/trackSyncService';
 import './JKSessionMyTrack.css';
 import pluginIcon from '../../assets/img/client/plugin.svg';
+import JKInstrumentIcon from '../profile/JKInstrumentIcon';
 
 const JKSessionMyTrack = ({
   track,
-  trackIndex = 0, // 0-based index for native client VST operations
   mixers,
   hasMixer,
   name,
   trackName,
-  instrumentIcon,
+  instrument,
   photoUrl,
   clientId,
   userId,
@@ -190,7 +190,8 @@ const JKSessionMyTrack = ({
           onClick={!isRemote ? handleInstrumentClick : undefined}
           style={!isRemote ? { cursor: 'pointer' } : {}}
         >
-          <img src={instrumentIcon} alt="instrument" />
+          {/* <img src={instrumentIcon} alt="instrument" /> */}
+          <JKInstrumentIcon instrumentId={instrument} instrumentName={instrument} />
           {!isRemote && track?.hasVst && (
             <img
               src={pluginIcon}
@@ -315,7 +316,7 @@ const JKSessionMyTrack = ({
           <JKSessionPluginModal
             isOpen={showPluginModal}
             toggle={() => setShowPluginModal(false)}
-            trackNumber={trackIndex + 1}
+            trackNumber={ASSIGNMENT.TRACK1}
           />
         </>
       )}