diff --git a/ui/src/main/resources/templates/inc/product-attributes.html b/ui/src/main/resources/templates/inc/product-attributes.html
index 169e7277b..22678c658 100644
--- a/ui/src/main/resources/templates/inc/product-attributes.html
+++ b/ui/src/main/resources/templates/inc/product-attributes.html
@@ -3,16 +3,15 @@
 	<div class="card-body">
 		<table class="table table-hover">
 			<tbody>
-  				<tr th:each="item : ${product.attributes.aggregatedAttributes.values()}">
-
-
-
-					<th scope="row" th:text="${item.name}"></th>
-					<th:block th:switch="${item.name}">
-		                <td th:case="'REPAIRABILITY_INDEX'"  th:insert="~{inc/attributes/class_energy.html}"> </td>
-		                <td th:case="*" th:text="${item.value}"></td>
-		            </th:block>
-				</tr>
+				<th:block th:each="item : ${product.attributes.aggregatedAttributes.values()}">
+	  				<tr data-bs-toggle="tooltip" data-bs-placement="top" th:title="#{attribute.sourcing(${item.sourcesCount()}, ${item.distinctValues()-1})}">
+						<th class="help-pointer" scope="row" th:text="${item.name}"></th>
+						<th:block th:switch="${item.name}">
+			                <td class="help-pointer" th:case="'REPAIRABILITY_INDEX'"  th:insert="~{inc/attributes/class_energy.html}"> </td>
+			                <td class="help-pointer" th:case="*" th:text="${item.value}"></td>
+			            </th:block>
+					</tr>
+				</th:block>
 			</tbody>
 		</table>
 	</div>
diff --git a/ui/src/main/resources/templates/inc/product-unmatched-attributes.html b/ui/src/main/resources/templates/inc/product-unmatched-attributes.html
index c80a0acb7..e7ce6a704 100644
--- a/ui/src/main/resources/templates/inc/product-unmatched-attributes.html
+++ b/ui/src/main/resources/templates/inc/product-unmatched-attributes.html
@@ -14,9 +14,9 @@
 
 
 					<th:block th:with="sourcesCount = ${attr.sourcesCount()}, conflicts = ${attr.hasConflicts()}">
-						<tr th:class="${attr.bgRow()}" data-bs-toggle="tooltip" data-bs-placement="top" th:title="#{attribute.sourcing(${sourcesCount}, ${attr.distinctValues()})}">
-							<td><span th:text="${attr.name}"></span></td>						
-							<td><span  th:text="${attr.value}"></span> </td>
+						<tr th:class="${attr.bgRow()}" data-bs-toggle="tooltip" data-bs-placement="top" th:title="#{attribute.sourcing(${sourcesCount}, ${attr.distinctValues()-1})}">
+							<td class="help-pointer"><span th:text="${attr.name}"></span></td>						
+							<td class="help-pointer"><span  th:text="${attr.value}"></span> </td>
 						</tr>
 					</th:block>