diff --git a/Persephone/Controllers/QueueViewController.swift b/Persephone/Controllers/QueueViewController.swift
index 56b9b86..0c7ed7d 100644
--- a/Persephone/Controllers/QueueViewController.swift
+++ b/Persephone/Controllers/QueueViewController.swift
@@ -78,16 +78,7 @@ class QueueViewController: NSViewController,
       owner: self
     ) as! QueueSongTitleView
 
-    cellView.textField?.stringValue = queueItem.song.title
-    if queueItem.isPlaying {
-      cellView.queueSongTitle?.font = .systemFontBold
-      cellView.queuePlayerStateImage?.image = dataSource.queueIcon
-      cellView.queuePosition?.stringValue = ""
-    } else {
-      cellView.queueSongTitle?.font = .systemFontRegular
-      cellView.queuePlayerStateImage?.image = nil
-      cellView.queuePosition?.stringValue = "\(queueItem.queuePos + 1)."
-    }
+    cellView.setQueueSong(queueItem, queueIcon: dataSource.queueIcon)
 
     return cellView
   }
diff --git a/Persephone/Resources/Base.lproj/Main.storyboard b/Persephone/Resources/Base.lproj/Main.storyboard
index 07568fc..58bf652 100644
--- a/Persephone/Resources/Base.lproj/Main.storyboard
+++ b/Persephone/Resources/Base.lproj/Main.storyboard
@@ -569,7 +569,7 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="i0h-bn-auJ" userLabel="Song Title View">
-                                                                    <rect key="frame" x="37" y="0.0" width="163" height="17"/>
+                                                                    <rect key="frame" x="40" y="0.0" width="160" height="17"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="ei8-1e-ErK">
                                                                         <font key="font" metaFont="system"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -578,7 +578,7 @@
                                                                 </textField>
                                                             </subviews>
                                                             <constraints>
-                                                                <constraint firstItem="i0h-bn-auJ" firstAttribute="leading" secondItem="o8i-cz-hIP" secondAttribute="trailing" constant="19" id="68y-un-94T"/>
+                                                                <constraint firstItem="i0h-bn-auJ" firstAttribute="leading" secondItem="o8i-cz-hIP" secondAttribute="trailing" constant="22" id="68y-un-94T"/>
                                                                 <constraint firstItem="mc4-Xr-oUl" firstAttribute="centerY" secondItem="5rR-Gz-AcP" secondAttribute="centerY" id="ELP-WE-eIm"/>
                                                                 <constraint firstItem="o8i-cz-hIP" firstAttribute="leading" secondItem="5rR-Gz-AcP" secondAttribute="leading" constant="3" id="SkK-PE-YOL"/>
                                                                 <constraint firstAttribute="trailing" secondItem="i0h-bn-auJ" secondAttribute="trailing" constant="2" id="XQG-u9-wiY"/>
diff --git a/Persephone/Views/QueueSongTitleView.swift b/Persephone/Views/QueueSongTitleView.swift
index f798a7e..d40b2bd 100644
--- a/Persephone/Views/QueueSongTitleView.swift
+++ b/Persephone/Views/QueueSongTitleView.swift
@@ -12,4 +12,19 @@ class QueueSongTitleView: NSTableCellView {
   @IBOutlet var queuePlayerStateImage: NSImageView!
   @IBOutlet var queuePosition: NSTextField!
   @IBOutlet var queueSongTitle: NSTextField!
+
+  func setQueueSong(_ queueItem: QueueItem, queueIcon: NSImage?) {
+    queuePosition?.font = .timerFont
+    queueSongTitle?.stringValue = queueItem.song.title
+
+    if queueItem.isPlaying {
+      queueSongTitle?.font = .systemFontBold
+      queuePlayerStateImage?.image = queueIcon
+      queuePosition?.stringValue = ""
+    } else {
+      queueSongTitle?.font = .systemFontRegular
+      queuePlayerStateImage?.image = nil
+      queuePosition?.stringValue = "\(queueItem.queuePos + 1)."
+    }
+  }
 }