diff --git a/app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java b/app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java
index f03bbf47..8ce9770e 100644
--- a/app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java
+++ b/app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java
@@ -222,7 +222,6 @@ public void run() {
                 logi("BLEPairResult " + result);
                 switch ( result) {
                     case Found:
-                        updateOnScanFound();
 //                        We need to connect even if bonded, to get resultHardwareVersion
 //                        if ( getBLEPair().resultDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
 //                            logi("scan found device already paired");
@@ -236,9 +235,6 @@ public void run() {
                             popupPairingFailed();
                         }
                         break;
-                    case Connected:
-                        updateOnConnected();
-                        break;
                     case Paired:
                         handlePairingSuccessful();
                         break;
@@ -252,6 +248,7 @@ public void run() {
                         popupPairingFailed();
                         break;
                     default:
+                        // Connected and None case are not specifically handled
                         break;
                 }
             }
@@ -1062,40 +1059,6 @@ private void updatePairedDeviceCard() {
         logi("updatePairedDeviceCard End");
     }
 
-    private void updateOnScanFound() {
-        logi("updateOnScanFound");
-        TextView textView = (TextView) findViewById(R.id.search_microbit_step_3_title);
-        TextView tvSearchingStep = (TextView) findViewById(R.id.searching_microbit_step);
-        if (textView != null) {
-            textView.setText(getString(R.string.searchingTitle));
-            //findViewById(R.id.searching_progress_spinner).setVisibility(View.GONE);
-            ((GifImageView) findViewById(R.id.searching_microbit_found_giffview))
-                    .setImageResource(R.drawable.emoji_microbit_found);
-//            if (currentOrientation == Configuration.ORIENTATION_LANDSCAPE) {
-//                tvSearchingStep.setText(R.string.searching_microbit_found_message_one_line);
-//            } else {
-//                tvSearchingStep.setText(R.string.searching_microbit_found_message);
-//            }
-        }
-    }
-
-    private void updateOnConnected() {
-        logi("updateOnConnected");
-        TextView textView = (TextView) findViewById(R.id.search_microbit_step_3_title);
-        TextView tvSearchingStep = (TextView) findViewById(R.id.searching_microbit_step);
-        if (textView != null) {
-            textView.setText(getString(R.string.searchingTitle));
-            findViewById(R.id.searching_progress_spinner).setVisibility(View.GONE);
-            ((GifImageView) findViewById(R.id.searching_microbit_found_giffview))
-                    .setImageResource(R.drawable.emoji_microbit_found);
-            if (currentOrientation == Configuration.ORIENTATION_LANDSCAPE) {
-                tvSearchingStep.setText(R.string.searching_microbit_found_message_one_line);
-            } else {
-                tvSearchingStep.setText(R.string.searching_microbit_found_message);
-            }
-        }
-    }
-
     /**
      * Displays needed screen according to a pairing state and
      * allows to navigate through the connection screens.
diff --git a/app/src/main/res/drawable-mdpi/emoji_microbit_found.gif b/app/src/main/res/drawable-mdpi/emoji_searching_microbit.gif
similarity index 100%
rename from app/src/main/res/drawable-mdpi/emoji_microbit_found.gif
rename to app/src/main/res/drawable-mdpi/emoji_searching_microbit.gif
diff --git a/app/src/main/res/layout-land/view_pairing_searching.xml b/app/src/main/res/layout-land/view_pairing_searching.xml
index ac3d396d..03e11e4c 100644
--- a/app/src/main/res/layout-land/view_pairing_searching.xml
+++ b/app/src/main/res/layout-land/view_pairing_searching.xml
@@ -33,7 +33,7 @@
                 android:layout_width="@dimen/pairing_step_1_gif_image_width"
                 android:layout_height="@dimen/pairing_step_1_gif_image_height"
                 android:layout_below="@id/search_microbit_step_3_title"
-                android:src="@drawable/pairing_pin_screen_two" />
+                android:src="@drawable/emoji_searching_microbit" />
         </RelativeLayout>
 
         <RelativeLayout
diff --git a/app/src/main/res/layout-land/view_pairing_searching_step.xml b/app/src/main/res/layout-land/view_pairing_searching_step.xml
index be5cb26b..5532ee37 100644
--- a/app/src/main/res/layout-land/view_pairing_searching_step.xml
+++ b/app/src/main/res/layout-land/view_pairing_searching_step.xml
@@ -13,6 +13,6 @@
         style="@style/pairing_step_tip_text_style"
         android:layout_marginBottom="@dimen/pairing_step_tip_title_margin_bottom"
         android:textSize="@dimen/pairing_step_title_text_size"
-        android:text="@string/searching_tip_step_text_one_line" />
+        android:text="@string/searching_microbit_found_message" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-port/view_pairing_searching_step.xml b/app/src/main/res/layout-sw600dp-port/view_pairing_searching_step.xml
index e6cc6907..90cd6df5 100644
--- a/app/src/main/res/layout-sw600dp-port/view_pairing_searching_step.xml
+++ b/app/src/main/res/layout-sw600dp-port/view_pairing_searching_step.xml
@@ -15,7 +15,7 @@
         <TextView
             android:id="@+id/searching_microbit_step"
             style="@style/pairing_step_tip_text_style"
-            android:text="@string/searching_tip_step_text" />
+            android:text="@string/searching_microbit_found_message" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/view_pairing_searching.xml b/app/src/main/res/layout/view_pairing_searching.xml
index 19c0e9be..5479f127 100644
--- a/app/src/main/res/layout/view_pairing_searching.xml
+++ b/app/src/main/res/layout/view_pairing_searching.xml
@@ -37,7 +37,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/searching_progress_spinner"
             android:layout_centerHorizontal="true"
-            android:src="@drawable/pairing_pin_screen_two" />
+            android:src="@drawable/emoji_searching_microbit" />
     </RelativeLayout>
 
     <include layout="@layout/view_pairing_searching_step" />
diff --git a/app/src/main/res/layout/view_pairing_searching_step.xml b/app/src/main/res/layout/view_pairing_searching_step.xml
index f186b6df..9d1e0fe9 100644
--- a/app/src/main/res/layout/view_pairing_searching_step.xml
+++ b/app/src/main/res/layout/view_pairing_searching_step.xml
@@ -15,7 +15,7 @@
             android:id="@+id/searching_microbit_step"
             style="@style/pairing_step_tip_text_style"
             android:paddingEnd="@dimen/pairing_step_searching_tip_text_padding_end"
-            android:text="@string/searching_tip_step_text" />
+            android:text="@string/searching_microbit_found_message" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76bffe7a..45a2d797 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -161,8 +161,7 @@
     <string name="desc_step_connect_tip_text_step_four_text">When you see the success message, press RESET and you\'re done!</string>
     <string name="desc_step_connect_tip_text_step_three">Step 3</string>
     <string name="desc_step_connect_tip_text_step_four">Step 4</string>
-    <string name="searching_microbit_found_message">Choose Pair (or Pair &amp; connect)\n in the notification you will receive.</string>
-    <string name="searching_microbit_found_message_one_line">Choose Pair (or Pair &amp; connect) in the notification you will receive.</string>
+    <string name="searching_microbit_found_message">Choose Pair (or Pair &amp; connect) in the notification you will receive.</string>
     <string name="step_connect_tip_text_step_two">Step 2</string>
     <string name="connect_tip_text">Hold the A and B buttons then press and release RESET. Keep holding A and B until the screen fills up</string>
     <string name="desc_connect_tip_text">Hold the A and B buttons then press and release RESET. Keep holding A and B until the screen fills up</string>