diff --git a/app/src/main/res/layout/fragment_achievements.xml b/app/src/main/res/layout/fragment_achievements.xml
index b3313d4dc..f07a0118c 100644
--- a/app/src/main/res/layout/fragment_achievements.xml
+++ b/app/src/main/res/layout/fragment_achievements.xml
@@ -87,29 +87,40 @@
             android:layout_marginRight="@dimen/activity_margin_horizontal"
             android:layout_marginStart="@dimen/activity_margin_horizontal">
 
-            <TextView
-              style="?android:textAppearanceMedium"
+
+            <LinearLayout
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_marginLeft="@dimen/activity_margin_horizontal"
-              android:layout_marginStart="@dimen/activity_margin_horizontal"
-              android:id="@+id/images_upload_text_param"
-              android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
-              android:text="@string/images_uploaded" />
-
-            <ImageView
-              android:layout_width="@dimen/quarter_standard_height"
-              android:layout_height="@dimen/quarter_standard_height"
               android:id="@+id/images_upload_info"
-              android:layout_marginTop="@dimen/activity_margin_horizontal"
-              android:layout_marginRight="@dimen/activity_margin_horizontal"
-              android:layout_marginEnd="@dimen/activity_margin_horizontal"
-              android:layout_toRightOf="@+id/images_upload_text_param"
-              android:layout_toEndOf="@+id/images_upload_text_param"
-              app:srcCompat="@drawable/ic_info_outline_24dp"
-              android:tint="@color/primaryDarkColor"
-              android:layout_marginLeft="@dimen/activity_margin_horizontal"
-              android:layout_marginStart="@dimen/activity_margin_horizontal"/>
+              android:orientation="horizontal"
+              >
+
+              <TextView
+                style="?android:textAppearanceMedium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                android:layout_marginStart="@dimen/activity_margin_horizontal"
+                android:id="@+id/images_upload_text_param"
+                android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
+                android:text="@string/images_uploaded" />
+
+              <ImageView
+                android:layout_width="@dimen/quarter_standard_height"
+                android:layout_height="@dimen/quarter_standard_height"
+                android:layout_marginTop="@dimen/activity_margin_horizontal"
+                android:layout_marginRight="@dimen/activity_margin_horizontal"
+                android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                android:layout_toRightOf="@+id/images_upload_text_param"
+                android:layout_toEndOf="@+id/images_upload_text_param"
+                app:srcCompat="@drawable/ic_info_outline_24dp"
+                android:tint="@color/primaryDarkColor"
+                android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                android:layout_marginStart="@dimen/activity_margin_horizontal"/>
+
+            </LinearLayout>
+
+
 
             <com.dinuscxj.progressbar.CircleProgressBar
               android:layout_width="@dimen/dimen_40"
@@ -141,28 +152,38 @@
             android:layout_marginRight="@dimen/activity_margin_horizontal"
             android:layout_marginStart="@dimen/activity_margin_horizontal">
 
-            <TextView
-              style="?android:textAppearanceMedium"
+            <LinearLayout
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_marginLeft="@dimen/activity_margin_horizontal"
-              android:id="@+id/images_reverted_text"
-              android:layout_marginStart="@dimen/activity_margin_horizontal"
-              android:text="@string/image_reverts" />
-
-            <ImageView
-              android:layout_width="@dimen/medium_width"
-              android:layout_height="@dimen/medium_height"
-              android:layout_marginTop="@dimen/activity_margin_horizontal"
-              android:layout_marginRight="@dimen/activity_margin_horizontal"
-              android:layout_marginEnd="@dimen/activity_margin_horizontal"
               android:id="@+id/images_reverted_info"
-              android:layout_toRightOf="@+id/images_reverted_text"
-              android:layout_toEndOf="@+id/images_reverted_text"
-              app:srcCompat="@drawable/ic_info_outline_24dp"
-              android:tint="@color/primaryDarkColor"
-              android:layout_marginLeft="@dimen/activity_margin_horizontal"
-              android:layout_marginStart="@dimen/activity_margin_horizontal"/>
+              android:orientation="horizontal"
+              >
+
+              <TextView
+                style="?android:textAppearanceMedium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                android:id="@+id/images_reverted_text"
+                android:layout_marginStart="@dimen/activity_margin_horizontal"
+                android:text="@string/image_reverts" />
+
+              <ImageView
+                android:layout_width="@dimen/medium_width"
+                android:layout_height="@dimen/medium_height"
+                android:layout_marginTop="@dimen/activity_margin_horizontal"
+                android:layout_marginRight="@dimen/activity_margin_horizontal"
+                android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                android:layout_toRightOf="@+id/images_reverted_text"
+                android:layout_toEndOf="@+id/images_reverted_text"
+                app:srcCompat="@drawable/ic_info_outline_24dp"
+                android:tint="@color/primaryDarkColor"
+                android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                android:layout_marginStart="@dimen/activity_margin_horizontal"/>
+
+            </LinearLayout>
+
+
 
             <TextView
               android:layout_width="wrap_content"
@@ -172,7 +193,7 @@
               android:id="@+id/images_revert_limit_text"
               android:layout_marginLeft="@dimen/activity_margin_horizontal"
               android:layout_marginStart="@dimen/activity_margin_horizontal"
-              android:layout_below="@+id/images_reverted_text"/>
+              android:layout_below="@id/images_reverted_info"/>
 
             <com.dinuscxj.progressbar.CircleProgressBar
               android:layout_width="@dimen/dimen_40"
@@ -205,29 +226,36 @@
             android:layout_marginRight="@dimen/activity_margin_horizontal"
             android:layout_marginStart="@dimen/activity_margin_horizontal">
 
-            <TextView
-              style="?android:textAppearanceMedium"
+            <LinearLayout
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:id="@+id/images_used_by_wiki_text"
-              android:layout_marginLeft="@dimen/activity_margin_horizontal"
-              android:layout_marginStart="@dimen/activity_margin_horizontal"
-              android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
-              android:text="@string/images_used_by_wiki" />
-
-            <ImageView
-              android:layout_width="@dimen/medium_width"
-              android:layout_height="@dimen/medium_height"
               android:id="@+id/images_used_by_wiki_info"
-              android:layout_marginTop="@dimen/activity_margin_horizontal"
-              android:layout_marginRight="@dimen/activity_margin_horizontal"
-              android:layout_marginEnd="@dimen/activity_margin_horizontal"
-              android:layout_toRightOf="@+id/images_used_by_wiki_text"
-              android:layout_toEndOf="@+id/images_used_by_wiki_text"
-              app:srcCompat="@drawable/ic_info_outline_24dp"
-              android:tint="@color/primaryDarkColor"
-              android:layout_marginLeft="@dimen/activity_margin_horizontal"
-              android:layout_marginStart="@dimen/activity_margin_horizontal"/>
+              android:orientation="horizontal">
+
+              <TextView
+                style="?android:textAppearanceMedium"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/images_used_by_wiki_text"
+                android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                android:layout_marginStart="@dimen/activity_margin_horizontal"
+                android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
+                android:text="@string/images_used_by_wiki" />
+
+              <ImageView
+                android:layout_width="@dimen/medium_width"
+                android:layout_height="@dimen/medium_height"
+                android:layout_marginTop="@dimen/activity_margin_horizontal"
+                android:layout_marginRight="@dimen/activity_margin_horizontal"
+                android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                android:layout_toRightOf="@+id/images_used_by_wiki_text"
+                android:layout_toEndOf="@+id/images_used_by_wiki_text"
+                app:srcCompat="@drawable/ic_info_outline_24dp"
+                android:tint="@color/primaryDarkColor"
+                android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                android:layout_marginStart="@dimen/activity_margin_horizontal"/>
+
+            </LinearLayout>
 
             <com.dinuscxj.progressbar.CircleProgressBar
               android:layout_width="@dimen/dimen_40"
@@ -284,6 +312,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
+              android:id="@+id/images_nearby_info"
               android:layout_centerVertical="true"
               android:layout_alignParentStart="true"
               android:layout_alignParentLeft="true"
@@ -318,7 +347,6 @@
               <ImageView
                 android:layout_width="@dimen/medium_width"
                 android:layout_height="@dimen/medium_height"
-                android:id="@+id/images_nearby_info"
                 android:layout_marginTop="@dimen/activity_margin_horizontal"
                 android:layout_marginRight="@dimen/activity_margin_horizontal"
                 android:layout_marginEnd="@dimen/activity_margin_horizontal"
@@ -361,6 +389,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
+              android:id="@+id/images_featured_info"
               android:layout_centerVertical="true"
               android:layout_alignParentStart="true"
               android:layout_alignParentLeft="true"
@@ -396,7 +425,6 @@
               <ImageView
                 android:layout_width="@dimen/medium_width"
                 android:layout_height="@dimen/medium_height"
-                android:id="@+id/images_featured_info"
                 android:layout_marginTop="@dimen/activity_margin_horizontal"
                 android:layout_marginRight="@dimen/activity_margin_horizontal"
                 android:layout_marginEnd="@dimen/activity_margin_horizontal"
@@ -438,6 +466,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
+              android:id="@+id/quality_images_info"
               android:layout_centerVertical="true"
               android:layout_alignParentStart="true"
               android:layout_alignParentLeft="true"
@@ -473,7 +502,6 @@
               <ImageView
                 android:layout_width="@dimen/medium_width"
                 android:layout_height="@dimen/medium_height"
-                android:id="@+id/quality_images_info"
                 android:layout_marginTop="@dimen/activity_margin_horizontal"
                 android:layout_marginRight="@dimen/activity_margin_horizontal"
                 android:layout_marginEnd="@dimen/activity_margin_horizontal"
@@ -516,6 +544,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
+              android:id="@+id/thanks_received_info"
               android:layout_centerVertical="true"
               android:layout_alignParentStart="true"
               android:layout_alignParentLeft="true"
@@ -551,7 +580,6 @@
               <ImageView
                 android:layout_width="@dimen/medium_width"
                 android:layout_height="@dimen/medium_height"
-                android:id="@+id/thanks_received_info"
                 android:layout_marginTop="@dimen/activity_margin_horizontal"
                 android:layout_marginRight="@dimen/activity_margin_horizontal"
                 android:layout_marginEnd="@dimen/activity_margin_horizontal"