diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java
index 93d4cf9..d94bda0 100644
--- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java
+++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java
@@ -218,16 +218,15 @@ public class MainActivity extends AppCompatActivity implements TasksFragment.Tas
     private void toggleTabLayoutArrows(int scrollX){
         // Hide left arrow when scrolled to the left
         View leftArrow = findViewById(R.id.left_arrow);
-        if (scrollX <= 1) leftArrow.setVisibility(View.GONE);
+        if (scrollX <= 1) leftArrow.setVisibility(View.INVISIBLE);
         else leftArrow.setVisibility(View.VISIBLE);
 
-        // TODO: hide right arrow when no need to scroll
         // Hide right arrow when scrolled to the right
         View rightArrow = findViewById(R.id.right_arrow);
         Point size = new Point();
         getWindowManager().getDefaultDisplay().getSize(size);
-        if (scrollX == tabLayout.getChildAt(0).getMeasuredWidth() - size.x)
-            rightArrow.setVisibility(View.GONE);
+        if (scrollX == tabLayout.getChildAt(0).getMeasuredWidth() - tabLayout.getMeasuredWidth())
+            rightArrow.setVisibility(View.INVISIBLE);
         else rightArrow.setVisibility(View.VISIBLE);
     }
 
diff --git a/DoNExt/app/src/main/res/layout/activity_main.xml b/DoNExt/app/src/main/res/layout/activity_main.xml
index 7fc86c5..f03173a 100644
--- a/DoNExt/app/src/main/res/layout/activity_main.xml
+++ b/DoNExt/app/src/main/res/layout/activity_main.xml
@@ -48,6 +48,10 @@
                 android:id="@+id/tabs"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/left_arrow"
+                android:layout_toEndOf="@+id/left_arrow"
+                android:layout_toLeftOf="@+id/right_arrow"
+                android:layout_toStartOf="@+id/right_arrow"
                 app:tabMode="scrollable" />
         </RelativeLayout>
     </android.support.design.widget.AppBarLayout>
@@ -65,5 +69,5 @@
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_margin"
         android:onClick="onNewTaskClick"
-        android:src="@android:drawable/ic_input_add" />
+        android:src="@drawable/ic_add_white_24dp" />
 </android.support.design.widget.CoordinatorLayout>