diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 31d21bc1fe6..120d27d2cd4 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -2857,10 +2857,10 @@ def save_company_master_details(name, company, details):
 		validate_email_address(details.email, throw=True)
 
 	company_fields = ["company_logo", "website", "phone_no", "email"]
-	updated_fields = {field: details.get(field) for field in company_fields if details.get(field)}
+	company_fields_to_update = {field: details.get(field) for field in company_fields if details.get(field)}
 
-	if updated_fields:
-		frappe.db.set_value("Company", company, updated_fields)
+	if company_fields_to_update:
+		frappe.db.set_value("Company", company, company_fields_to_update)
 
 	company_address = details.get("company_address")
 	if details.get("address_line1"):
@@ -2883,8 +2883,8 @@ def save_company_master_details(name, company, details):
 		company_address = address_doc.name
 
 	if company_address:
-		current_display = frappe.db.get_value("Sales Invoice", name, "company_address_display")
-		if not current_display or details.get("address_line1"):
+		company_address_display = frappe.db.get_value("Sales Invoice", name, "company_address_display")
+		if not company_address_display or details.get("address_line1"):
 			frappe.db.set_value(
 				"Sales Invoice",
 				name,
diff --git a/erpnext/accounts/letterhead/letterhead_plain.html b/erpnext/accounts/letterhead/letterhead_plain.html
index 46613a31308..8fbf58ec68f 100644
--- a/erpnext/accounts/letterhead/letterhead_plain.html
+++ b/erpnext/accounts/letterhead/letterhead_plain.html
@@ -69,17 +69,19 @@
                     {{ doc.company }}
                 </div>
                 {% if doc.company_address %}
-                    {% set company_address_display = frappe.get_doc("Address", doc.company_address) %}
-                    {{ company_address_display.address_line1 or "" }}<br>
-                    {% if company_address_display.address_line2 %}{{ company_address_display.address_line2 }}<br>{% endif %}
-                    {{ company_address_display.city or "" }}, {{ company_address_display.state or "" }} {{ company_address_display.pincode or "" }}, {{ company_address_display.country or "" }}<br>
+                    {% set company_address = frappe.db.get_value("Address", doc.company_address, ["address_line1", "address_line2", "city", "state", "pincode", "country"], as_dict=True) %}
+
+                    {{ company_address.get("address_line1") or "" }}<br>
+                    {% if company_address.get("address_line2") %}{{ company_address.get("address_line2") }}<br>{% endif %}
+                    {{ company_address.get("city") or "" }}, {{ company_address.get("state") or "" }} {{ company_address.get("pincode") or "" }}, {{ company_address.get("country") or "" }}<br>
                 {% endif %}
             </td>
 
             <td class="invoice-info-cell">
-                {% set website = frappe.db.get_value("Company", doc.company, "website") %}
-                {% set email = frappe.db.get_value("Company", doc.company, "email") %}
-                {% set phone_no = frappe.db.get_value("Company", doc.company, "phone_no") %}
+                {% set company_details = frappe.db.get_value("Company", doc.company, ["website", "email", "phone_no"], as_dict=True) %}
+                {% set website = company_details.website %}
+                {% set email = company_details.email %}
+                {% set phone_no = company_details.phone_no %}
 
                 <div class="invoice-info">
                     <span class="invoice-label">{{ _("Invoice:") }}</span>
diff --git a/erpnext/accounts/letterhead/letterhead_with_background_colour.html b/erpnext/accounts/letterhead/letterhead_with_background_colour.html
index 9e2ca5033a4..425a81ff081 100644
--- a/erpnext/accounts/letterhead/letterhead_with_background_colour.html
+++ b/erpnext/accounts/letterhead/letterhead_with_background_colour.html
@@ -22,13 +22,13 @@
 		vertical-align: top;
 	}
 
-	.logo {
+	.letter-head .logo {
 		width: 90px;
 		display: block;
 		margin-bottom: 10px;
 	}
 
-	.logo img {
+	.letter-head .logo img {
 		border-radius: 15px;
 	}
 
@@ -82,12 +82,12 @@
 				{% endif %}
 				<div class="company-name">{{ doc.company }}</div>
 				<div class="company-address">
-					{% if doc.company_address %} {% set company_address_display = frappe.get_doc("Address",
-					doc.company_address) %} {{ company_address_display.address_line1 or "" }}<br /> {% if
-					company_address_display.address_line2 %}{{ company_address_display.address_line2 }}<br />{%
-					endif %} {{ company_address_display.city or "" }}, {{ company_address_display.state or ""
-					}} {{ company_address_display.pincode or "" }}, {{ company_address_display.country or ""
-					}}<br />
+					{% if doc.company_address %}
+						{% set company_address = frappe.db.get_value("Address", doc.company_address, ["address_line1", "address_line2", "city", "state", "pincode", "country"], as_dict=True) %}
+						{{ company_address.address_line1 or "" }}<br />
+						{% if company_address.address_line2 %} {{ company_address.address_line2 }}<br /> {% endif %}
+						{{ company_address.city or "" }}, {{ company_address.state or "" }}
+						{{ company_address.pincode or "" }}, {{ company_address.country or ""}}<br />
 					{% endif %}
 				</div>
 			</td>
@@ -99,9 +99,8 @@
 					<br />
 				</div>
 				<div style="text-align: left; float: right" class="other-details">
-					{% set website = frappe.db.get_value("Company", doc.company, "website") %} {% set email =
-					frappe.db.get_value("Company", doc.company, "email") %} {% set phone_no =
-					frappe.db.get_value("Company", doc.company, "phone_no") %} {% if website %}
+					{% set company_details = frappe.db.get_value("Company", doc.company, ["website", "email", "phone_no"], as_dict=True) %}
+					{% set website = company_details.website %} {% set email = company_details.email %} {% set phone_no = company_details.phone_no %} {% if website %}
 					<div>
 						<span class="contact-title">{{ _("Website:") }}</span
 						><span class="contact-value">{{ website }}</span>