diff --git a/e2e-tests/cypress/tests/fixtures/profile_picture.bmp b/e2e-tests/cypress/tests/fixtures/profile_picture.bmp
new file mode 100644
index 0000000000..6bc68e584e
Binary files /dev/null and b/e2e-tests/cypress/tests/fixtures/profile_picture.bmp differ
diff --git a/e2e-tests/cypress/tests/fixtures/profile_picture.jpeg b/e2e-tests/cypress/tests/fixtures/profile_picture.jpeg
new file mode 100644
index 0000000000..ebb5abf880
Binary files /dev/null and b/e2e-tests/cypress/tests/fixtures/profile_picture.jpeg differ
diff --git a/e2e-tests/cypress/tests/fixtures/profile_picture.jpg b/e2e-tests/cypress/tests/fixtures/profile_picture.jpg
new file mode 100644
index 0000000000..0f594d29cc
Binary files /dev/null and b/e2e-tests/cypress/tests/fixtures/profile_picture.jpg differ
diff --git a/e2e-tests/cypress/tests/fixtures/profile_picture.png b/e2e-tests/cypress/tests/fixtures/profile_picture.png
new file mode 100644
index 0000000000..3e55598499
Binary files /dev/null and b/e2e-tests/cypress/tests/fixtures/profile_picture.png differ
diff --git a/e2e-tests/cypress/tests/integration/channels/profile_settings/profile_settings_spec.js b/e2e-tests/cypress/tests/integration/channels/profile_settings/profile_settings_spec.js
index 8df7c392cd..b8dc510ef6 100644
--- a/e2e-tests/cypress/tests/integration/channels/profile_settings/profile_settings_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/profile_settings/profile_settings_spec.js
@@ -24,7 +24,7 @@ describe('Profile Settings', () => {
     it('MM-T2044 Clear fields, values revert', () => {
         cy.uiOpenProfileModal('Profile Settings');
 
-        // # Click "Edit" to the right of "Full Name"
+        // # Click 'Edit' to the right of 'Full Name'
         cy.get('#nameEdit').should('be.visible').click();
 
         // # Clear the first name
@@ -48,4 +48,61 @@ describe('Profile Settings', () => {
         // # Close the modal
         cy.uiClose();
     });
+
+    const fileTypes = [
+        {
+            extension: 'PNG',
+            fileName: 'profile_picture.png',
+        },
+        {
+            extension: 'JPG',
+            fileName: 'profile_picture.jpg',
+        },
+        {
+            extension: 'JPEG',
+            fileName: 'profile_picture.jpeg',
+        },
+        {
+            extension: 'BMP',
+            fileName: 'profile_picture.bmp',
+        },
+    ];
+
+    fileTypes.forEach((fileType, index) => {
+        it(`MM-T2078_${index + 1} Profile picture: file ${fileType.extension} type accepted`, () => {
+            // # Save the default profile picture link so it can be compared to the new one
+            cy.uiGetProfileHeader().findByRole('img').invoke('attr', 'src').as('defaultProfilePictureLink');
+
+            cy.uiOpenProfileModal('Profile Settings');
+
+            // # Click 'Edit' to the right of the 'Profile Picture'
+            cy.get('#pictureEdit').should('be.visible').click();
+
+            // # Confirm the 'Save' button is blocked when no picture selected
+            cy.findByTestId('saveSettingPicture').should('have.class', 'disabled');
+
+            // # Insert the file profile picture - keep in mind that using the hidden input field is needed
+            cy.findByTestId('uploadPicture').attachFile(fileType.fileName);
+
+            // # Click the 'Save' button after the image is uploaded
+            cy.findByTestId('saveSettingPicture').should('not.have.class', 'disabled').click();
+
+            // # Confirm the user was returned to the Profile modal with the 'Profile Picture' description changed and 'Edit' button visible again
+            cy.get('#pictureDesc').should('include.text', 'Image last updated');
+            cy.get('#pictureEdit').should('be.visible');
+
+            // # Close the modal
+            cy.uiClose();
+
+            // # Save the new custom profile picture link so it can be compared to the old one
+            cy.uiGetProfileHeader().findByRole('img').invoke('attr', 'src').as('customProfilePictureLink');
+
+            cy.then(function() {
+                expect(this.customProfilePictureLink).to.not.equal(this.defaultProfilePictureLink);
+
+                // # This regular expression (/\?_=\d+$/) checks if the string ends with ?_= followed by one or more digits.
+                expect(this.customProfilePictureLink, 'New custom profile picture link should end with "?image_=<digits>"').to.match(/image\?_=\d+$/);
+            });
+        });
+    });
 });