4 files changed, 8 insertions, 8 deletions
diff --git a/plugins/TopToolBar/src/toolbar.cpp b/plugins/TopToolBar/src/toolbar.cpp
index d02ab8240a..a8c037a7ac 100644
--- a/plugins/TopToolBar/src/toolbar.cpp
+++ b/plugins/TopToolBar/src/toolbar.cpp
@@ -440,7 +440,7 @@ INT_PTR TTBSetOptions(WPARAM wParam, LPARAM lParam)
 		if (lParam == 0)
 			return -1;
 
-		replaceStrW(b->ptszTooltip, TranslateTS(_A2T((LPCSTR)lParam)));
+		replaceStrW(b->ptszTooltip, TranslateW(_A2T((LPCSTR)lParam)));
 		SendMessage(b->hwnd, BUTTONADDTOOLTIP, (WPARAM)b->ptszTooltip, BATF_UNICODE);
 		return 1;
 
diff --git a/plugins/TopToolBar/src/toolbarwnd.cpp b/plugins/TopToolBar/src/toolbarwnd.cpp
index 90f3199b24..8962a36af0 100644
--- a/plugins/TopToolBar/src/toolbarwnd.cpp
+++ b/plugins/TopToolBar/src/toolbarwnd.cpp
@@ -276,7 +276,7 @@ INT_PTR OnEventFire(WPARAM wParam, LPARAM)
 		Frame.tname = L"Toolbar";
 		Frame.hWnd = g_ctrl->hWnd;
 		Frame.align = alTop;
-		Frame.Flags = F_VISIBLE | F_NOBORDER | F_LOCKED | F_TCHAR;
+		Frame.Flags = F_VISIBLE | F_NOBORDER | F_LOCKED | F_UNICODE;
 		Frame.height = g_ctrl->nLastHeight;
 		Frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME);
 		g_ctrl->hFrame = (HANDLE)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&Frame, 0);
@@ -299,7 +299,7 @@ int LoadBackgroundOptions()
 	}
 
 	if (db_get_b(NULL, TTB_OPTDIR, "UseBitmap", TTBDEFAULT_USEBITMAP)) {
-		ptrW tszBitmapName(db_get_tsa(NULL, TTB_OPTDIR, "BkBitmap"));
+		ptrW tszBitmapName(db_get_wsa(NULL, TTB_OPTDIR, "BkBitmap"));
 		if (tszBitmapName != NULL)
 			hBmpBackground = Bitmap_Load(tszBitmapName);
 	}
diff --git a/plugins/TopToolBar/src/topbutton.cpp b/plugins/TopToolBar/src/topbutton.cpp
index 4be939ba8b..75a39c03a4 100644
--- a/plugins/TopToolBar/src/topbutton.cpp
+++ b/plugins/TopToolBar/src/topbutton.cpp
@@ -35,7 +35,7 @@ DWORD TopButtonInt::CheckFlags(DWORD Flags)
 	}
 	if (BitChanged(TTBBF_SHOWTOOLTIP)) {
 		dwFlags ^= TTBBF_SHOWTOOLTIP;
-		SendMessage(hwnd, BUTTONADDTOOLTIP, (WPARAM)((dwFlags & TTBBF_SHOWTOOLTIP) ? ptszTooltip : L""), BATF_TCHAR);
+		SendMessage(hwnd, BUTTONADDTOOLTIP, (WPARAM)((dwFlags & TTBBF_SHOWTOOLTIP) ? ptszTooltip : L""), BATF_UNICODE);
 	}
 	// next settings changing visual side, requires additional actions
 	if (BitChanged(TTBBF_VISIBLE)) {
@@ -98,7 +98,7 @@ void TopButtonInt::LoadSettings()
 		pszName = db_get_sa(0, TTB_OPTDIR, AS(buf, buf2, "_name"));
 		
 		mir_free(ptszProgram);
-		ptszProgram = db_get_tsa(0, TTB_OPTDIR, AS(buf, buf2, "_lpath"));
+		ptszProgram = db_get_wsa(0, TTB_OPTDIR, AS(buf, buf2, "_lpath"));
 
 		arrangedpos = db_get_b(0, TTB_OPTDIR, AS(buf, buf2, "_Position"), Buttons.getCount());
 		if (db_get_b(0, TTB_OPTDIR, AS(buf, buf2, "_Visible"), oldv) > 0)
@@ -134,7 +134,7 @@ void TopButtonInt::SaveSettings(int *SepCnt, int *LaunchCnt)
 		AS(buf2, "Launch", buf1);
 
 		db_set_s(0, TTB_OPTDIR, AS(buf, buf2, "_name"), pszName);
-		db_set_ts(0, TTB_OPTDIR, AS(buf, buf2, "_lpath"), ptszProgram);
+		db_set_ws(0, TTB_OPTDIR, AS(buf, buf2, "_lpath"), ptszProgram);
 		db_set_b(0, TTB_OPTDIR, AS(buf, buf2, "_Position"), arrangedpos);
 		db_set_b(0, TTB_OPTDIR, AS(buf, buf2, "_Visible"), isVisible());
 	}
@@ -172,6 +172,6 @@ void TopButtonInt::SetBitmap()
 			pTooltip = ptszTooltipUp;
 		}
 		if (pTooltip)
-			SendMessage(hwnd, BUTTONADDTOOLTIP, (WPARAM)TranslateTH(hLangpack, pTooltip), BATF_TCHAR);
+			SendMessage(hwnd, BUTTONADDTOOLTIP, (WPARAM)TranslateW_LP(pTooltip, hLangpack), BATF_UNICODE);
 	}
 }
diff --git a/plugins/TopToolBar/src/ttbopt.cpp b/plugins/TopToolBar/src/ttbopt.cpp
index e4a2edd8e5..0b65ba0bfd 100644
--- a/plugins/TopToolBar/src/ttbopt.cpp
+++ b/plugins/TopToolBar/src/ttbopt.cpp
@@ -34,7 +34,7 @@ static HTREEITEM AddLine(HWND hTree,TopButtonInt *b, HTREEITEM hItem, HIMAGELIST
 		else index = ImageList_AddIcon(il, b->hIconUp);
 
 		tmp = mir_a2u( b->pszName );
-		tvis.item.pszText = TranslateTS(tmp);
+		tvis.item.pszText = TranslateW(tmp);
 	}
 	tvis.item.iImage = tvis.item.iSelectedImage = index;