diff --git a/res/layout/candidates.xml b/res/layout/candidates.xml
index 39df81dd2..3af967fd2 100755
--- a/res/layout/candidates.xml
+++ b/res/layout/candidates.xml
@@ -21,7 +21,7 @@
 <com.android.inputmethod.latin.CandidateViewContainer
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="horizontal"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/keyboard_suggest_strip"
         >
@@ -29,21 +29,21 @@
     <LinearLayout
             android:id="@+id/candidate_left_parent"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:orientation="horizontal">
         <ImageButton
             android:id="@+id/candidate_left"
             android:background="@drawable/ic_suggest_scroll_background"
             android:src="@drawable/ic_suggest_strip_scroll_left_arrow" 
             android:layout_width="36dp"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:clickable="true"
             />
         
         <ImageView
             android:src="@drawable/keyboard_suggest_strip_divider"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             />
     </LinearLayout>
     
@@ -57,13 +57,13 @@
     <LinearLayout
             android:id="@+id/candidate_right_parent"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:clickable="true"
             android:orientation="horizontal">
         <ImageView
             android:src="@drawable/keyboard_suggest_strip_divider"
             android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             />
         
         <ImageButton
@@ -71,7 +71,7 @@
             android:background="@drawable/ic_suggest_scroll_background"
             android:src="@drawable/ic_suggest_strip_scroll_right_arrow" 
             android:layout_width="36dp"
-            android:layout_height="fill_parent"
+            android:layout_height="match_parent"
             android:clickable="true"
             />
     </LinearLayout>        
diff --git a/res/layout/input.xml b/res/layout/input.xml
index f2f30ca84..1d7c6f746 100755
--- a/res/layout/input.xml
+++ b/res/layout/input.xml
@@ -22,7 +22,7 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@android:id/keyboardView"
         android:layout_alignParentBottom="true"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/keyboard_background"
         android:keyBackground="@drawable/btn_keyboard_key"