diff --git a/app/src/main/res/layout/list_comment_item.xml b/app/src/main/res/layout/list_comment_item.xml
index 26fcc9727..3e0cce2e7 100644
--- a/app/src/main/res/layout/list_comment_item.xml
+++ b/app/src/main/res/layout/list_comment_item.xml
@@ -15,10 +15,9 @@
         android:layout_width="42dp"
         android:layout_height="42dp"
         android:layout_alignParentStart="true"
-        android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:layout_marginLeft="3dp"
-        android:layout_marginRight="@dimen/comment_item_avatar_right_margin"
+        android:layout_marginStart="3dp"
+        android:layout_marginEnd="@dimen/comment_item_avatar_right_margin"
         android:focusable="false"
         android:src="@drawable/placeholder_person"
         app:shapeAppearance="@style/CircularImageView"
@@ -29,7 +28,7 @@
         android:layout_width="@dimen/video_item_detail_pinned_image_width"
         android:layout_height="@dimen/video_item_detail_pinned_image_height"
         android:layout_alignParentTop="true"
-        android:layout_marginRight="@dimen/video_item_detail_pinned_right_margin"
+        android:layout_marginEnd="@dimen/video_item_detail_pinned_right_margin"
         android:layout_toEndOf="@+id/itemThumbnailView"
         android:contentDescription="@string/detail_pinned_comment_view_description"
         android:src="@drawable/ic_pin"
@@ -56,18 +55,16 @@
         android:layout_below="@id/itemTitleView"
         android:layout_marginBottom="@dimen/channel_item_description_to_details_margin"
         android:layout_toEndOf="@+id/itemThumbnailView"
-        android:layout_toRightOf="@+id/itemThumbnailView"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textSize="@dimen/comment_item_content_text_size"
         tools:text="Comment Content, Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blandit" />
 
-
     <ImageView
         android:id="@+id/detail_thumbs_up_img_view"
         android:layout_width="@dimen/video_item_detail_like_image_width"
         android:layout_height="@dimen/video_item_detail_like_image_height"
         android:layout_below="@id/itemCommentContentView"
-        android:layout_toRightOf="@+id/itemThumbnailView"
+        android:layout_toEndOf="@+id/itemThumbnailView"
         android:contentDescription="@string/detail_likes_img_view_description"
         android:src="@drawable/ic_thumb_up" />
 
@@ -76,8 +73,8 @@
         android:layout_width="wrap_content"
         android:layout_height="@dimen/video_item_detail_like_image_height"
         android:layout_below="@id/itemCommentContentView"
-        android:layout_marginLeft="@dimen/video_item_detail_like_margin"
-        android:layout_toRightOf="@id/detail_thumbs_up_img_view"
+        android:layout_marginStart="@dimen/video_item_detail_like_margin"
+        android:layout_toEndOf="@id/detail_thumbs_up_img_view"
         android:lines="1"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textSize="@dimen/video_item_detail_likes_text_size"
@@ -89,8 +86,8 @@
         android:layout_width="@dimen/video_item_detail_heart_image_size"
         android:layout_height="@dimen/video_item_detail_heart_image_size"
         android:layout_below="@id/itemCommentContentView"
-        android:layout_marginLeft="@dimen/video_item_detail_heart_margin"
-        android:layout_toRightOf="@+id/detail_thumbs_up_count_view"
+        android:layout_marginStart="@dimen/video_item_detail_heart_margin"
+        android:layout_toEndOf="@+id/detail_thumbs_up_count_view"
         android:contentDescription="@string/detail_heart_img_view_description"
         android:src="@drawable/ic_heart"
         android:visibility="gone"