diff --git a/src/Helpers.h b/src/Helpers.h
index 4f51742a6..c339c600e 100644
--- a/src/Helpers.h
+++ b/src/Helpers.h
@@ -59,17 +59,17 @@
   #define DEFAULT_ALLOC_FLAGS (0)
 #endif
 
-__forceinline LPVOID AllocMem(size_t numBytes, DWORD dwFlags)
+inline LPVOID AllocMem(size_t numBytes, DWORD dwFlags)
 {
   return HeapAlloc(Globals.hndlProcessHeap, (dwFlags | DEFAULT_ALLOC_FLAGS), numBytes);
 }
 
-__forceinline bool FreeMem(LPVOID lpMemory)
+inline bool FreeMem(LPVOID lpMemory)
 {
   return (lpMemory ? HeapFree(Globals.hndlProcessHeap, 0, lpMemory) : true);
 }
 
-__forceinline size_t SizeOfMem(LPCVOID lpMemory)
+inline size_t SizeOfMem(LPCVOID lpMemory)
 {
   return (lpMemory ? HeapSize(Globals.hndlProcessHeap, 0, lpMemory) : 0);
 }
@@ -208,26 +208,44 @@ DWORD GetLastErrorToMsgBox(LPWSTR lpszFunction, DWORD dwErrID);
 
 bool SetClipboardTextW(HWND hwnd, LPCWSTR pszTextW, size_t cchTextW);
 
+// ----------------------------------------------------------------------------
+
 DPI_T GetCurrentDPI(HWND hwnd);
 DPI_T GetCurrentPPI(HWND hwnd);
+
 void UpdateWindowLayoutForDPI(HWND hWnd, int x_96dpi, int y_96dpi, int w_96dpi, int h_96dpi);
 HBITMAP ResizeImageForCurrentDPI(HBITMAP hbmp);
-#define ScaleIntToCurrentDPI(val) MulDiv((val), Globals.CurrentDPI.y, USER_DEFAULT_SCREEN_DPI)
+inline int ScaleIntToCurrentDPI(int val) { return MulDiv((val), Globals.CurrentDPI.y, USER_DEFAULT_SCREEN_DPI); }
 inline int ScaleToCurrentDPI(float fVal) { return float2int((fVal * Globals.CurrentDPI.y) / (float)USER_DEFAULT_SCREEN_DPI); }
-#define ScaleIntFontSize(val) MulDiv((val), Globals.CurrentDPI.y, Globals.CurrentPPI.y)
+inline int ScaleIntFontSize(int val) { return MulDiv((val), Globals.CurrentDPI.y, Globals.CurrentPPI.y); }
 inline int ScaleFontSize(float fSize) { return float2int((fSize * Globals.CurrentDPI.y) / (float)Globals.CurrentPPI.y); }
 inline int ScaleFractionalFontSize(float fSize) { return float2int((fSize * 10.0f * Globals.CurrentDPI.y) / (float)Globals.CurrentPPI.y) * 10; }
+
 int GetSystemMetricsEx(int nValue);
 
 // ----------------------------------------------------------------------------
 
-inline bool IsFullHDOrHigher(int resX, int resY) {
-  if (resX <= 0) { resX = GetSystemMetrics(SM_CXSCREEN); }
-  if (resY <= 0) { resY = GetSystemMetrics(SM_CYSCREEN); }
+inline void GetCurrentMonitorResolution(HWND hwnd, int* pCXScreen, int* pCYScreen)
+{
+  HMONITOR const hMonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST);
+  MONITORINFO mi;
+  ZeroMemory(&mi, sizeof(MONITORINFO));
+  mi.cbSize = sizeof(mi);
+  GetMonitorInfo(hMonitor, &mi);
+  *pCXScreen = (mi.rcMonitor.right - mi.rcMonitor.left);
+  *pCYScreen = (mi.rcMonitor.bottom - mi.rcMonitor.top);
+}
+
+inline bool IsFullHDOrHigher(HWND hwnd, int resX, int resY) 
+{
+  int cxScreen, cyScreen;
+  GetCurrentMonitorResolution(hwnd, &cxScreen, &cyScreen);
+  if (resX <= 0) { resX = cxScreen; }
+  if (resY <= 0) { resY = cxScreen; }
   return ((resX >= 1920) && (resY >= 1080));
 }
 
-#define INITIAL_BASE_FONT_SIZE (IsFullHDOrHigher(-1, -1) ? 11.0f : 10.0f)
+inline float GetBaseFontSize(HWND hwnd) { return (IsFullHDOrHigher(hwnd, -1, -1) ? 11.0f : 10.0f); }
 
 // ----------------------------------------------------------------------------
 
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 1828090d9..434bcac5d 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -147,7 +147,7 @@ static WIN32_FIND_DATA s_fdCurFile;
 
 static HMODULE s_hRichEdit = INVALID_HANDLE_VALUE;
 
-#define INISECTIONBUFCNT 32
+static int const INISECTIONBUFCNT = 32; // .ini file load buffer in KB
 
 static TBBUTTON  s_tbbMainWnd[] = { { 0,IDT_FILE_NEW,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 },
                                     { 1,IDT_FILE_OPEN,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 },
@@ -192,9 +192,9 @@ static TBBUTTON  s_tbbMainWnd[] = { { 0,IDT_FILE_NEW,TBSTATE_ENABLED,BTNS_BUTTON
                                     { 20,IDT_FILE_PRINT,TBSTATE_ENABLED,BTNS_BUTTON,{0},0,0 }
 };
 
-#define NUMTOOLBITMAPS  28
-#define TBBUTTON_DEFAULT_IDS  L"1 2 4 3 28 0 5 6 0 7 8 9 0 10 11 0 12 0 24 26 0 22 23 0 13 14 0 27 0 15 0 25 0 17"
-#define NUMINITIALTOOLS 34
+static int const NUMTOOLBITMAPS = 28;
+static const WCHAR* const TBBUTTON_DEFAULT_IDS = L"1 2 4 3 28 0 5 6 0 7 8 9 0 10 11 0 12 0 24 26 0 22 23 0 13 14 0 27 0 15 0 25 0 17";
+static int const NUMINITIALTOOLS = 34;
 
 //=============================================================================
 
@@ -1667,7 +1667,7 @@ LRESULT MsgCreate(HWND hwnd, WPARAM wParam,LPARAM lParam)
   }
 
   // Create Toolbar and Statusbar
-  CreateBars(hwnd,hInstance);
+  CreateBars(hwnd, hInstance);
 
   // Window Initialization
 
@@ -1834,6 +1834,9 @@ bool SelectExternalToolBar(HWND hwnd)
 void CreateBars(HWND hwnd, HINSTANCE hInstance)
 {
   DWORD dwToolbarStyle = NP3_WS_TOOLBAR;
+
+  if (s_hwndToolbar) { DestroyWindow(s_hwndToolbar); }
+
   s_hwndToolbar = CreateWindowEx(0,TOOLBARCLASSNAME,NULL,dwToolbarStyle,
                                0,0,0,0,hwnd,(HMENU)IDC_TOOLBAR,hInstance,NULL);
 
@@ -1861,7 +1864,7 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance)
     }
   }
   if (!hbmp) {
-    s_iToolBarTheme = 1;
+    s_iToolBarTheme = s_iToolBarTheme % 2;
     LPWSTR toolBarIntRes = (s_iToolBarTheme == 0) ? MAKEINTRESOURCE(IDR_MAINWNDTB) : MAKEINTRESOURCE(IDR_MAINWNDTB2);
     hbmp = LoadImage(hInstance, toolBarIntRes, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION);
   }
@@ -2058,11 +2061,17 @@ void CreateBars(HWND hwnd, HINSTANCE hInstance)
 
   // Create Statusbar 
   DWORD const dwStatusbarStyle = Settings.ShowStatusbar ? (WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE) : (WS_CHILD | WS_CLIPSIBLINGS);
+
+  if (Globals.hwndStatus) { DestroyWindow(Globals.hwndStatus); }
+
   Globals.hwndStatus = CreateStatusWindow(dwStatusbarStyle,NULL,hwnd,IDC_STATUSBAR);
 
 
   // Create ReBar and add Toolbar
   DWORD const dwReBarStyle = Settings.ShowToolbar ? (NP3_WS_REBAR | WS_VISIBLE) : (NP3_WS_REBAR);
+
+  if (s_hwndReBar) { DestroyWindow(s_hwndReBar); }
+
   s_hwndReBar = CreateWindowEx(WS_EX_TOOLWINDOW,REBARCLASSNAME,NULL,dwReBarStyle,
                              0,0,0,0,hwnd,(HMENU)IDC_REBAR,hInstance,NULL);
 
@@ -2201,9 +2210,6 @@ LRESULT MsgDPIChanged(HWND hwnd, WPARAM wParam, LPARAM lParam)
   // recreate toolbar and statusbar
   Toolbar_GetButtons(s_hwndToolbar, IDT_FILE_NEW, Settings.ToolbarButtons, COUNTOF(Settings.ToolbarButtons));
 
-  DestroyWindow(s_hwndToolbar);
-  DestroyWindow(s_hwndReBar);
-  DestroyWindow(Globals.hwndStatus);
   CreateBars(hwnd, Globals.hInstance);
 
   RECT* const rc = (RECT*)lParam;
@@ -2268,9 +2274,6 @@ LRESULT MsgThemeChanged(HWND hwnd, WPARAM wParam ,LPARAM lParam)
   // recreate toolbar and statusbar
   Toolbar_GetButtons(s_hwndToolbar,IDT_FILE_NEW,Settings.ToolbarButtons,COUNTOF(Settings.ToolbarButtons));
 
-  DestroyWindow(s_hwndToolbar);
-  DestroyWindow(s_hwndReBar);
-  DestroyWindow(Globals.hwndStatus);
   CreateBars(hwnd,hInstance);
 
   SendWMSize(hwnd, NULL);
@@ -5006,7 +5009,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_VIEW_TOGGLETB:
-      s_iToolBarTheme = (s_iToolBarTheme + 1) % (StrIsEmpty(s_tchToolbarBitmap) ? 2 : 3);
+      s_iToolBarTheme = (s_iToolBarTheme + 1) % 3;
       SendMessage(hwnd, WM_THEMECHANGED, 0, 0);
       break;
 
@@ -5034,8 +5037,8 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
       {
         WCHAR tchPosX[32], tchPosY[32], tchSizeX[32], tchSizeY[32], tchMaximized[32], tchZoom[32];
 
-        int ResX = GetSystemMetrics(SM_CXSCREEN);
-        int ResY = GetSystemMetrics(SM_CYSCREEN);
+        int ResX, ResY;
+        GetCurrentMonitorResolution(hwnd, &ResX, &ResY);
 
         StringCchPrintf(tchPosX,COUNTOF(tchPosX),L"%ix%i PosX",ResX,ResY);
         StringCchPrintf(tchPosY,COUNTOF(tchPosY),L"%ix%i PosY",ResX,ResY);
@@ -6796,8 +6799,7 @@ void GetFindPatternMB(LPSTR chFindPattern, size_t bufferSize)
 //
 void LoadSettings()
 {
-  int const cchIniSection = INISECTIONBUFCNT * HUGE_BUFFER;
-
+  int const cchIniSection = INISECTIONBUFCNT * 1024;
   WCHAR *pIniSection = AllocMem(sizeof(WCHAR) * cchIniSection, HEAP_ZERO_MEMORY);
   
   if (pIniSection) 
@@ -7053,7 +7055,7 @@ void LoadSettings()
     GET_INT_VALUE_FROM_INISECTION(PrintFooter, 0, 0, 1);
     GET_INT_VALUE_FROM_INISECTION(PrintColorMode, 3, 0, 4);
 
-    int const zoomScale  = float2int(1000.0f / INITIAL_BASE_FONT_SIZE);
+    int const zoomScale  = float2int(1000.0f / GetBaseFontSize(Globals.hwndMain));
     Defaults.PrintZoom = (s_iSettingsVersion < CFG_VER_0001) ? (zoomScale / 10) : zoomScale;
     int iPrintZoom = clampi(IniSectionGetInt(pIniSection, L"PrintZoom", Defaults.PrintZoom), 0, SC_MAX_ZOOM_LEVEL);
     if (s_iSettingsVersion < CFG_VER_0001) { iPrintZoom = 100 + (iPrintZoom - 10) * 10; }
@@ -7151,19 +7153,20 @@ void LoadSettings()
     IniSectionGetString(pIniSection, L"BitmapDisabled", L"",
                         s_tchToolbarBitmapDisabled, COUNTOF(s_tchToolbarBitmap));
 
-    int const ResX = GetSystemMetrics(SM_CXSCREEN);
-    int const ResY = GetSystemMetrics(SM_CYSCREEN);
 
     // --------------------------------------------------------------------------
     LoadIniSection(L"Window", pIniSection, cchIniSection);
     // --------------------------------------------------------------------------
 
+    int ResX, ResY;
+    GetCurrentMonitorResolution(Globals.hwndMain, &ResX, &ResY);
+
     WCHAR tchHighDpiToolBar[32] = { L'\0' };
     StringCchPrintf(tchHighDpiToolBar, COUNTOF(tchHighDpiToolBar), L"%ix%i HighDpiToolBar", ResX, ResY);
     s_iToolBarTheme = IniSectionGetInt(pIniSection, tchHighDpiToolBar, -1);
     s_iToolBarTheme = StrIsNotEmpty(s_tchToolbarBitmap) ? 2 : clampi(s_iToolBarTheme, -1, 1);
     if (s_iToolBarTheme < 0) { // undefined: determine high DPI (higher than Full-HD)
-      s_iToolBarTheme = IsFullHDOrHigher(ResX, ResY) ? 1 : 0;
+      s_iToolBarTheme = IsFullHDOrHigher(Globals.hwndMain, ResX, ResY) ? 1 : 0;
     }
 
     // --------------------------------------------------------------
@@ -7304,7 +7307,7 @@ void SaveSettings(bool bSaveSettingsNow)
   GetLngString(IDS_MUI_SAVINGSETTINGS, tchMsg, COUNTOF(tchMsg));
   BeginWaitCursor(tchMsg);
 
-  int const cchIniSection = INISECTIONBUFCNT * HUGE_BUFFER;
+  int const cchIniSection = INISECTIONBUFCNT * 1024;
   WCHAR *pIniSection = AllocMem(sizeof(WCHAR) * cchIniSection, HEAP_ZERO_MEMORY);
 
   if (pIniSection) 
@@ -7477,8 +7480,8 @@ void SaveSettings(bool bSaveSettingsNow)
   // Scintilla Styles
   Style_Save();
 
-  int ResX = GetSystemMetrics(SM_CXSCREEN);
-  int ResY = GetSystemMetrics(SM_CYSCREEN);
+  int ResX, ResY;
+  GetCurrentMonitorResolution(Globals.hwndMain, &ResX, &ResY);
 
   WCHAR tchHighDpiToolBar[32];
   StringCchPrintf(tchHighDpiToolBar,COUNTOF(tchHighDpiToolBar),L"%ix%i HighDpiToolBar", ResX, ResY);
@@ -7925,8 +7928,7 @@ void ParseCommandLine()
 //
 void LoadFlags()
 {
-  int const cchIniSection = INISECTIONBUFCNT * HUGE_BUFFER;
-
+  int const cchIniSection = INISECTIONBUFCNT * 1024;
   WCHAR *pIniSection = AllocMem(sizeof(WCHAR) * cchIniSection, HEAP_ZERO_MEMORY);
 
   if (pIniSection) 
diff --git a/src/Styles.c b/src/Styles.c
index d5ea6d64f..45c762e0b 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -226,7 +226,7 @@ float Style_GetCurrentFontSize()
 void Style_Load()
 {
 
-  float const fBFS = INITIAL_BASE_FONT_SIZE;
+  float const fBFS = GetBaseFontSize(Globals.hwndMain);
   _SetBaseFontSize(fBFS);
   _SetCurrentFontSize(fBFS);
 
@@ -603,7 +603,7 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew)
   //~Style_SetACPfromCharSet(hwnd);
 
   // ---  apply/init  default style  ---
-  float const fBFS = INITIAL_BASE_FONT_SIZE;
+  float const fBFS = GetBaseFontSize(Globals.hwndMain);
   _SetBaseFontSize(fBFS);
   _SetCurrentFontSize(fBFS);
   const WCHAR* const wchStandardStyleStrg = s_pLexCurrent->Styles[STY_DEFAULT].szValue;
@@ -2390,7 +2390,7 @@ bool Style_SelectFont(HWND hwnd,LPWSTR lpszStyle,int cchStyle, LPCWSTR sLexerNam
   // is "size:" definition relative ?
   bool const bRelFontSize = (!StrStrI(lpszStyle, L"size:") || StrStrI(lpszStyle, L"size:+") || StrStrI(lpszStyle, L"size:-"));
 
-  float const fBFS = INITIAL_BASE_FONT_SIZE;
+  float const fBFS = GetBaseFontSize(Globals.hwndMain);
   float const fBaseFontSize = (bGlobalDefaultStyle ? fBFS : (bCurrentDefaultStyle ? Style_GetBaseFontSize() : Style_GetCurrentFontSize()));
 
   // Font Height
diff --git a/src/TypeDefs.h b/src/TypeDefs.h
index 9b6ec7a6c..ba8daa74a 100644
--- a/src/TypeDefs.h
+++ b/src/TypeDefs.h
@@ -82,7 +82,6 @@ typedef struct _wi
 
 #define INIT_WININFO { CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, false, 100 }
 
-
 inline RECT RectFromWinInfo(const WININFO* const pWinInfo) {
   RECT rc; SetRect(&rc, pWinInfo->x, pWinInfo->y, pWinInfo->x + pWinInfo->cx, pWinInfo->y + pWinInfo->cy); return rc;
 }