diff --git a/web/static/images/themes/mattermost dark.jpg b/web/static/images/themes/mattermost dark.jpg
deleted file mode 100644
index ea70e701df..0000000000
Binary files a/web/static/images/themes/mattermost dark.jpg and /dev/null differ
diff --git a/web/static/images/themes/mattermost dark.png b/web/static/images/themes/mattermost dark.png
new file mode 100644
index 0000000000..1ab44e104e
Binary files /dev/null and b/web/static/images/themes/mattermost dark.png differ
diff --git a/web/static/images/themes/mattermost.jpg b/web/static/images/themes/mattermost.jpg
deleted file mode 100644
index eb36786a6f..0000000000
Binary files a/web/static/images/themes/mattermost.jpg and /dev/null differ
diff --git a/web/static/images/themes/mattermost.png b/web/static/images/themes/mattermost.png
new file mode 100644
index 0000000000..8dea37ff69
Binary files /dev/null and b/web/static/images/themes/mattermost.png differ
diff --git a/web/static/images/themes/organization.jpg b/web/static/images/themes/organization.jpg
deleted file mode 100644
index 5a5c10bd30..0000000000
Binary files a/web/static/images/themes/organization.jpg and /dev/null differ
diff --git a/web/static/images/themes/organization.png b/web/static/images/themes/organization.png
new file mode 100644
index 0000000000..3066cca0b6
Binary files /dev/null and b/web/static/images/themes/organization.png differ
diff --git a/web/static/images/themes/windows dark.jpg b/web/static/images/themes/windows dark.jpg
deleted file mode 100644
index 0ab19c0217..0000000000
Binary files a/web/static/images/themes/windows dark.jpg and /dev/null differ
diff --git a/web/static/images/themes/windows dark.png b/web/static/images/themes/windows dark.png
new file mode 100644
index 0000000000..1f665d8821
Binary files /dev/null and b/web/static/images/themes/windows dark.png differ