diff --git a/OCH/charter/passenger/src/main/res/layout/charter_p_statusview_datetime.xml b/OCH/charter/passenger/src/main/res/layout/charter_p_statusview_datetime.xml
index ece186e532..2cc4daa0a8 100644
--- a/OCH/charter/passenger/src/main/res/layout/charter_p_statusview_datetime.xml
+++ b/OCH/charter/passenger/src/main/res/layout/charter_p_statusview_datetime.xml
@@ -57,6 +57,7 @@
         android:layout_width="wrap_content"
         android:layout_height="@dimen/dp_34"
         app:layout_constraintTop_toTopOf="parent"
+        app:wifi_size="22dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         android:layout_gravity="center"
diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
index 6273398549..033d0417ff 100644
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
@@ -17,7 +17,9 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.Group;
+import androidx.core.content.ContextCompat;
 
+import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.mvp.Presenter;
@@ -344,9 +346,9 @@ public abstract class BaseShuttleTabFragment<V extends IView, P extends Presente
             public void run() {
                 tvArrived.setEnabled(isClickable);
                 if (isClickable) {
-                    tvArrived.setTextColor(getResources().getColor(R.color.bus_white));
+                    tvArrived.setTextColor(ContextCompat.getColor(AbsMogoApplication.getApp(),R.color.bus_white));
                 } else {
-                    tvArrived.setTextColor(getResources().getColor(R.color.bus_arrived_btn_un_clickable_color));
+                    tvArrived.setTextColor(ContextCompat.getColor(AbsMogoApplication.getApp(),R.color.bus_arrived_btn_un_clickable_color));
                 }
             }
         }, UiThreadHandler.MODE.QUEUE);