diff --git a/src/helper.cpp b/src/helper.cpp
index 9d32f6a2..866018d9 100644
--- a/src/helper.cpp
+++ b/src/helper.cpp
@@ -73,16 +73,7 @@ void _app_settab_id (HWND hwnd, INT page_id)
 
 		if (listview_id == page_id)
 		{
-			SendDlgItemMessage (hwnd, IDC_TAB, TCM_SETCURSEL, (WPARAM)i, 0);
-
-			NMHDR hdr = {0};
-
-			hdr.code = TCN_SELCHANGE;
-			hdr.hwndFrom = hwnd;
-			hdr.idFrom = IDC_TAB;
-
-			SendMessage (hwnd, WM_NOTIFY, 0, (LPARAM)&hdr);
-
+			_r_tab_selectitem (hwnd, IDC_TAB, i);
 			return;
 		}
 	}
@@ -3176,7 +3167,7 @@ HBITMAP _app_bitmapfrompng (HINSTANCE hinst, LPCWSTR name, INT icon_size)
 		goto DoExit;
 
 	// Load the resource
-	WICInProcPointer resourceBuffer = (WICInProcPointer)_app_loadresource (hinst, name, L"PNG", &resourceLength);
+	WICInProcPointer resourceBuffer = (WICInProcPointer)_r_loadresource (hinst, name, L"PNG", &resourceLength);
 
 	if (!resourceBuffer)
 		goto DoExit;
@@ -3348,32 +3339,3 @@ DoOpen:
 	_r_str_alloc (&ptr_app_item->real_path, result.GetLength (), result.GetString ());
 }
 
-LPVOID _app_loadresource (HINSTANCE hinst, LPCWSTR res, LPCWSTR type, PDWORD psize)
-{
-	HRSRC hres = FindResource (hinst, res, type);
-
-	if (hres)
-	{
-		HGLOBAL hloaded = LoadResource (hinst, hres);
-
-		if (hloaded)
-		{
-			LPVOID pLockedResource = LockResource (hloaded);
-
-			if (pLockedResource)
-			{
-				DWORD dwResourceSize = SizeofResource (hinst, hres);
-
-				if (dwResourceSize != 0)
-				{
-					if (psize)
-						*psize = dwResourceSize;
-
-					return pLockedResource;
-				}
-			}
-		}
-	}
-
-	return nullptr;
-}
diff --git a/src/helper.hpp b/src/helper.hpp
index 4fd71b32..79976a33 100644
--- a/src/helper.hpp
+++ b/src/helper.hpp
@@ -71,4 +71,3 @@ HBITMAP _app_bitmapfromico (HICON hicon, INT icon_size);
 HBITMAP _app_bitmapfrompng (HINSTANCE hinst, LPCWSTR name, INT icon_size);
 
 void _app_load_appxmanifest (PITEM_APP_HELPER ptr_app_item);
-LPVOID _app_loadresource (HINSTANCE hinst, LPCWSTR res, LPCWSTR type, PDWORD psize);
diff --git a/src/main.cpp b/src/main.cpp
index 918d966d..76d6ab05 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4318,7 +4318,7 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 				case IDM_SETTINGS:
 				case IDM_TRAY_SETTINGS:
 				{
-					app.CreateSettingsWindow (&SettingsProc);
+					app.CreateSettingsWindow (hwnd, &SettingsProc);
 					break;
 				}
 
diff --git a/src/profile.cpp b/src/profile.cpp
index 84992677..c4669c3c 100644
--- a/src/profile.cpp
+++ b/src/profile.cpp
@@ -1307,7 +1307,7 @@ void _app_profile_load_helper (const pugi::xml_node & root, EnumDataType type, U
 	}
 }
 
-void _app_profile_load_internal (LPCWSTR path, LPCWSTR path_backup, time_t * ptimestamp)
+void _app_profile_load_internal (LPCWSTR path, LPCWSTR path_backup, time_t* ptimestamp)
 {
 	pugi::xml_document doc_original;
 	pugi::xml_document doc_backup;
@@ -1321,10 +1321,10 @@ void _app_profile_load_internal (LPCWSTR path, LPCWSTR path_backup, time_t * pti
 	if (path_backup)
 	{
 		DWORD size = 0;
-		const LPVOID buffer = _app_loadresource (app.GetHINSTANCE (), path_backup, RT_RCDATA, &size);
+		const LPVOID pbuffer = _r_loadresource (app.GetHINSTANCE (), path_backup, RT_RCDATA, &size);
 
-		if (buffer)
-			load_backup = doc_backup.load_buffer (buffer, size, PUGIXML_LOAD_FLAGS, PUGIXML_LOAD_ENCODING);
+		if (pbuffer)
+			load_backup = doc_backup.load_buffer (pbuffer, size, PUGIXML_LOAD_FLAGS, PUGIXML_LOAD_ENCODING);
 
 		if (load_backup)
 		{