diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc
index 40c94c68..417106ac 100644
--- a/PowerEditor/src/Notepad_plus.rc
+++ b/PowerEditor/src/Notepad_plus.rc
@@ -598,17 +598,18 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 271, 240
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_BORDER | WS_SYSMENU
 FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x1
 BEGIN
-    LTEXT           NOTEPAD_PLUS_VERSION, IDC_STATIC,60,16,65,11
-    LTEXT           UNICODE_ANSI_MODE, IDC_STATIC,130,16,65,11
-    GROUPBOX        "GNU General Public Licence",IDC_STATIC,19,75,231,131,BS_CENTER
-    DEFPUSHBUTTON   "Ok",IDOK,106,215,50,14,BS_FLAT,WS_EX_STATICEDGE
-    LTEXT           "Author :",IDC_STATIC,21,41,31,8
-    LTEXT           "Notepad++ team",IDC_AUTHOR_NAME,78,41,70,8
-    LTEXT           "Home Page :",IDC_STATIC,21,54,47,8
-    LTEXT           "http://notepad-plus.sourceforge.net/",IDC_HOME_ADDR,78,54,126,8
-    EDITTEXT        IDC_LICENCE_EDIT,31,99,209,96,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
     EDITTEXT        IDC_BUILD_DATETIME,150,2,150,10, ES_READONLY | NOT WS_BORDER
     CONTROL         "",IDI_CHAMELEON,"Static",SS_OWNERDRAW,20,5,64,64
+    LTEXT           NOTEPAD_PLUS_VERSION, IDC_STATIC,70,20,65,11
+    LTEXT           UNICODE_ANSI_MODE, IDC_STATIC,140,20,65,11
+    LTEXT           "Author :",IDC_STATIC,21,45,31,8
+    LTEXT           "Notepad++ team",IDC_AUTHOR_NAME,78,45,70,8
+    LTEXT           "Home Page :",IDC_STATIC,21,59,47,8
+    LTEXT           "http://notepad-plus.sourceforge.net/",IDC_HOME_ADDR,78,59,126,8
+    GROUPBOX        "GNU General Public Licence",IDC_STATIC,19,75,231,131,BS_CENTER
+    DEFPUSHBUTTON   "Ok",IDOK,106,215,50,14,BS_FLAT,WS_EX_STATICEDGE
+	// IDC_LICENCE_EDIT should be the last line, don't know why
+    EDITTEXT        IDC_LICENCE_EDIT,31,99,209,96,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL
 END
 
 IDD_GOLINE DIALOGEX 26, 41, 261, 88
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
index afaccdfb..7a456f49 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
@@ -684,6 +684,7 @@ protected:
 
 
 	void setSqlLexer() {
+		execute(SCI_SETPROPERTY, (WPARAM)"sql.backslash.escapes", (LPARAM)"1");
 		setLexer(SCLEX_SQL, L_SQL, LIST_0);
 	};
 
diff --git a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
index 660fbcfd..b27c5e8f 100644
--- a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
+++ b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
@@ -70,9 +70,9 @@ BOOL CALLBACK AboutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
 
 		case WM_DRAWITEM :
 		{
-			HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_CHAMELEON), IMAGE_ICON, 48, 48, LR_DEFAULTSIZE);
+			HICON hIcon = (HICON)::LoadImage(_hInst, MAKEINTRESOURCE(IDI_CHAMELEON), IMAGE_ICON, 64, 64, LR_DEFAULTSIZE);
 			DRAWITEMSTRUCT *pdis = (DRAWITEMSTRUCT *)lParam;
-			::DrawIconEx(pdis->hDC, 0, 0, hIcon, 48, 48, 0, NULL, DI_NORMAL);
+			::DrawIconEx(pdis->hDC, 0, 0, hIcon, 64, 64, 0, NULL, DI_NORMAL);
 			return TRUE;
 		}
 
diff --git a/PowerEditor/src/icons/chameleon.ico b/PowerEditor/src/icons/chameleon.ico
index 3a38506a..636c56c5 100644
Binary files a/PowerEditor/src/icons/chameleon.ico and b/PowerEditor/src/icons/chameleon.ico differ
diff --git a/scintilla/src/LexUser.cxx b/scintilla/src/LexUser.cxx
index 4570dbe0..9ec6b2cd 100644
--- a/scintilla/src/LexUser.cxx
+++ b/scintilla/src/LexUser.cxx
@@ -53,12 +53,13 @@ static int cmpString(const void *a1, const void *a2) {
 	return strcmp(*(char**)(a1), *(char**)(a2));
 }
 
+/*
 static int cmpStringNoCase(const void *a1, const void *a2) {
 	// Can't work out the correct incantation to use modern casts here
 	return CompareCaseInsensitive(*(char**)(a1), *(char**)(a2));
 
 }
-
+*/
 
 static bool isInList(WordList & list, const char *s, bool specialMode, bool ignoreCase) 
 {