diff --git a/src/renderer/pages/player-page.js b/src/renderer/pages/player-page.js
index 0014558c..78bbf75f 100644
--- a/src/renderer/pages/player-page.js
+++ b/src/renderer/pages/player-page.js
@@ -340,13 +340,13 @@ function renderAudioMetadata (state) {
     format.push(fileSummary.audioInfo.format.codec)
   }
   if (fileSummary.audioInfo.format.bitrate) {
-    format.push(Math.round(fileSummary.audioInfo.format.bitrate / 1000) + ' kbps') // 128 kbps
+    format.push(Math.round(fileSummary.audioInfo.format.bitrate / 1000) + ' kbit/s') // 128 kbit/s
   }
   if (fileSummary.audioInfo.format.sampleRate) {
     format.push(Math.round(fileSummary.audioInfo.format.sampleRate / 100) / 10 + ' kHz')
   }
   if (fileSummary.audioInfo.format.bitsPerSample) {
-    format.push(fileSummary.audioInfo.format.bitsPerSample + ' bit')
+    format.push(fileSummary.audioInfo.format.bitsPerSample + '-bit')
   }
   if (format.length > 0) {
     elems.push((
@@ -450,9 +450,9 @@ function renderCastScreen (state) {
     const minutes = Math.floor(rawEta / 60) % 60
     const seconds = Math.floor(rawEta % 60)
 
-    const hoursStr = hours ? hours + 'h' : ''
-    const minutesStr = (hours || minutes) ? minutes + 'm' : ''
-    const secondsStr = seconds + 's'
+    const hoursStr = hours ? hours + ' h' : ''
+    const minutesStr = (hours || minutes) ? minutes + ' min' : ''
+    const secondsStr = seconds + ' s'
 
     return (<span>{hoursStr} {minutesStr} {secondsStr} remaining</span>)
   }
diff --git a/src/renderer/pages/torrent-list-page.js b/src/renderer/pages/torrent-list-page.js
index cd14b63b..79243d85 100644
--- a/src/renderer/pages/torrent-list-page.js
+++ b/src/renderer/pages/torrent-list-page.js
@@ -198,9 +198,9 @@ module.exports = class TorrentList extends React.Component {
 
       // Only display hours and minutes if they are greater than 0 but always
       // display minutes if hours is being displayed
-      const hoursStr = hours ? hours + 'h' : ''
-      const minutesStr = (hours || minutes) ? minutes + 'm' : ''
-      const secondsStr = seconds + 's'
+      const hoursStr = hours ? hours + ' h' : ''
+      const minutesStr = (hours || minutes) ? minutes + ' min' : ''
+      const secondsStr = seconds + ' s'
 
       return (<span key='eta'>{hoursStr} {minutesStr} {secondsStr} remaining</span>)
     }