diff --git a/src/UI/Activity/Blacklist/Details/BlacklistDetailsLayoutTemplate.hbs b/src/UI/Activity/Blacklist/Details/BlacklistDetailsLayoutTemplate.hbs
index b62d60341b..3cdfa99c78 100644
--- a/src/UI/Activity/Blacklist/Details/BlacklistDetailsLayoutTemplate.hbs
+++ b/src/UI/Activity/Blacklist/Details/BlacklistDetailsLayoutTemplate.hbs
@@ -12,7 +12,7 @@
 
         </div>
         <div class="modal-footer">
-            <button class="btn" data-dismiss="modal">close</button>
+            <button class="btn" data-dismiss="modal">Close</button>
         </div>
     </div>
 </div>
diff --git a/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs b/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs
index 6a038fd767..892dbfc35c 100644
--- a/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs
+++ b/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs
@@ -15,8 +15,8 @@
 
         </div>
         <div class="modal-footer">
-            {{#if_eq eventType compare="grabbed"}}<button class="btn btn-danger x-mark-as-failed">mark as failed</button>{{/if_eq}}
-            <button class="btn" data-dismiss="modal">close</button>
+            {{#if_eq eventType compare="grabbed"}}<button class="btn btn-danger x-mark-as-failed">Mark As Failed</button>{{/if_eq}}
+            <button class="btn" data-dismiss="modal">Close</button>
         </div>
     </div>
 </div>
diff --git a/src/UI/Activity/Queue/RemoveFromQueueViewTemplate.hbs b/src/UI/Activity/Queue/RemoveFromQueueViewTemplate.hbs
index 34ce64159c..c0834ea69f 100644
--- a/src/UI/Activity/Queue/RemoveFromQueueViewTemplate.hbs
+++ b/src/UI/Activity/Queue/RemoveFromQueueViewTemplate.hbs
@@ -43,7 +43,7 @@
     </div>
     <div class="modal-footer">
         <span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
-        <button class="btn" data-dismiss="modal">cancel</button>
-        <button class="btn btn-danger x-confirm-remove">remove</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button class="btn btn-danger x-confirm-remove">Remove</button>
     </div>
 </div>
diff --git a/src/UI/AddSeries/AddSeriesLayoutTemplate.hbs b/src/UI/AddSeries/AddSeriesLayoutTemplate.hbs
index f11bb6d0de..ab6e5e6c03 100644
--- a/src/UI/AddSeries/AddSeriesLayoutTemplate.hbs
+++ b/src/UI/AddSeries/AddSeriesLayoutTemplate.hbs
@@ -5,7 +5,7 @@
                 <i class="icon-sonarr-hdd"/>
                 Import existing series on disk
             </button>
-            <button class="btn btn-default col-md-2 col-xs-4 x-add-new"><i class="icon-sonarr-active hidden-xs"></i> Add new series</button>
+            <button class="btn btn-default col-md-2 col-xs-4 x-add-new"><i class="icon-sonarr-active hidden-xs"></i> Add New Series</button>
         </div>
     </div>
 </div>
diff --git a/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.hbs b/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.hbs
index f49af58d3e..83cb9535d4 100644
--- a/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.hbs
+++ b/src/UI/AddSeries/RootFolders/RootFolderLayoutTemplate.hbs
@@ -31,6 +31,6 @@
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">close</button>
+        <button class="btn" data-dismiss="modal">Close</button>
     </div>
 </div>
diff --git a/src/UI/Calendar/CalendarFeedViewTemplate.hbs b/src/UI/Calendar/CalendarFeedViewTemplate.hbs
index e1f8f6182f..4e2505ea7e 100644
--- a/src/UI/Calendar/CalendarFeedViewTemplate.hbs
+++ b/src/UI/Calendar/CalendarFeedViewTemplate.hbs
@@ -23,6 +23,6 @@
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">close</button>
+        <button class="btn" data-dismiss="modal">Close</button>
     </div>
 </div>
diff --git a/src/UI/Episode/EpisodeDetailsLayoutTemplate.hbs b/src/UI/Episode/EpisodeDetailsLayoutTemplate.hbs
index 6190946701..d85991279f 100644
--- a/src/UI/Episode/EpisodeDetailsLayoutTemplate.hbs
+++ b/src/UI/Episode/EpisodeDetailsLayoutTemplate.hbs
@@ -29,7 +29,7 @@
                 {{/with}}
             {{/unless}}
 
-            <button class="btn btn-default" data-dismiss="modal">close</button>
+            <button class="btn btn-default" data-dismiss="modal">Close</button>
         </div>
     </div>
 </div>
diff --git a/src/UI/EpisodeFile/Editor/EpisodeFileEditorLayoutTemplate.hbs b/src/UI/EpisodeFile/Editor/EpisodeFileEditorLayoutTemplate.hbs
index aee8fbd261..6f7e84109e 100644
--- a/src/UI/EpisodeFile/Editor/EpisodeFileEditorLayoutTemplate.hbs
+++ b/src/UI/EpisodeFile/Editor/EpisodeFileEditorLayoutTemplate.hbs
@@ -21,8 +21,8 @@
             <div class="x-quality"></div>
         </div>
         <div class="modal-footer">
-            <button class="btn btn-danger x-delete-files">delete files</button>
-            <button class="btn btn-default" data-dismiss="modal">close</button>
+            <button class="btn btn-danger x-delete-files">Delete Files</button>
+            <button class="btn btn-default" data-dismiss="modal">Close</button>
         </div>
     </div>
 </div>
diff --git a/src/UI/Hotkeys/HotkeysViewTemplate.hbs b/src/UI/Hotkeys/HotkeysViewTemplate.hbs
index 0ae6566e3a..bce6e86c80 100644
--- a/src/UI/Hotkeys/HotkeysViewTemplate.hbs
+++ b/src/UI/Hotkeys/HotkeysViewTemplate.hbs
@@ -40,6 +40,6 @@
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">close</button>
+        <button class="btn" data-dismiss="modal">Close</button>
     </div>
 </div>
diff --git a/src/UI/ManualImport/Episode/SelectEpisodeLayoutTemplate.hbs b/src/UI/ManualImport/Episode/SelectEpisodeLayoutTemplate.hbs
index 9a7192882b..68a9af81ab 100644
--- a/src/UI/ManualImport/Episode/SelectEpisodeLayoutTemplate.hbs
+++ b/src/UI/ManualImport/Episode/SelectEpisodeLayoutTemplate.hbs
@@ -14,8 +14,8 @@
             </div>
         </div>
         <div class="modal-footer">
-            <button class="btn btn-default" data-dismiss="modal">cancel</button>
-            <button class="btn btn-success x-select" data-dismiss="modal">select episodes</button>
+            <button class="btn btn-default" data-dismiss="modal">Cancel</button>
+            <button class="btn btn-success x-select" data-dismiss="modal">Select Episodes</button>
         </div>
     </div>
 </div>
diff --git a/src/UI/ManualImport/ManualImportLayoutTemplate.hbs b/src/UI/ManualImport/ManualImportLayoutTemplate.hbs
index aa2ea65244..9fefa2eb81 100644
--- a/src/UI/ManualImport/ManualImportLayoutTemplate.hbs
+++ b/src/UI/ManualImport/ManualImportLayoutTemplate.hbs
@@ -13,8 +13,8 @@
             <div class="x-footer"></div>
         </div>
         <div class="modal-footer">
-            <button class="btn btn-default" data-dismiss="modal">cancel</button>
-            <button class="btn btn-success x-import" disabled="disabled">import</button>
+            <button class="btn btn-default" data-dismiss="modal">Cancel</button>
+            <button class="btn btn-success x-import" disabled="disabled">Import</button>
         </div>
     </div>
 </div>
diff --git a/src/UI/ManualImport/Quality/SelectQualityLayoutTemplate.hbs b/src/UI/ManualImport/Quality/SelectQualityLayoutTemplate.hbs
index f32dc7114a..d5d2098e6d 100644
--- a/src/UI/ManualImport/Quality/SelectQualityLayoutTemplate.hbs
+++ b/src/UI/ManualImport/Quality/SelectQualityLayoutTemplate.hbs
@@ -12,8 +12,8 @@
             <div class="x-quality"></div>
         </div>
         <div class="modal-footer">
-            <button class="btn btn-default" data-dismiss="modal">cancel</button>
-            <button class="btn btn-success x-select" data-dismiss="modal">select quality</button>
+            <button class="btn btn-default" data-dismiss="modal">Cancel</button>
+            <button class="btn btn-success x-select" data-dismiss="modal">Select Quality</button>
         </div>
     </div>
 </div>
diff --git a/src/UI/ManualImport/Season/SelectSeasonLayoutTemplate.hbs b/src/UI/ManualImport/Season/SelectSeasonLayoutTemplate.hbs
index da26506a53..b459c6bf57 100644
--- a/src/UI/ManualImport/Season/SelectSeasonLayoutTemplate.hbs
+++ b/src/UI/ManualImport/Season/SelectSeasonLayoutTemplate.hbs
@@ -21,7 +21,7 @@
             </div>
         </div>
         <div class="modal-footer">
-            <button class="btn btn-default" data-dismiss="modal">cancel</button>
+            <button class="btn btn-default" data-dismiss="modal">Cancel</button>
         </div>
     </div>
 </div>
diff --git a/src/UI/ManualImport/Series/SelectSeriesLayoutTemplate.hbs b/src/UI/ManualImport/Series/SelectSeriesLayoutTemplate.hbs
index 826ebd2f27..0db951d99a 100644
--- a/src/UI/ManualImport/Series/SelectSeriesLayoutTemplate.hbs
+++ b/src/UI/ManualImport/Series/SelectSeriesLayoutTemplate.hbs
@@ -22,7 +22,7 @@
             </div>
         </div>
         <div class="modal-footer">
-            <button class="btn btn-default" data-dismiss="modal">cancel</button>
+            <button class="btn btn-default" data-dismiss="modal">Cancel</button>
         </div>
     </div>
 </div>
diff --git a/src/UI/Rename/RenamePreviewLayoutTemplate.hbs b/src/UI/Rename/RenamePreviewLayoutTemplate.hbs
index e928e65505..a3aa41d519 100644
--- a/src/UI/Rename/RenamePreviewLayoutTemplate.hbs
+++ b/src/UI/Rename/RenamePreviewLayoutTemplate.hbs
@@ -27,7 +27,7 @@
                 </label>
             </span>
 
-            <button class="btn" data-dismiss="modal">close</button>
+            <button class="btn" data-dismiss="modal">Close</button>
             <button class="btn btn-primary x-organize">Organize</button>
         </div>
     </div>
diff --git a/src/UI/Series/Delete/DeleteSeriesTemplate.hbs b/src/UI/Series/Delete/DeleteSeriesTemplate.hbs
index 3e61a63cd1..7ff12ad0ba 100644
--- a/src/UI/Series/Delete/DeleteSeriesTemplate.hbs
+++ b/src/UI/Series/Delete/DeleteSeriesTemplate.hbs
@@ -44,7 +44,7 @@
     </div>
     <div class="modal-footer">
         <span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
-        <button class="btn" data-dismiss="modal">cancel</button>
-        <button class="btn btn-danger x-confirm-delete">delete</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button class="btn btn-danger x-confirm-delete">Delete</button>
     </div>
 </div>
diff --git a/src/UI/Series/Edit/EditSeriesViewTemplate.hbs b/src/UI/Series/Edit/EditSeriesViewTemplate.hbs
index c57f4f92c8..746504cc9d 100644
--- a/src/UI/Series/Edit/EditSeriesViewTemplate.hbs
+++ b/src/UI/Series/Edit/EditSeriesViewTemplate.hbs
@@ -95,10 +95,10 @@
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn btn-danger pull-left x-remove">delete</button>
+        <button class="btn btn-danger pull-left x-remove">Delete</button>
 
         <span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
-        <button class="btn" data-dismiss="modal">cancel</button>
-        <button class="btn btn-primary x-save">save</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button class="btn btn-primary x-save">Save</button>
     </div>
 </div>
diff --git a/src/UI/Series/Editor/Organize/OrganizeFilesViewTemplate.hbs b/src/UI/Series/Editor/Organize/OrganizeFilesViewTemplate.hbs
index 44cf05a9d7..68d2f58e37 100644
--- a/src/UI/Series/Editor/Organize/OrganizeFilesViewTemplate.hbs
+++ b/src/UI/Series/Editor/Organize/OrganizeFilesViewTemplate.hbs
@@ -19,7 +19,7 @@
         </ul>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">cancel</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
         <button class="btn btn-danger x-confirm-organize">organize</button>
     </div>
 </div>
diff --git a/src/UI/Settings/DownloadClient/Add/DownloadClientAddCollectionViewTemplate.hbs b/src/UI/Settings/DownloadClient/Add/DownloadClientAddCollectionViewTemplate.hbs
index 16e74dbea0..f3a823f4ad 100644
--- a/src/UI/Settings/DownloadClient/Add/DownloadClientAddCollectionViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/Add/DownloadClientAddCollectionViewTemplate.hbs
@@ -9,6 +9,6 @@
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">close</button>
+        <button class="btn" data-dismiss="modal">Close</button>
     </div>
 </div>
diff --git a/src/UI/Settings/DownloadClient/Delete/DownloadClientDeleteViewTemplate.hbs b/src/UI/Settings/DownloadClient/Delete/DownloadClientDeleteViewTemplate.hbs
index b1af0328d1..f317292799 100644
--- a/src/UI/Settings/DownloadClient/Delete/DownloadClientDeleteViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/Delete/DownloadClientDeleteViewTemplate.hbs
@@ -7,7 +7,7 @@
         <p>Are you sure you want to delete '{{name}}'?</p>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">cancel</button>
-        <button class="btn btn-danger x-confirm-delete">delete</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button class="btn btn-danger x-confirm-delete">Delete</button>
     </div>
 </div>
diff --git a/src/UI/Settings/DownloadClient/Edit/DownloadClientEditViewTemplate.hbs b/src/UI/Settings/DownloadClient/Edit/DownloadClientEditViewTemplate.hbs
index fc9582201c..8356f0f9a3 100644
--- a/src/UI/Settings/DownloadClient/Edit/DownloadClientEditViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/Edit/DownloadClientEditViewTemplate.hbs
@@ -42,17 +42,17 @@
     </div>
     <div class="modal-footer">
         {{#if id}}
-            <button class="btn btn-danger pull-left x-delete">delete</button>
+            <button class="btn btn-danger pull-left x-delete">Delete</button>
         {{else}}
-            <button class="btn pull-left x-back">back</button>
+            <button class="btn pull-left x-back">Back</button>
         {{/if}}
 
         <span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
         <button class="btn x-test">test <i class="x-test-icon icon-sonarr-test"/></button>
-        <button class="btn" data-dismiss="modal">cancel</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
 
         <div class="btn-group">
-            <button class="btn btn-primary x-save">save</button>
+            <button class="btn btn-primary x-save">Save</button>
             <button class="btn btn-icon-only btn-primary dropdown-toggle" data-toggle="dropdown">
                 <span class="caret"></span>
             </button>
diff --git a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingDeleteViewTemplate.hbs b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingDeleteViewTemplate.hbs
index 0a20b26b77..10d94278a4 100644
--- a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingDeleteViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingDeleteViewTemplate.hbs
@@ -7,7 +7,7 @@
         <p>Are you sure you want to delete the mapping for '{{localPath}}'?</p>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">cancel</button>
-        <button class="btn btn-danger x-confirm-delete">delete</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button class="btn btn-danger x-confirm-delete">Delete</button>
     </div>
 </div>
diff --git a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingEditViewTemplate.hbs b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingEditViewTemplate.hbs
index 6d1a6b715e..bc79264394 100644
--- a/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingEditViewTemplate.hbs
+++ b/src/UI/Settings/DownloadClient/RemotePathMapping/RemotePathMappingEditViewTemplate.hbs
@@ -51,13 +51,13 @@
     </div>
     <div class="modal-footer">
         {{#if id}}
-            <button class="btn btn-danger pull-left x-delete">delete</button>
+            <button class="btn btn-danger pull-left x-delete">Delete</button>
         {{/if}}
 
-        <button class="btn" data-dismiss="modal">cancel</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
 
         <div class="btn-group">
-            <button class="btn btn-primary x-save">save</button>
+            <button class="btn btn-primary x-save">Save</button>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/UI/Settings/Indexers/Add/IndexerAddCollectionViewTemplate.hbs b/src/UI/Settings/Indexers/Add/IndexerAddCollectionViewTemplate.hbs
index ad246382c5..34d8922dae 100644
--- a/src/UI/Settings/Indexers/Add/IndexerAddCollectionViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Add/IndexerAddCollectionViewTemplate.hbs
@@ -13,6 +13,6 @@
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">close</button>
+        <button class="btn" data-dismiss="modal">Close</button>
     </div>
 </div>
diff --git a/src/UI/Settings/Indexers/Delete/IndexerDeleteViewTemplate.hbs b/src/UI/Settings/Indexers/Delete/IndexerDeleteViewTemplate.hbs
index 52ec3589fa..c5c7ad7db9 100644
--- a/src/UI/Settings/Indexers/Delete/IndexerDeleteViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Delete/IndexerDeleteViewTemplate.hbs
@@ -7,7 +7,7 @@
         <p>Are you sure you want to delete '{{name}}'?</p>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">cancel</button>
-        <button class="btn btn-danger x-confirm-delete">delete</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button class="btn btn-danger x-confirm-delete">Delete</button>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/UI/Settings/Indexers/Edit/IndexerEditViewTemplate.hbs b/src/UI/Settings/Indexers/Edit/IndexerEditViewTemplate.hbs
index 8405d400e9..bdafb4ac11 100644
--- a/src/UI/Settings/Indexers/Edit/IndexerEditViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Edit/IndexerEditViewTemplate.hbs
@@ -69,16 +69,16 @@
     </div>
     <div class="modal-footer">
         {{#if id}}
-            <button class="btn btn-danger pull-left x-delete">delete</button>
+            <button class="btn btn-danger pull-left x-delete">Delete</button>
         {{else}}
-            <button class="btn pull-left x-back">back</button>
+            <button class="btn pull-left x-back">Back</button>
         {{/if}}
         <span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
         <button class="btn x-test">test <i class="x-test-icon icon-sonarr-test"/></button>
-        <button class="btn" data-dismiss="modal">cancel</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
 
         <div class="btn-group">
-            <button class="btn btn-primary x-save">save</button>
+            <button class="btn btn-primary x-save">Save</button>
             <button class="btn btn-icon-only btn-primary dropdown-toggle" data-toggle="dropdown">
                 <span class="caret"></span>
             </button>
diff --git a/src/UI/Settings/Indexers/Restriction/RestrictionDeleteViewTemplate.hbs b/src/UI/Settings/Indexers/Restriction/RestrictionDeleteViewTemplate.hbs
index 6d0d28457b..b9431185e2 100644
--- a/src/UI/Settings/Indexers/Restriction/RestrictionDeleteViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Restriction/RestrictionDeleteViewTemplate.hbs
@@ -7,7 +7,7 @@
         <p>Are you sure you want to delete the restriction for '{{localPath}}'?</p>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">cancel</button>
-        <button class="btn btn-danger x-confirm-delete">delete</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button class="btn btn-danger x-confirm-delete">Delete</button>
     </div>
 </div>
diff --git a/src/UI/Settings/Indexers/Restriction/RestrictionEditViewTemplate.hbs b/src/UI/Settings/Indexers/Restriction/RestrictionEditViewTemplate.hbs
index ff2b94dd9b..1d57dd725c 100644
--- a/src/UI/Settings/Indexers/Restriction/RestrictionEditViewTemplate.hbs
+++ b/src/UI/Settings/Indexers/Restriction/RestrictionEditViewTemplate.hbs
@@ -48,13 +48,13 @@
     </div>
     <div class="modal-footer">
         {{#if id}}
-            <button class="btn btn-danger pull-left x-delete">delete</button>
+            <button class="btn btn-danger pull-left x-delete">Delete</button>
         {{/if}}
 
-        <button class="btn" data-dismiss="modal">cancel</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
 
         <div class="btn-group">
-            <button class="btn btn-primary x-save">save</button>
+            <button class="btn btn-primary x-save">Save</button>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/UI/Settings/Metadata/MetadataEditViewTemplate.hbs b/src/UI/Settings/Metadata/MetadataEditViewTemplate.hbs
index 7c91f3d184..207bc4518e 100644
--- a/src/UI/Settings/Metadata/MetadataEditViewTemplate.hbs
+++ b/src/UI/Settings/Metadata/MetadataEditViewTemplate.hbs
@@ -39,7 +39,7 @@
     <div class="modal-footer">
         <span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
 
-        <button class="btn" data-dismiss="modal">cancel</button>
-        <button class="btn btn-primary x-save">save</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button class="btn btn-primary x-save">Save</button>
     </div>
 </div>
diff --git a/src/UI/Settings/Notifications/Add/NotificationAddCollectionViewTemplate.hbs b/src/UI/Settings/Notifications/Add/NotificationAddCollectionViewTemplate.hbs
index 791e6ac95a..0075fa5041 100644
--- a/src/UI/Settings/Notifications/Add/NotificationAddCollectionViewTemplate.hbs
+++ b/src/UI/Settings/Notifications/Add/NotificationAddCollectionViewTemplate.hbs
@@ -9,6 +9,6 @@
         </div>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">close</button>
+        <button class="btn" data-dismiss="modal">Close</button>
     </div>
 </div>
diff --git a/src/UI/Settings/Notifications/Delete/NotificationDeleteViewTemplate.hbs b/src/UI/Settings/Notifications/Delete/NotificationDeleteViewTemplate.hbs
index 304b12767e..1e6a52b73f 100644
--- a/src/UI/Settings/Notifications/Delete/NotificationDeleteViewTemplate.hbs
+++ b/src/UI/Settings/Notifications/Delete/NotificationDeleteViewTemplate.hbs
@@ -7,7 +7,7 @@
         <p>Are you sure you want to delete '{{name}}'?</p>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">cancel</button>
-        <button class="btn btn-danger x-confirm-delete">delete</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button class="btn btn-danger x-confirm-delete">Delete</button>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.hbs b/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.hbs
index 382045b32c..71b80558f4 100644
--- a/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.hbs
+++ b/src/UI/Settings/Notifications/Edit/NotificationEditViewTemplate.hbs
@@ -102,17 +102,17 @@
     </div>
     <div class="modal-footer">
         {{#if id}}
-            <button class="btn btn-danger pull-left x-delete">delete</button>
+            <button class="btn btn-danger pull-left x-delete">Delete</button>
         {{else}}
-            <button class="btn pull-left x-back">back</button>
+            <button class="btn pull-left x-back">Back</button>
         {{/if}}
 
         <span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
         <button class="btn x-test">test <i class="x-test-icon icon-sonarr-test"/></button>
-        <button class="btn" data-dismiss="modal">cancel</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
 
         <div class="btn-group">
-            <button class="btn btn-primary x-save">save</button>
+            <button class="btn btn-primary x-save">Save</button>
             <button class="btn btn-icon-only btn-primary dropdown-toggle" data-toggle="dropdown">
                 <span class="caret"></span>
             </button>
diff --git a/src/UI/Settings/Profile/Delay/Delete/DelayProfileDeleteViewTemplate.hbs b/src/UI/Settings/Profile/Delay/Delete/DelayProfileDeleteViewTemplate.hbs
index 924d30d8f5..dc6b5125f7 100644
--- a/src/UI/Settings/Profile/Delay/Delete/DelayProfileDeleteViewTemplate.hbs
+++ b/src/UI/Settings/Profile/Delay/Delete/DelayProfileDeleteViewTemplate.hbs
@@ -7,7 +7,7 @@
         <p>Are you sure you want to delete this delay profile?</p>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">cancel</button>
-        <button class="btn btn-danger x-confirm-delete">delete</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button class="btn btn-danger x-confirm-delete">Delete</button>
     </div>
 </div>
diff --git a/src/UI/Settings/Profile/Delay/Edit/DelayProfileEditViewTemplate.hbs b/src/UI/Settings/Profile/Delay/Edit/DelayProfileEditViewTemplate.hbs
index 969061e7f1..5ff9c3beaa 100644
--- a/src/UI/Settings/Profile/Delay/Edit/DelayProfileEditViewTemplate.hbs
+++ b/src/UI/Settings/Profile/Delay/Edit/DelayProfileEditViewTemplate.hbs
@@ -70,11 +70,11 @@
     <div class="modal-footer">
         {{#if id}}
             {{#if_gt id compare="1"}}
-                <button class="btn btn-danger pull-left x-delete">delete</button>
+                <button class="btn btn-danger pull-left x-delete">Delete</button>
             {{/if_gt}}
         {{/if}}
         <span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
-        <button class="btn" data-dismiss="modal">cancel</button>
-        <button class="btn btn-primary x-save">save</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button class="btn btn-primary x-save">Save</button>
     </div>
 </div>
diff --git a/src/UI/Settings/Profile/DeleteProfileViewTemplate.hbs b/src/UI/Settings/Profile/DeleteProfileViewTemplate.hbs
index 8212de9638..c9a8268552 100644
--- a/src/UI/Settings/Profile/DeleteProfileViewTemplate.hbs
+++ b/src/UI/Settings/Profile/DeleteProfileViewTemplate.hbs
@@ -7,7 +7,7 @@
         <p>Are you sure you want to delete '{{name}}'?</p>
     </div>
     <div class="modal-footer">
-        <button class="btn" data-dismiss="modal">cancel</button>
-        <button class="btn btn-danger x-confirm-delete">delete</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button class="btn btn-danger x-confirm-delete">Delete</button>
     </div>
 </div>
diff --git a/src/UI/Settings/Profile/Edit/EditProfileLayoutTemplate.hbs b/src/UI/Settings/Profile/Edit/EditProfileLayoutTemplate.hbs
index 13bba5619d..19ea12f770 100644
--- a/src/UI/Settings/Profile/Edit/EditProfileLayoutTemplate.hbs
+++ b/src/UI/Settings/Profile/Edit/EditProfileLayoutTemplate.hbs
@@ -27,10 +27,10 @@
     </div>
     <div class="modal-footer">
         {{#if id}}
-        <button class="btn btn-danger pull-left x-delete">delete</button>
+        <button class="btn btn-danger pull-left x-delete">Delete</button>
         {{/if}}
         <span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
-        <button class="btn" data-dismiss="modal">cancel</button>
-        <button class="btn btn-primary x-save">save</button>
+        <button class="btn" data-dismiss="modal">Cancel</button>
+        <button class="btn btn-primary x-save">Save</button>
     </div>
 </div>
diff --git a/src/UI/Shared/FileBrowser/FileBrowserLayoutTemplate.hbs b/src/UI/Shared/FileBrowser/FileBrowserLayoutTemplate.hbs
index 2d1a4ea0cd..ca5812b4ed 100644
--- a/src/UI/Shared/FileBrowser/FileBrowserLayoutTemplate.hbs
+++ b/src/UI/Shared/FileBrowser/FileBrowserLayoutTemplate.hbs
@@ -20,7 +20,7 @@
     </div>
     <div class="modal-footer">
         <span class="indicator x-indicator"><i class="icon-sonarr-spinner fa-spin"></i></span>
-        <button class="btn" data-dismiss="modal">close</button>
-        <button class="btn btn-primary x-ok">ok</button>
+        <button class="btn" data-dismiss="modal">Close</button>
+        <button class="btn btn-primary x-ok">Ok</button>
     </div>
 </div>
diff --git a/src/UI/System/Logs/Table/Details/LogDetailsViewTemplate.hbs b/src/UI/System/Logs/Table/Details/LogDetailsViewTemplate.hbs
index d511a95172..80a8f7d267 100644
--- a/src/UI/System/Logs/Table/Details/LogDetailsViewTemplate.hbs
+++ b/src/UI/System/Logs/Table/Details/LogDetailsViewTemplate.hbs
@@ -17,7 +17,7 @@
             {{/if}}
         </div>
         <div class="modal-footer">
-            <button class="btn" data-dismiss="modal">close</button>
+            <button class="btn" data-dismiss="modal">Close</button>
         </div>
     </div>
 </div>