diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/HomeActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/HomeActivity.java
index a3fe975..499f847 100644
--- a/app/src/main/java/com/samsung/microbit/ui/activity/HomeActivity.java
+++ b/app/src/main/java/com/samsung/microbit/ui/activity/HomeActivity.java
@@ -188,7 +188,7 @@ private void setupDrawer() {
 
 
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
-                (Activity) this, (DrawerLayout) mDrawer, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+                this, mDrawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
 
         boolean shareStats = false;
         mPrefs = getSharedPreferences("com.samsung.microbit", MODE_PRIVATE);
diff --git a/app/src/main/res/layout-land/fetch_select.xml b/app/src/main/res/layout-land/fetch_select.xml
index 6f0f569..d56bb99 100644
--- a/app/src/main/res/layout-land/fetch_select.xml
+++ b/app/src/main/res/layout-land/fetch_select.xml
@@ -85,7 +85,7 @@
             android:layout_height="0dp"
             android:layout_gravity="center"
             android:gravity="center"
-            android:contentDescription="@null"
+            android:contentDescription="@string/fetch_works_with_micro_bit_v2_only"
             android:src="@drawable/v2only"/>
 
         <View
diff --git a/app/src/main/res/layout/fetch_select.xml b/app/src/main/res/layout/fetch_select.xml
index 00cd281..7c58442 100644
--- a/app/src/main/res/layout/fetch_select.xml
+++ b/app/src/main/res/layout/fetch_select.xml
@@ -68,7 +68,7 @@
         android:layout_height="0dp"
         android:layout_gravity="center"
         android:gravity="center"
-        android:contentDescription="@null"
+        android:contentDescription="@string/fetch_works_with_micro_bit_v2_only"
         android:src="@drawable/v2only"/>
 
     <View