diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
index a563efc7da..353af2b392 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
@@ -63,6 +63,14 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
         initMapView();
     }
 
+    @Override
+    public void onSaveInstanceState( @NonNull Bundle outState ) {
+        super.onSaveInstanceState( outState );
+        if ( mMogoMapView != null ) {
+            mMogoMapView.onSaveInstanceState( outState );
+        }
+    }
+
     @Override
     public void onPause() {
         super.onPause();
diff --git a/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png
new file mode 100644
index 0000000000..a4c313e353
Binary files /dev/null and b/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png differ
diff --git a/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png
new file mode 100644
index 0000000000..a4c313e353
Binary files /dev/null and b/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png differ
diff --git a/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png
new file mode 100644
index 0000000000..1de561aa65
Binary files /dev/null and b/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png differ
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png
new file mode 100644
index 0000000000..a4c313e353
Binary files /dev/null and b/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png differ
diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.xml
deleted file mode 100644
index 3b99489f77..0000000000
--- a/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#F710121E" />
-    <corners android:radius="@dimen/module_push_panel_corner" />
-</shape>
diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png
new file mode 100644
index 0000000000..245c2e855c
Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.9.png differ