diff --git a/src/add-ons/input_server/methods/canna/CannaInterface.cpp b/src/add-ons/input_server/methods/canna/CannaInterface.cpp
index 3cdbbeee54..1fb2af3be7 100644
--- a/src/add-ons/input_server/methods/canna/CannaInterface.cpp
+++ b/src/add-ons/input_server/methods/canna/CannaInterface.cpp
@@ -593,14 +593,14 @@ SERIAL_PRINT(( "CannaInterface: GenerateKouhoStr() revPos = %d, revLen = %d, mod
 			    && kouhoRevLine != -1)
 			|| current_mode == CANNA_MODE_TourokuDicMode
 			|| current_mode == CANNA_MODE_BushuMode) {
-			// remove first index
-			memmove(kouhoUTF, kouhoUTF + 2, kouhoUTFLen - 1);
+			// remove first index (3 bytes)
+			memmove(kouhoUTF, kouhoUTF + 3, kouhoUTFLen - 2);
 
-			// convert full-space to LF
+			// convert full width space and following 3 bytes index to LF
 			while ((index = strstr(kouhoUTF, "\xe3\x80\x80")) != NULL) {
 				*index = '\x0a';
 				len = strlen(index);
-				memmove(index + 1, index + 5, len - 4);
+				memmove(index + 1, index + 6, len - 5);
 			}
 			kouhoUTFLen = strlen(kouhoUTF);
 		}
diff --git a/src/add-ons/input_server/methods/canna/CannaLooper.cpp b/src/add-ons/input_server/methods/canna/CannaLooper.cpp
index 1d5641de49..db7fc806e4 100644
--- a/src/add-ons/input_server/methods/canna/CannaLooper.cpp
+++ b/src/add-ons/input_server/methods/canna/CannaLooper.cpp
@@ -109,8 +109,8 @@ CannaLooper::ReadSettings(char* basePath)
 
 	font_family family;
 	font_style style;
-	strcpy(family, "Haru");
-	strcpy(style, "Regular");
+	strcpy(family, "VL PGothic");
+	strcpy(style, "regular");
 
 	fKouhoFont.SetFamilyAndStyle(family, style);
 	fKouhoFont.SetSize(12);
diff --git a/src/add-ons/input_server/methods/canna/KouhoWindow.cpp b/src/add-ons/input_server/methods/canna/KouhoWindow.cpp
index 2bc2f46ff7..38cc36e6ea 100644
--- a/src/add-ons/input_server/methods/canna/KouhoWindow.cpp
+++ b/src/add-ons/input_server/methods/canna/KouhoWindow.cpp
@@ -33,8 +33,8 @@ KouhoWindow::KouhoWindow( BFont *font, BLooper *looper )
 
 	font_family family;
 	font_style style;
-	strcpy( family, "Haru" );
-	strcpy( style, "Regular" );
+	strcpy( family, "VL PGothic" );
+	strcpy( style, "regular" );
 	indexfont.SetFamilyAndStyle( family, style );
 	indexfont.SetSize( 10 );
 
@@ -271,8 +271,7 @@ void KouhoView::HighlightLine( int32 line )
 		highlightRect = region.RectAt( 0 );
 		//extend highlihght region to right end
 		highlightRect.right = Bounds().right;
-		Invalidate( highlightRect );
-
+		Invalidate();
 	}
 
 }