diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index a3acae8ef9d5dd33b4cd04130ca3c1a5e521b7e2..1f856b8083fde5a6ff175bc4f4609c04e7b9cdfd 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -835,16 +835,11 @@ Medien-Größe: %2
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+11"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>dialogs::ReceiptItem</name>
     <message>
-        <location line="-55"/>
+        <location line="-44"/>
         <source>Today %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -952,12 +947,7 @@ Medien-Größe: %2
         </translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+140"/>
         <source>Failed to enable encryption: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -973,12 +963,12 @@ Medien-Größe: %2
     </message>
     <message>
         <location line="+12"/>
-        <source>The selected media is not an image</source>
+        <source>The selected file is not an image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Error while reading media: %1</source>
+        <source>Error while reading file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1015,11 +1005,6 @@ Medien-Größe: %2
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+39"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>emoji::Panel</name>
diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts
index 462f523eb559652848e9bcaa0d994d144eeb6015..e50aadad771c8fd38fd471ff0f0f07c9b8e89923 100644
--- a/resources/langs/nheko_el.ts
+++ b/resources/langs/nheko_el.ts
@@ -833,16 +833,11 @@ Media size: %2
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+11"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>dialogs::ReceiptItem</name>
     <message>
-        <location line="-55"/>
+        <location line="-44"/>
         <source>Today %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -950,12 +945,7 @@ Media size: %2
         </translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+140"/>
         <source>Failed to enable encryption: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -971,12 +961,12 @@ Media size: %2
     </message>
     <message>
         <location line="+12"/>
-        <source>The selected media is not an image</source>
+        <source>The selected file is not an image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Error while reading media: %1</source>
+        <source>Error while reading file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1013,11 +1003,6 @@ Media size: %2
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+39"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>emoji::Panel</name>
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index afd4c815e969dd5423b2432dc67995efa07d0975..e031c4ec05107131d43c4937209c7017df86f6fc 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -833,16 +833,11 @@ Media size: %2
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+11"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>dialogs::ReceiptItem</name>
     <message>
-        <location line="-55"/>
+        <location line="-44"/>
         <source>Today %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -950,12 +945,7 @@ Media size: %2
         </translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+140"/>
         <source>Failed to enable encryption: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -971,12 +961,12 @@ Media size: %2
     </message>
     <message>
         <location line="+12"/>
-        <source>The selected media is not an image</source>
+        <source>The selected file is not an image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Error while reading media: %1</source>
+        <source>Error while reading file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1013,11 +1003,6 @@ Media size: %2
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+39"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>emoji::Panel</name>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index 789a4ebd976dbe1e75cf04551e27fb62ff0aacf3..2baba55db49bbf16a1fe3d28ac7dd71ef6e02e06 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -833,16 +833,11 @@ Media size: %2
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+11"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>dialogs::ReceiptItem</name>
     <message>
-        <location line="-55"/>
+        <location line="-44"/>
         <source>Today %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -950,12 +945,7 @@ Media size: %2
         </translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+140"/>
         <source>Failed to enable encryption: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -971,12 +961,12 @@ Media size: %2
     </message>
     <message>
         <location line="+12"/>
-        <source>The selected media is not an image</source>
+        <source>The selected file is not an image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Error while reading media: %1</source>
+        <source>Error while reading file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1013,11 +1003,6 @@ Media size: %2
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+39"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>emoji::Panel</name>
diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts
index b8c0d6d92b4b5105b00452ce79df23fa9b7e2738..355c432599d278fb766f281d0b83451a4235e4f7 100644
--- a/resources/langs/nheko_fr.ts
+++ b/resources/langs/nheko_fr.ts
@@ -836,16 +836,11 @@ Taille du média : %2
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+11"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>dialogs::ReceiptItem</name>
     <message>
-        <location line="-55"/>
+        <location line="-44"/>
         <source>Today %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -953,12 +948,7 @@ Taille du média : %2
         </translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+140"/>
         <source>Failed to enable encryption: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -974,12 +964,12 @@ Taille du média : %2
     </message>
     <message>
         <location line="+12"/>
-        <source>The selected media is not an image</source>
+        <source>The selected file is not an image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Error while reading media: %1</source>
+        <source>Error while reading file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1016,11 +1006,6 @@ Taille du média : %2
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+39"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>emoji::Panel</name>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index b1be0135ebd040660925fcc10a7cc7100a878969..db56dc0fb9734601b4b303b7341826434f5e7a8c 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -835,16 +835,11 @@ Mediagrootte: %2
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+11"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>dialogs::ReceiptItem</name>
     <message>
-        <location line="-55"/>
+        <location line="-44"/>
         <source>Today %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -952,12 +947,7 @@ Mediagrootte: %2
         </translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+140"/>
         <source>Failed to enable encryption: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -973,12 +963,12 @@ Mediagrootte: %2
     </message>
     <message>
         <location line="+12"/>
-        <source>The selected media is not an image</source>
+        <source>The selected file is not an image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Error while reading media: %1</source>
+        <source>Error while reading file: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1015,11 +1005,6 @@ Mediagrootte: %2
         <source>Devices</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+39"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>emoji::Panel</name>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index 2f7c903c5bac71d1d51deeeb5a717277ccaee1e7..34a4ed264291f23112dfc52aed90f258020f47c2 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -835,16 +835,11 @@ Rozmiar multimediów: %2
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+11"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>dialogs::ReceiptItem</name>
     <message>
-        <location line="-55"/>
+        <location line="-44"/>
         <source>Today %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -955,12 +950,7 @@ Rozmiar multimediów: %2
         </translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+140"/>
         <source>Failed to enable encryption: %1</source>
         <translation>Nie udało się włączyć szyfrowania: %1</translation>
     </message>
@@ -976,13 +966,13 @@ Rozmiar multimediów: %2
     </message>
     <message>
         <location line="+12"/>
-        <source>The selected media is not an image</source>
-        <translation>Wybrany plik multimedialny nie jest obrazem</translation>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Error while reading media: %1</source>
-        <translation>BÅ‚Ä…d odczytywania pliku: %1</translation>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
@@ -1018,11 +1008,6 @@ Rozmiar multimediów: %2
         <source>Devices</source>
         <translation>UrzÄ…dzenia</translation>
     </message>
-    <message>
-        <location line="+39"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>emoji::Panel</name>
diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts
index 097067dbc89bf61f7b6c8724664b571377a42f71..afe36ef94a0024c99ef0df32a0aadcb055934a66 100644
--- a/resources/langs/nheko_ru.ts
+++ b/resources/langs/nheko_ru.ts
@@ -836,16 +836,11 @@ Media size: %2
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
-    <message>
-        <location line="+11"/>
-        <source>ESC</source>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>dialogs::ReceiptItem</name>
     <message>
-        <location line="-55"/>
+        <location line="-44"/>
         <source>Today %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -954,12 +949,7 @@ Media size: %2
         </translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>ESC</source>
-        <translation></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+140"/>
         <source>Failed to enable encryption: %1</source>
         <translation>Не удалось включить шифрование: %1</translation>
     </message>
@@ -975,13 +965,13 @@ Media size: %2
     </message>
     <message>
         <location line="+12"/>
-        <source>The selected media is not an image</source>
-        <translation>Выбранное медия не является изображением</translation>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Error while reading media: %1</source>
-        <translation>Ошибка при чтении медия: %1</translation>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
@@ -1017,11 +1007,6 @@ Media size: %2
         <source>Devices</source>
         <translation>Устройства</translation>
     </message>
-    <message>
-        <location line="+39"/>
-        <source>ESC</source>
-        <translation></translation>
-    </message>
 </context>
 <context>
     <name>emoji::Panel</name>
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts
index 2481f9895faf4912396e94cb6b45c44a4c08b940..607b2ba95cd73ba69603e0f2cd948b228ca8c826 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -835,16 +835,11 @@ Media size: %2
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location line="+11"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>dialogs::ReceiptItem</name>
     <message>
-        <location line="-55"/>
+        <location line="-44"/>
         <source>Today %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -953,12 +948,7 @@ Media size: %2
         </translation>
     </message>
     <message>
-        <location line="+71"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location line="+69"/>
+        <location line="+140"/>
         <source>Failed to enable encryption: %1</source>
         <translation>启用加密失败：%1</translation>
     </message>
@@ -974,13 +964,13 @@ Media size: %2
     </message>
     <message>
         <location line="+12"/>
-        <source>The selected media is not an image</source>
-        <translation>选择的媒体不是一个图像</translation>
+        <source>The selected file is not an image</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+5"/>
-        <source>Error while reading media: %1</source>
-        <translation>读取媒体时失败：%1</translation>
+        <source>Error while reading file: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location line="+35"/>
@@ -1016,11 +1006,6 @@ Media size: %2
         <source>Devices</source>
         <translation>设备</translation>
     </message>
-    <message>
-        <location line="+39"/>
-        <source>ESC</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>emoji::Panel</name>
diff --git a/src/dialogs/MemberList.cpp b/src/dialogs/MemberList.cpp
index 3b957c153046a4907538844c42f9f0ca7668368c..88a95403802ce2abd10b1bbeb12bbe51629b1d57 100644
--- a/src/dialogs/MemberList.cpp
+++ b/src/dialogs/MemberList.cpp
@@ -126,7 +126,7 @@ MemberList::MemberList(const QString &room_id, QWidget *parent)
                 qCritical() << e.what();
         }
 
-        auto closeShortcut = new QShortcut(QKeySequence("ESC"), this);
+        auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
         connect(closeShortcut, &QShortcut::activated, this, &MemberList::close);
         connect(okBtn, &QPushButton::clicked, this, &MemberList::close);
 }
diff --git a/src/dialogs/ReadReceipts.cpp b/src/dialogs/ReadReceipts.cpp
index 03ce3068ca074f7d123f48b7c54f3fc6d91e5cdd..5a0d98c7843fc159ed4e75a938ae20c6d6fea34b 100644
--- a/src/dialogs/ReadReceipts.cpp
+++ b/src/dialogs/ReadReceipts.cpp
@@ -133,7 +133,7 @@ ReadReceipts::ReadReceipts(QWidget *parent)
         layout->addWidget(userList_);
         layout->addLayout(buttonLayout);
 
-        auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this);
+        auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
         connect(closeShortcut, &QShortcut::activated, this, &ReadReceipts::close);
         connect(okBtn, &QPushButton::clicked, this, &ReadReceipts::close);
 }
diff --git a/src/dialogs/RoomSettings.cpp b/src/dialogs/RoomSettings.cpp
index b2344f239b573bb8d024b8bacc7c62e0796b0351..1fe5904bf4be7b9ae3a3c21b301033f972fdab7a 100644
--- a/src/dialogs/RoomSettings.cpp
+++ b/src/dialogs/RoomSettings.cpp
@@ -438,7 +438,7 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent)
                 resetErrorLabel();
         });
 
-        auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this);
+        auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
         connect(closeShortcut, &QShortcut::activated, this, &RoomSettings::close);
         connect(okBtn, &QPushButton::clicked, this, &RoomSettings::close);
 }
@@ -668,12 +668,12 @@ RoomSettings::updateAvatar()
 
         QFile file{fileName, this};
         if (format != "image") {
-                displayErrorMessage(tr("The selected media is not an image"));
+                displayErrorMessage(tr("The selected file is not an image"));
                 return;
         }
 
         if (!file.open(QIODevice::ReadOnly)) {
-                displayErrorMessage(tr("Error while reading media: %1").arg(file.errorString()));
+                displayErrorMessage(tr("Error while reading file: %1").arg(file.errorString()));
                 return;
         }
 
diff --git a/src/dialogs/UserProfile.cpp b/src/dialogs/UserProfile.cpp
index b8040f9f3445ab32d54288e389b9caf8d411467e..6aea96a8cbd0a0b850baf313e2bd9df196a039cc 100644
--- a/src/dialogs/UserProfile.cpp
+++ b/src/dialogs/UserProfile.cpp
@@ -183,7 +183,7 @@ UserProfile::UserProfile(QWidget *parent)
 
         qRegisterMetaType<std::vector<DeviceInfo>>();
 
-        auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this);
+        auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
         connect(closeShortcut, &QShortcut::activated, this, &UserProfile::close);
         connect(okBtn, &QPushButton::clicked, this, &UserProfile::close);
 }