4 files changed, 5 insertions, 21 deletions
diff --git a/src/modules/extraicons/DefaultExtraIcons.cpp b/src/modules/extraicons/DefaultExtraIcons.cpp
index 590d21c715..3287a72d1d 100644
--- a/src/modules/extraicons/DefaultExtraIcons.cpp
+++ b/src/modules/extraicons/DefaultExtraIcons.cpp
@@ -342,13 +342,10 @@ void DefaultExtraIcons_Load()
 			p.hExtraIcon = ExtraIcon_Register(p.name, p.desc, LoadSkinnedIconName(p.iSkinIcon));
 	}
 
-	HANDLE hContact = db_find_first();
-	while (hContact != NULL) {
+	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 		SetExtraIcons(hContact);
 		SetVisibility(hContact, -1, false);
 		SetGender(hContact, -1, false);
-
-		hContact = db_find_next(hContact);
 	}
 
 	HookEvent(ME_DB_CONTACT_SETTINGCHANGED, SettingChanged);
diff --git a/src/modules/extraicons/ExtraIcon.cpp b/src/modules/extraicons/ExtraIcon.cpp
index f59a7310fa..379265e9ba 100644
--- a/src/modules/extraicons/ExtraIcon.cpp
+++ b/src/modules/extraicons/ExtraIcon.cpp
@@ -67,15 +67,10 @@ void ExtraIcon::applyIcons()
 	if (!isEnabled())
 		return;
 
-	HANDLE hContact = db_find_first();
-	while (hContact != NULL)
-	{
+	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 		// Clear to assert that it will be cleared
 		Clist_SetExtraIcon(hContact, slot, INVALID_HANDLE_VALUE);
-
 		applyIcon(hContact);
-
-		hContact = db_find_next(hContact);
 	}
 }
 
diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp
index 24cec55b7f..79922167c4 100644
--- a/src/modules/extraicons/extraicons.cpp
+++ b/src/modules/extraicons/extraicons.cpp
@@ -330,12 +330,8 @@ void fnSetAllExtraIcons(HWND hwndList, HANDLE hContact)
 	if (hContact == NULL)
 		hContact = db_find_first();
 
-	do {
-		HANDLE hItem = hContact;
-		if (hItem == 0)
-			continue;
-
-		ClcCacheEntry* pdnce = (ClcCacheEntry*)cli.pfnGetCacheEntry(hItem);
+	for (; hContact; hContact = db_find_next(hContact)) {
+		ClcCacheEntry* pdnce = (ClcCacheEntry*)cli.pfnGetCacheEntry(hContact);
 		if (pdnce == NULL)
 			continue;
 
@@ -343,7 +339,6 @@ void fnSetAllExtraIcons(HWND hwndList, HANDLE hContact)
 		if (hcontgiven) break;
 		Sleep(0);
 	}
-		while(hContact = db_find_next(hContact));
 
 	g_mutex_bSetAllExtraIconsCycle = 0;
 	cli.pfnInvalidateRect(hwndList, NULL, FALSE);
diff --git a/src/modules/extraicons/options_ei.cpp b/src/modules/extraicons/options_ei.cpp
index 99d5f8c91d..48a763dc83 100644
--- a/src/modules/extraicons/options_ei.cpp
+++ b/src/modules/extraicons/options_ei.cpp
@@ -56,11 +56,8 @@ BOOL ScreenToClient(HWND hWnd, LPRECT lpRect)
 
 static void RemoveExtraIcons(int slot)
 {
-	HANDLE hContact = db_find_first();
-	while (hContact != NULL) {
+	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
 		Clist_SetExtraIcon(hContact, slot, INVALID_HANDLE_VALUE);
-		hContact = db_find_next(hContact);
-	}
 }
 
 #ifndef TVIS_FOCUSED