diff --git a/templates/broadcast/Download.stream.html.twig b/templates/broadcast/Download.stream.html.twig
index 4fcfb39..a7da112 100644
--- a/templates/broadcast/Download.stream.html.twig
+++ b/templates/broadcast/Download.stream.html.twig
@@ -15,9 +15,7 @@
                             <span class="w-4 inline-block text-center text-gray-50">{{ entity.progress }}</span>
                         </span>
                     {% else %}
-                        <span class="p-1.5 bg-green-600 rounded-full">
-                            <span class="inline-block text-center text-gray-50">Complete</span>
-                        </span>
+                        <twig:StatusBadge color="green" status="Complete" />
                     {% endif %}
                 </td>
             </tr>
@@ -34,7 +32,7 @@
                 </td>
                 <td class="px-6 py-4 whitespace-nowrap text-sm text-end text-gray-800 dark:text-gray-50">
                     <span class="p-1.5 bg-purple-600 rounded-full">
-                        <span class="w-4 inline-block text-center text-gray-50">{{ entity.progress }}</span>
+                        <span class="mw-4 inline-block text-center text-gray-50">{{ entity.progress }}</span>
                     </span>
                 </td>
             </template>
@@ -59,9 +57,7 @@
                         {{ entity.title }}
                     </td>
                     <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-50">
-                        <span class="p-1.5 bg-green-600 rounded-full">
-                            <span class="inline-block text-center text-gray-50">Complete</span>
-                        </span>
+                        <twig:StatusBadge color="green" status="Complete" />
                     </td>
                 </tr>
             </template>
@@ -71,5 +67,4 @@
 
 {% block remove %}
     <turbo-stream action="remove" target="ad_download_{{ id }}"></turbo-stream>
-{#    <turbo-stream action="remove" target="cd_download_{{ id }}"></turbo-stream>#}
 {% endblock %}
diff --git a/templates/components/DownloadList.html.twig b/templates/components/DownloadList.html.twig
index fa682d6..76154e2 100644
--- a/templates/components/DownloadList.html.twig
+++ b/templates/components/DownloadList.html.twig
@@ -20,11 +20,11 @@
                     <td class="px-6 py-4 whitespace-nowrap text-sm font-medium text-gray-800 dark:text-stone-800 min-w-[45ch] max-w-[45ch] truncate">
                         {{ download.title }}
                     </td>
-                    <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-800 dark:text-gray-50">
+                    <td class="px-6 py-4 whitespace-nowrap text-sm align-middle text-gray-800 dark:text-gray-50">
                         {% if download.progress < 100 %}
-                        <span class="p-1.5 bg-purple-600 rounded-full">
-                            <span class="w-4 inline-block text-center text-gray-50">{{ download.progress }}</span>
-                        </span>
+                        <div class="w-[3.25ch] h-[3.25ch] bg-purple-600 rounded-full block text-center table-cell align-middle text-xs text-gray-50">
+                            {{ download.progress }}
+                        </div>
                         {% else %}
                             <twig:StatusBadge color="green" status="Completed" />
                         {% endif %}