diff --git a/autotest/SvoValue/SvoValue.h b/autotest/SvoValue/SvoValue.h
index 78fcbb409..e4ba60305 100644
--- a/autotest/SvoValue/SvoValue.h
+++ b/autotest/SvoValue/SvoValue.h
@@ -68,6 +68,17 @@ void CheckType(const T& x, bool checkhash = false)
 				RDUMP(ValueMap(vf));
 				ASSERT(ValueMap(vf) == ValueMap(x));
 			}
+			else
+			if(tt.Is<Drawing>()) {
+				PaintingPainter dw1(100, 100), dw2(100, 100);
+				dw1.DrawDrawing(0, 0, tt);
+				dw2.DrawDrawing(0, 0, vf);
+				Painting a = dw1.GetResult();
+				Painting b = dw2.GetResult();
+			//	DDUMPHEX(StoreAsString(a));
+			//	DDUMPHEX(StoreAsString(b));
+				ASSERT(a == b);
+			}
 			else {
 				RDUMP(vf.To<T>());
 				ASSERT(vf.To<T>() == x);
diff --git a/uppsrc/Core/CharSet.h b/uppsrc/Core/CharSet.h
index f3d953cd1..9fcf69e61 100644
--- a/uppsrc/Core/CharSet.h
+++ b/uppsrc/Core/CharSet.h
@@ -10,7 +10,6 @@ enum {
 #define  CHARSET_TOASCII      253
 #define  CHARSET_UTF32        254 // auxilary
 #define  CHARSET_UTF8         255
-#define  CHARSET_UNICODE      255
 
 enum {
 	DEFAULTCHAR = 0x1f
diff --git a/uppsrc/Core/src.tpp/CharSet_en-us.tpp b/uppsrc/Core/src.tpp/CharSet_en-us.tpp
index 5a9d59449..81904ce5f 100644
--- a/uppsrc/Core/src.tpp/CharSet_en-us.tpp
+++ b/uppsrc/Core/src.tpp/CharSet_en-us.tpp
@@ -58,8 +58,7 @@ value of parameter). Guaranteed to be equal to 0.&]
 [s3; &]
 [s4; &]
 [s5;:CHARSET`_UTF8: [* CHARSET`_UTF8]&]
-[s5;:CHARSET`_UNICODE: [* CHARSET`_UNICODE]&]
-[s2;%% These are equal and mean UTF`-8 encoding.&]
+[s2;%% UTF`-8 encoding.&]
 [s3;%% &]
 [s4; &]
 [s5;:DEFAULTCHAR: [@(0.0.255) enum]_[* DEFAULTCHAR]_`=_[@3 0]x1f_&]
diff --git a/uppsrc/Draw/Drawing.cpp b/uppsrc/Draw/Drawing.cpp
index be677224a..088275185 100644
--- a/uppsrc/Draw/Drawing.cpp
+++ b/uppsrc/Draw/Drawing.cpp
@@ -561,7 +561,7 @@ void Draw::DrawDrawingOp(const Rect& target, const Drawing& w) {
 					text = WString(txt, n);
 				}
 				else
-				if(cs == CHARSET_UNICODE) { // backward compatibility
+				if(cs == CHARSET_UTF8) { // backward compatibility "CHARSET_UNICODE"
 					Buffer<char16> txt(n);
 					ps.Stream::GetW(txt, n);
 					text = ToUtf32(txt, n);