diff --git a/jdi-light-material-ui-tests/src/main/java/io/github/com/pages/displaydata/IconsPage.java b/jdi-light-material-ui-tests/src/main/java/io/github/com/pages/displaydata/IconsPage.java
index ff61503377..d6ffc96c05 100644
--- a/jdi-light-material-ui-tests/src/main/java/io/github/com/pages/displaydata/IconsPage.java
+++ b/jdi-light-material-ui-tests/src/main/java/io/github/com/pages/displaydata/IconsPage.java
@@ -12,11 +12,10 @@ public class IconsPage extends WebPage {
     @UI(".MuiGrid-grid-xs-8 > svg")
     public static List<Icon> simpleIcons;
 
-    // @todo #5297 Fix locator to be more stable against div
-    @UI("//p[@id='colorLastClick']/..//div/*")
+    @UI("//h2[text()='Color']/following::div[1]//*[contains(@class, 'MuiSvgIcon-root')]")
     public static List<Icon> colorIcons;
 
-    @UI("//p[@id='sizeLastClick']/..//div/*")
+    @UI("//h2[text()='Size']/following::div[1]//*[contains(@class, 'MuiSvgIcon-root')]")
     public static List<Icon> differentSizesIcons;
 
     @UI("#simpleLastClick")