diff --git a/client/components/cards/attachments.jade b/client/components/cards/attachments.jade
index f1cc796fc..4b45a8b59 100644
--- a/client/components/cards/attachments.jade
+++ b/client/components/cards/attachments.jade
@@ -102,6 +102,12 @@ template(name="attachmentActionsPopup")
               i.fa.fa-arrow-right
               | {{_ 'attachment-move-storage-gridfs'}}
 
+        if $neq versions.original.storage "s3"
+          if versions.original.storage
+            a.js-move-storage-s3
+              i.fa.fa-arrow-right
+              | {{_ 'attachment-move-storage-s3'}}
+
 template(name="attachmentRenamePopup")
   input.js-edit-attachment-name(type='text' autofocus value="{{getNameWithoutExtension}}" dir="auto")
   .edit-controls.clearfix
diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js
index fb2306f05..76775d776 100644
--- a/client/components/cards/attachments.js
+++ b/client/components/cards/attachments.js
@@ -191,6 +191,10 @@ BlazeComponent.extendComponent({
           Meteor.call('moveAttachmentToStorage', this.data()._id, "gridfs");
           Popup.back();
         },
+        'click .js-move-storage-s3'() {
+          Meteor.call('moveAttachmentToStorage', this.data()._id, "s3");
+          Popup.back();
+        },
       }
     ]
   }
diff --git a/client/components/settings/attachments.jade b/client/components/settings/attachments.jade
index 11670a1b3..efaa12136 100644
--- a/client/components/settings/attachments.jade
+++ b/client/components/settings/attachments.jade
@@ -23,6 +23,8 @@ template(name="moveAttachments")
       button.js-move-all-attachments-to-fs {{_ 'move-all-attachments-to-fs'}}
     .js-move-attachment
       button.js-move-all-attachments-to-gridfs {{_ 'move-all-attachments-to-gridfs'}}
+    .js-move-attachment
+      button.js-move-all-attachments-to-s3 {{_ 'move-all-attachments-to-s3'}}
 
   each board in getBoardsWithAttachments
     +moveBoardAttachments board
@@ -43,6 +45,8 @@ template(name="moveBoardAttachments")
       button.js-move-all-attachments-of-board-to-fs {{_ 'move-all-attachments-of-board-to-fs'}}
     .js-move-attachment
       button.js-move-all-attachments-of-board-to-gridfs {{_ 'move-all-attachments-of-board-to-gridfs'}}
+    .js-move-attachment
+      button.js-move-all-attachments-of-board-to-s3 {{_ 'move-all-attachments-of-board-to-s3'}}
 
   .board-attachments
     table
@@ -70,6 +74,7 @@ template(name="moveAttachment")
       td {{ version.versionName }}
       td {{ fileSize version.size }}
       td {{ version.meta.gridFsFileId }}
+      td {{ version.meta.s3FileId }}
       td {{ version.storageName }}
       td
         if $neq version.storageName "fs"
@@ -82,3 +87,9 @@ template(name="moveAttachment")
             button.js-move-storage-gridfs
               i.fa.fa-arrow-right
               | {{_ 'attachment-move-storage-gridfs'}}
+
+        if $neq version.storageName "s3"
+          if version.storageName
+            button.js-move-storage-s3
+              i.fa.fa-arrow-right
+              | {{_ 'attachment-move-storage-s3'}}
diff --git a/client/components/settings/attachments.js b/client/components/settings/attachments.js
index 64949a6be..1d72342e2 100644
--- a/client/components/settings/attachments.js
+++ b/client/components/settings/attachments.js
@@ -84,6 +84,11 @@ BlazeComponent.extendComponent({
             Meteor.call('moveAttachmentToStorage', _attachment._id, "gridfs");
           });
         },
+        'click button.js-move-all-attachments-to-s3'(event) {
+          this.attachments.forEach(_attachment => {
+            Meteor.call('moveAttachmentToStorage', _attachment._id, "s3");
+          });
+        },
       }
     ]
   }
@@ -103,6 +108,11 @@ BlazeComponent.extendComponent({
             Meteor.call('moveAttachmentToStorage', _attachment._id, "gridfs");
           });
         },
+        'click button.js-move-all-attachments-of-board-to-s3'(event) {
+          this.data().attachments.forEach(_attachment => {
+            Meteor.call('moveAttachmentToStorage', _attachment._id, "s3");
+          });
+        },
       }
     ]
   },
@@ -122,6 +132,9 @@ BlazeComponent.extendComponent({
         'click button.js-move-storage-gridfs'(event) {
           Meteor.call('moveAttachmentToStorage', this.data()._id, "gridfs");
         },
+        'click button.js-move-storage-s3'(event) {
+          Meteor.call('moveAttachmentToStorage', this.data()._id, "s3");
+        },
       }
     ]
   },
diff --git a/imports/i18n/data/en.i18n.json b/imports/i18n/data/en.i18n.json
index b165a2035..0d626b51b 100644
--- a/imports/i18n/data/en.i18n.json
+++ b/imports/i18n/data/en.i18n.json
@@ -1177,11 +1177,14 @@
   "attachmentActionsPopup-title": "Attachment Actions",
   "attachment-move-storage-fs": "Move attachment to filesystem",
   "attachment-move-storage-gridfs": "Move attachment to GridFS",
+  "attachment-move-storage-s3": "Move attachment to S3",
   "attachment-move": "Move Attachment",
   "move-all-attachments-to-fs": "Move all attachments to filesystem",
   "move-all-attachments-to-gridfs": "Move all attachments to GridFS",
+  "move-all-attachments-to-s3": "Move all attachments to S3",
   "move-all-attachments-of-board-to-fs": "Move all attachments of board to filesystem",
   "move-all-attachments-of-board-to-gridfs": "Move all attachments of board to GridFS",
+  "move-all-attachments-of-board-to-s3": "Move all attachments of board to S3",
   "path": "Path",
   "version-name": "Version-Name",
   "size": "Size",