diff --git a/src/components/controls.tsx b/src/components/controls.tsx
index 8638f23..406fbb4 100644
--- a/src/components/controls.tsx
+++ b/src/components/controls.tsx
@@ -141,7 +141,7 @@ export const Controls = () => {
     } else if (tracks.length === 0) {
         message = `BLANKDISC`;
     } else if (deviceStatus && deviceStatus.track !== null && tracks[deviceStatus.track]) {
-        message = `${deviceStatus.track + 1} - ` + tracks[deviceStatus.track].title;
+        message = (deviceStatus.track + 1).toString().padStart(3, '0') + (tracks[deviceStatus.track].title ? ' - ' + tracks[deviceStatus.track].title : '');
     }
 
     const [lcdScroll, setLcdScroll] = useState(0);
diff --git a/src/components/main.tsx b/src/components/main.tsx
index 35765fa..f7360ca 100644
--- a/src/components/main.tsx
+++ b/src/components/main.tsx
@@ -451,13 +451,13 @@ export const Main = (props: {}) => {
                                 className={classes.trackRow}
                             >
                                 <TableCell className={classes.indexCell}>
-                                    {track.index === deviceStatus?.track ?
+                                    {track.index === deviceStatus?.track && (["playing", "paused"].includes(deviceStatus?.state)) ?
                                         <span>
                                             <PlayArrowIcon
                                                 className={`${classes.controlButtonInTrackCommon} ${classes.playButtonInTrackListPlaying} ${deviceStatus?.state === 'playing' ? classes.currentControlButton : ''}`}
                                                 onClick={event => {handleCurrentClick(event); event.stopPropagation();}} />
                                             <PauseIcon
-                                                className={`${classes.controlButtonInTrackCommon} ${classes.pauseButtonInTrackListPlaying} ${deviceStatus?.state !== 'playing' ? classes.currentControlButton : ''}`}
+                                                className={`${classes.controlButtonInTrackCommon} ${classes.pauseButtonInTrackListPlaying} ${deviceStatus?.state === 'paused' ? classes.currentControlButton : ''}`}
                                                 onClick={event => {handleCurrentClick(event); event.stopPropagation()}} />
                                         </span> :
                                         <span>