diff --git a/partials/feed.html b/partials/feed.html
index 5f67f7a..9d0e719 100644
--- a/partials/feed.html
+++ b/partials/feed.html
@@ -15,22 +15,7 @@
         </div>
         <h3>Episodes</h3>
         <div ng-repeat="item in feed.items | orderBy:'date':reverse=true" ng-controller="ListItemCtrl">
-            <div class="listItem">
-                <div class="playButton">
-                    <span ng-click="playItem(item.id)"><i ng-class="{hasAudio: item.audio}" class="icon-play"></i></span>
-                </div>
-                <div class="feedItemContent" ng-click="showItemOptions(item.id)">
-                    <span class="feedItemTitle">{{ item.title }}</span>
-                    {{ item.date | timeAgo }}<span ng-show="item.duration">, {{ item.duration }}</span>
-                </div>
-            </div>
-            <div ng-show="item.showOptions" class="feedItemOptions">
-                <a ng-hide="item.queued" ng-click="addToQueue(item.id)"><i class="icon-plus"></i> Add to Queue</a>
-                <a ng-hide="item.audio" ng-click="downloadFile(item.id)"><i class="icon-download"></i> Download</a>
-                <a ng-show="item.audio" ng-click="reDownloadFile(item.id)"><i class="icon-download"></i> Re-Download</a>
-                <a ng-click="goToFeed(item.feedId)"><i class="icon-list-ul"></i> Show Feed</a>
-                <a ng-show="item.queued" ng-click="removeFromQueue(item.id)"><i class="icon-remove-circle"></i> Unqueue</a>
-            </div>
+            <div ng-include src="'partials/listItem.html'"></div>
         </div>
     </div>
 </div>
diff --git a/partials/listItem.html b/partials/listItem.html
index f4a9bc7..2c6ce1c 100644
--- a/partials/listItem.html
+++ b/partials/listItem.html
@@ -1,4 +1,3 @@
-<!-- This isn't used yet, because of https://github.com/angular/angular.js/issues/3584 -->
 <div class="listItem">
     <div class="playButton">
         <span ng-click="playItem(item.id)"><i ng-class="{hasAudio: item.audio}" class="icon-play"></i></span>
diff --git a/partials/listQueue.html b/partials/listQueue.html
index 9c694b4..3af6fa4 100644
--- a/partials/listQueue.html
+++ b/partials/listQueue.html
@@ -1,21 +1,6 @@
 <div id="queueList" pull-to-refresh="pull-to-refresh">
     <div ng-repeat="item in queue|orderBy:'-date'" class="listRow" ng-controller="ListItemCtrl">
-        <div class="listItem">
-            <div class="playButton">
-                <span ng-click="playItem(item.id)"><i ng-class="{hasAudio: item.audio}" class="icon-play"></i></span>
-            </div>
-            <div class="feedItemContent" ng-click="showItemOptions(item.id)">
-                <span class="feedItemTitle">{{ item.title }}</span>
-                {{ item.date | timeAgo }}<span ng-show="item.duration">, {{ item.duration }}</span>
-            </div>
-        </div>
-        <div ng-show="item.showOptions" class="feedItemOptions">
-            <a ng-hide="item.queued" ng-click="addToQueue(item.id)"><i class="icon-plus"></i> Add to Queue</a>
-            <a ng-hide="item.audio" ng-click="downloadFile(item.id)"><i class="icon-download"></i> Download</a>
-            <a ng-show="item.audio" ng-click="reDownloadFile(item.id)"><i class="icon-download"></i> Re-Download</a>
-            <a ng-click="goToFeed(item.feedId)"><i class="icon-list-ul"></i> Show Feed</a>
-            <a ng-show="item.queued" ng-click="removeFromQueue(item.id)"><i class="icon-remove-circle"></i> Unqueue</a>
-        </div>
+        <div ng-include src="'partials/listItem.html'"></div>
     </div>
     <div ng-hide="queue.length" class="pullDownMessage">
         <i class="icon-arrow-down"></i> Pull down to refresh.