diff --git a/frappe/patches/v7_1/rename_chinese_language_codes.py b/frappe/patches/v7_1/rename_chinese_language_codes.py
index 47f8528c8e..e5e4048590 100644
--- a/frappe/patches/v7_1/rename_chinese_language_codes.py
+++ b/frappe/patches/v7_1/rename_chinese_language_codes.py
@@ -2,7 +2,8 @@ import frappe
 
 def execute():
 	frappe.reload_doc('core', 'doctype', 'language')
-	frappe.rename_doc('Language', 'zh-cn', 'zh', force=True, merge=True)
+	frappe.rename_doc('Language', 'zh-cn', 'zh', force=True,
+		merge=True if frappe.db.exists('Language', 'zh') else False)
 	frappe.rename_doc('Language', 'zh-tw', 'zh-TW', force=True)
 	frappe.db.set_value('Language', 'zh', 'language_code', 'zh')
 	frappe.db.set_value('Language', 'zh-TW', 'language_code', 'zh-TW')
\ No newline at end of file
diff --git a/frappe/public/css/list.css b/frappe/public/css/list.css
index d65c2d05fd..e15da2a405 100644
--- a/frappe/public/css/list.css
+++ b/frappe/public/css/list.css
@@ -238,7 +238,7 @@ table.field-info tr td {
   border: 0px;
 }
 .image-field {
-  background-size: 100% 100% !important;
+  background-size: contain;
   position: relative;
 }
 .image-field:hover .field-info {