diff --git a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html
index 7cc20b6e912..ae0a0dbb77a 100644
--- a/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html
+++ b/erpnext/accounts/print_format/print_format_sales_invoice/print_format_sales_invoice.html
@@ -208,18 +208,15 @@ print_heading_template=None) -%}
 		</table>
 
 		<!-- Items Table -->
+		{% set item_naming_by = frappe.db.get_single_value("Stock Settings", "item_naming_by") %}
 		<table class="items-table mt-15">
-			<colgroup>
-				<col style="width: 5%" />
-				<col style="width: 35%" />
-				<col style="width: 10%" />
-				<col style="width: 20%" />
-				<col style="width: 15%" />
-			</colgroup>
 			<thead class="highlight-bg">
 				<tr>
-					<td class="text-center">{{ _("No") }}</td>
+					<td class="	text-center">{{ _("No") }}</td>
 					<td class="text-left">{{ _("Item") }}</td>
+					{% if item_naming_by != "Item Code" %}
+						<td class="text-left">{{ _("Item Code") }}</td>
+					{% endif %}
 					<td class="text-right">{{ _("Quantity") }}</td>
 					<td class="text-right">{{ _("Rate") }}</td>
 					<td class="text-right">{{ _("Amount") }}</td>
@@ -239,10 +236,8 @@ print_heading_template=None) -%}
 										alt="{{ item.item_name }}"
 										style="
 											border-radius: 6px;
-											max-height: 24px;
-											min-height: 24px;
-											max-width: 24px;
-											min-width: 24px;
+											height: 24px;
+											width: 24px !important;
 											margin-right: 8px;
                                             vertical-align: middle;
 										"
@@ -258,6 +253,9 @@ print_heading_template=None) -%}
 							</tr>
 						</table>
 					</td>
+					{% if item_naming_by != "Item Code" %}
+						<td class="text-left">{{ item.item_code }}</td>
+					{% endif %}
 
 					<td class="text-right">{{ item.get_formatted("qty", 0) }} {{ item.uom }}</td>
 					<td class="text-right">{{ item.get_formatted("net_rate", doc) }}</td>
diff --git a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html
index f5143157a95..e11d8c97d69 100644
--- a/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html
+++ b/erpnext/accounts/print_format/sales_invoice_print_format/sales_invoice_print_format.html
@@ -236,18 +236,15 @@ print_heading_template=None) -%}
 		</table>
 
 		<!-- Items Table -->
+		{% set item_naming_by = frappe.db.get_single_value("Stock Settings", "item_naming_by") %}
 		<table class="items-table mt-15" style="width: 100%">
-			<colgroup>
-				<col style="width: 5%" />
-				<col style="width: 40%" />
-				<col style="width: 15%" />
-				<col style="width: 20%" />
-				<col style="width: 20%" />
-			</colgroup>
 			<thead class="table-header">
 				<tr>
 					<td class="text-center">{{ _("No") }}</td>
 					<td class="text-left">{{ _("Item") }}</td>
+					{% if item_naming_by != "Item Code" %}
+						<td class="text-left">{{ _("Item Code") }}</td>
+					{% endif %}
 					<td class="text-right">{{ _("Quantity") }}</td>
 					<td class="text-right">{{ _("Rate") }}</td>
 					<td class="text-right">{{ _("Amount") }}</td>
@@ -258,6 +255,9 @@ print_heading_template=None) -%}
 				<tr>
 					<td class="text-center text-dark">{{ loop.index }}</td>
 					<td>{{ item.item_name }}</td>
+					{% if item_naming_by != "Item Code" %}
+						<td class="text-left">{{ item.item_code }}</td>
+					{% endif %}
 					<td class="text-right text-dark">{{ item.get_formatted("qty", 0) }} {{ item.uom }}</td>
 					<td class="text-right text-dark">{{ item.get_formatted("net_rate", doc) }}</td>
 					<td class="text-right" style="color: #171717">