diff --git a/app/scripts/controllers/Billing.js b/app/scripts/controllers/Billing.js
index 12f71fe..2fd0a7c 100644
--- a/app/scripts/controllers/Billing.js
+++ b/app/scripts/controllers/Billing.js
@@ -549,6 +549,63 @@ angular.module('Lineblocs')
 		var token = getJWTTokenObj();
 		$window.location.replace(createUrl("/downloadBillingHistory?startDate=" + formatDate($scope.startDate) + "&endDate=" + formatDate($scope.endDate) + "&auth=" + token.token.auth));
 	}
+
+	$scope.canDownloadInvoice = function(item) {
+		var invoiceId = item.id;
+		var sourceType = ((item && item.type) || "").toString().toLowerCase();
+		return !!invoiceId && sourceType.indexOf("invoice") !== -1;
+	}
+
+	$scope.downloadInvoice = function(item) {
+		var invoiceId = item.id;
+		if (!invoiceId) {
+			$mdToast.show(
+				$mdToast.simple()
+					.textContent('Invoice ID not found for this row')
+					.position("top right")
+					.hideDelay(3000)
+			);
+			return;
+		}
+
+		$shared.isCreateLoading = true;
+		Backend.get("/billing/invoices/" + invoiceId + "/download", { responseType: 'blob' }).then(function(res) {
+			var contentType = 'application/pdf';
+			var contentDisposition = null;
+			if (res.headers) {
+				contentType = res.headers('content-type') || contentType;
+				contentDisposition = res.headers('content-disposition');
+			}
+
+			var filename = 'invoice-' + invoiceId + '.pdf';
+			if (contentDisposition) {
+				var matches = /filename\*?=(?:UTF-8''|\")?([^\";]+)/i.exec(contentDisposition);
+				if (matches && matches[1]) {
+					filename = decodeURIComponent(matches[1].replace(/\"/g, ''));
+				}
+			}
+
+			var blob = new Blob([res.data], { type: contentType });
+			var url = window.URL.createObjectURL(blob);
+			var link = document.createElement('a');
+			link.href = url;
+			link.download = filename;
+			document.body.appendChild(link);
+			link.click();
+			document.body.removeChild(link);
+			window.URL.revokeObjectURL(url);
+			$shared.endIsCreateLoading();
+		}, function(err) {
+			console.error('Error downloading invoice', err);
+			$shared.endIsCreateLoading();
+			$mdToast.show(
+				$mdToast.simple()
+					.textContent('Failed to download invoice')
+					.position("top right")
+					.hideDelay(3000)
+			);
+		});
+	}
 	$scope.makeNicePackageName = function(ugly) {
 		var map = {
 			"gold": "Gold Route",
diff --git a/app/views/pages/billing.html b/app/views/pages/billing.html
index e668ebb..1f0e6ee 100644
--- a/app/views/pages/billing.html
+++ b/app/views/pages/billing.html
@@ -422,7 +422,8 @@ <h5 class="title-text">History</h5>
                                     <th md-column>Amount</th>
                                     <th md-column>Balance</th>
                                     <th md-column>Date/Time</th>
-                                    <th md-column>&nbsp;</th>
+                                    <th md-column>Status</th>
+                                    <th md-column>Action</th>
                                 </tr>
                             </thead>
                             <tbody md-body>
@@ -433,6 +434,20 @@ <h5 class="title-text">History</h5>
                                     <td md-cell>{{item.balance}}</td>
                                     <td md-cell>{{item.created_at}}</td>
                                     <td md-cell>{{item.status}}</td>
+                                    <td md-cell>
+                                        <md-button
+                                            ng-if="canDownloadInvoice(item)"
+                                            ng-click="downloadInvoice(item)"
+                                            class="md-raised md-warn no-margin-top-bottom"
+                                            style="min-height: 35px; line-height: 35px; padding: 0 13px; font-size: 13px;">
+                                            <span style="display: inline-flex; align-items: center; gap: 0px;">
+                                                <md-icon class="tooltip-icon">
+                                                    <i class="mdi mdi-download"></i>
+                                                </md-icon>
+                                                Download
+                                            </span>
+                                        </md-button>
+                                    </td>
                                 </tr>
                             </tbody>
                         </table>