diff --git a/README.md b/README.md
index 0a3aa1c4..8f34a85b 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,10 @@
 [![Issues](https://img.shields.io/github/issues-raw/natario1/CameraView.svg)](https://github.com/natario1/CameraView/issues)
 [![Funding](https://img.shields.io/opencollective/all/CameraView.svg?colorB=r)](https://natario1.github.io/CameraView/extra/donate)
 
+&#10240;  <!-- Hack to add whitespace -->
 
 <p align="center">
-  <img src="docs/static/icon.png" vspace="10" width="250" height="250">
+  <img src="docs/static/banner.png" width="100%">
 </p>
 
 # CameraView
@@ -36,12 +37,14 @@ Read the [official website](https://natario1.github.io/CameraView) for setup ins
 You might also be interested in [changelog](https://natario1.github.io/CameraView/about/changelog.html)
 or in the [v1 migration guide](https://natario1.github.io/CameraView/extra/v1-migration-guide.html).
 
-<p>
-  <img src="docs/static/screen1.jpg" width="250" vspace="20" hspace="5">
-  <img src="docs/static/screen2.jpg" width="250" vspace="20" hspace="5">
-  <img src="docs/static/screen3.jpg" width="250" vspace="20" hspace="5">
+&#10240;  <!-- Hack to add whitespace -->
+
+<p align="center">
+  <img src="docs/static/screen1.png" width="250" hspace="5"><img src="docs/static/screen2.png" width="250" hspace="5"><img src="docs/static/screen3.png" width="250" hspace="5">
 </p>
 
+&#10240;  <!-- Hack to add whitespace -->
+
 If you like the project, use it with profit, or simply want to thank back, please consider [donating
 to the project](https://natario1.github.io/CameraView/extra/donate) now! You can either make a one time
 donation or become a sponsor, in which case your company logo will immediately show up here.
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index 00e973a9..77976f9a 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
     <application
         android:allowBackup="false"
-        android:icon="@mipmap/cameraview"
+        android:icon="@mipmap/logo"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
diff --git a/demo/src/main/ic_launcher-web.png b/demo/src/main/ic_launcher-web.png
deleted file mode 100644
index 3ff1c5ad..00000000
Binary files a/demo/src/main/ic_launcher-web.png and /dev/null differ
diff --git a/demo/src/main/res/layout/activity_camera.xml b/demo/src/main/res/layout/activity_camera.xml
index 714e8dfb..f36eac91 100644
--- a/demo/src/main/res/layout/activity_camera.xml
+++ b/demo/src/main/res/layout/activity_camera.xml
@@ -9,7 +9,6 @@
 
     <!-- Camera -->
     <com.otaliastudios.cameraview.CameraView
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/camera"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -35,14 +34,13 @@
         <!-- Watermark -->
         <ImageView
             android:id="@+id/watermark"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="72dp"
+            android:layout_height="72dp"
             android:layout_gravity="bottom|end"
             app:layout_drawOnPreview="true"
             app:layout_drawOnVideoSnapshot="true"
             app:layout_drawOnPictureSnapshot="true"
-            android:src="@mipmap/cameraview"
-            android:padding="8dp"/>
+            android:src="@mipmap/logo_foreground"/>
 
     </com.otaliastudios.cameraview.CameraView>
 
@@ -53,6 +51,7 @@
         android:layout_margin="16dp"
         android:layout_gravity="top|end"
         android:background="@drawable/background"
+        android:elevation="6dp"
         app:srcCompat="@drawable/ic_switch" />
 
     <!-- Controls -->
diff --git a/demo/src/main/res/mipmap-anydpi-v26/logo.xml b/demo/src/main/res/mipmap-anydpi-v26/logo.xml
new file mode 100644
index 00000000..df45a129
--- /dev/null
+++ b/demo/src/main/res/mipmap-anydpi-v26/logo.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/logo_background"/>
+    <foreground android:drawable="@mipmap/logo_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/demo/src/main/res/mipmap-hdpi/cameraview.png b/demo/src/main/res/mipmap-hdpi/cameraview.png
deleted file mode 100644
index 976baba8..00000000
Binary files a/demo/src/main/res/mipmap-hdpi/cameraview.png and /dev/null differ
diff --git a/demo/src/main/res/mipmap-hdpi/logo.png b/demo/src/main/res/mipmap-hdpi/logo.png
new file mode 100644
index 00000000..fbac9bc0
Binary files /dev/null and b/demo/src/main/res/mipmap-hdpi/logo.png differ
diff --git a/demo/src/main/res/mipmap-hdpi/logo_background.png b/demo/src/main/res/mipmap-hdpi/logo_background.png
new file mode 100644
index 00000000..22af45a3
Binary files /dev/null and b/demo/src/main/res/mipmap-hdpi/logo_background.png differ
diff --git a/demo/src/main/res/mipmap-hdpi/logo_foreground.png b/demo/src/main/res/mipmap-hdpi/logo_foreground.png
new file mode 100644
index 00000000..7ae9b406
Binary files /dev/null and b/demo/src/main/res/mipmap-hdpi/logo_foreground.png differ
diff --git a/demo/src/main/res/mipmap-mdpi/cameraview.png b/demo/src/main/res/mipmap-mdpi/cameraview.png
deleted file mode 100644
index b7a326cd..00000000
Binary files a/demo/src/main/res/mipmap-mdpi/cameraview.png and /dev/null differ
diff --git a/demo/src/main/res/mipmap-mdpi/logo.png b/demo/src/main/res/mipmap-mdpi/logo.png
new file mode 100644
index 00000000..c1a6c39b
Binary files /dev/null and b/demo/src/main/res/mipmap-mdpi/logo.png differ
diff --git a/demo/src/main/res/mipmap-mdpi/logo_background.png b/demo/src/main/res/mipmap-mdpi/logo_background.png
new file mode 100644
index 00000000..88ffec4d
Binary files /dev/null and b/demo/src/main/res/mipmap-mdpi/logo_background.png differ
diff --git a/demo/src/main/res/mipmap-mdpi/logo_foreground.png b/demo/src/main/res/mipmap-mdpi/logo_foreground.png
new file mode 100644
index 00000000..583ba997
Binary files /dev/null and b/demo/src/main/res/mipmap-mdpi/logo_foreground.png differ
diff --git a/demo/src/main/res/mipmap-xhdpi/cameraview.png b/demo/src/main/res/mipmap-xhdpi/cameraview.png
deleted file mode 100644
index 81965431..00000000
Binary files a/demo/src/main/res/mipmap-xhdpi/cameraview.png and /dev/null differ
diff --git a/demo/src/main/res/mipmap-xhdpi/logo.png b/demo/src/main/res/mipmap-xhdpi/logo.png
new file mode 100644
index 00000000..a4766714
Binary files /dev/null and b/demo/src/main/res/mipmap-xhdpi/logo.png differ
diff --git a/demo/src/main/res/mipmap-xhdpi/logo_background.png b/demo/src/main/res/mipmap-xhdpi/logo_background.png
new file mode 100644
index 00000000..e3d91073
Binary files /dev/null and b/demo/src/main/res/mipmap-xhdpi/logo_background.png differ
diff --git a/demo/src/main/res/mipmap-xhdpi/logo_foreground.png b/demo/src/main/res/mipmap-xhdpi/logo_foreground.png
new file mode 100644
index 00000000..9811118d
Binary files /dev/null and b/demo/src/main/res/mipmap-xhdpi/logo_foreground.png differ
diff --git a/demo/src/main/res/mipmap-xxhdpi/cameraview.png b/demo/src/main/res/mipmap-xxhdpi/cameraview.png
deleted file mode 100644
index 706d7738..00000000
Binary files a/demo/src/main/res/mipmap-xxhdpi/cameraview.png and /dev/null differ
diff --git a/demo/src/main/res/mipmap-xxhdpi/logo.png b/demo/src/main/res/mipmap-xxhdpi/logo.png
new file mode 100644
index 00000000..bfdd8329
Binary files /dev/null and b/demo/src/main/res/mipmap-xxhdpi/logo.png differ
diff --git a/demo/src/main/res/mipmap-xxhdpi/logo_background.png b/demo/src/main/res/mipmap-xxhdpi/logo_background.png
new file mode 100644
index 00000000..b342f295
Binary files /dev/null and b/demo/src/main/res/mipmap-xxhdpi/logo_background.png differ
diff --git a/demo/src/main/res/mipmap-xxhdpi/logo_foreground.png b/demo/src/main/res/mipmap-xxhdpi/logo_foreground.png
new file mode 100644
index 00000000..1159ab59
Binary files /dev/null and b/demo/src/main/res/mipmap-xxhdpi/logo_foreground.png differ
diff --git a/demo/src/main/res/mipmap-xxxhdpi/cameraview.png b/demo/src/main/res/mipmap-xxxhdpi/cameraview.png
deleted file mode 100644
index f14b3915..00000000
Binary files a/demo/src/main/res/mipmap-xxxhdpi/cameraview.png and /dev/null differ
diff --git a/demo/src/main/res/mipmap-xxxhdpi/logo.png b/demo/src/main/res/mipmap-xxxhdpi/logo.png
new file mode 100644
index 00000000..4f396ea1
Binary files /dev/null and b/demo/src/main/res/mipmap-xxxhdpi/logo.png differ
diff --git a/demo/src/main/res/mipmap-xxxhdpi/logo_background.png b/demo/src/main/res/mipmap-xxxhdpi/logo_background.png
new file mode 100644
index 00000000..4c81022f
Binary files /dev/null and b/demo/src/main/res/mipmap-xxxhdpi/logo_background.png differ
diff --git a/demo/src/main/res/mipmap-xxxhdpi/logo_foreground.png b/demo/src/main/res/mipmap-xxxhdpi/logo_foreground.png
new file mode 100644
index 00000000..9f3d1ffe
Binary files /dev/null and b/demo/src/main/res/mipmap-xxxhdpi/logo_foreground.png differ
diff --git a/demo/src/main/res/values/colors.xml b/demo/src/main/res/values/colors.xml
index 269ab9ab..20ecab1c 100644
--- a/demo/src/main/res/values/colors.xml
+++ b/demo/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#009966</color>
-    <color name="colorPrimaryDark">#00734d</color>
-    <color name="colorAccent">#57db27</color>
+    <color name="colorPrimary">#FFA000</color>
+    <color name="colorPrimaryDark">#F57C00</color>
+    <color name="colorAccent">#40C4FF</color>
 </resources>
diff --git a/docs/index.md b/docs/index.md
index eab56e4c..4081cf1d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -8,6 +8,10 @@ title: "CameraView v2"
 CameraView is a well documented, high-level library that makes capturing pictures and videos easy,
 addressing most of the common issues and needs, and still leaving you with flexibility where needed.
 
+<p align="center">
+  <img src="static/banner.png" vspace="10" width="100%">
+</p>
+
 - Fast & reliable
 - Gestures support [[docs]](docs/gestures.html)
 - Camera1 or Camera2 powered engine [[docs]](docs/previews.html)
@@ -22,10 +26,6 @@ addressing most of the common issues and needs, and still leaving you with flexi
 - Works down to API level 15
 - Well tested
 
-<p align="center">
-  <img src="static/icon.png" vspace="10" width="200" height="200">
-</p>
-
 ### Get started
 
 Get started with [install info](about/install.html), [quick setup](about/getting-started.html), or
diff --git a/docs/static/banner.png b/docs/static/banner.png
new file mode 100644
index 00000000..b42e3e94
Binary files /dev/null and b/docs/static/banner.png differ
diff --git a/docs/static/icon.png b/docs/static/icon.png
index 50c84432..cad21694 100644
Binary files a/docs/static/icon.png and b/docs/static/icon.png differ
diff --git a/docs/static/screen1.jpg b/docs/static/screen1.jpg
deleted file mode 100644
index 4c132942..00000000
Binary files a/docs/static/screen1.jpg and /dev/null differ
diff --git a/docs/static/screen1.png b/docs/static/screen1.png
new file mode 100644
index 00000000..0399da03
Binary files /dev/null and b/docs/static/screen1.png differ
diff --git a/docs/static/screen2.jpg b/docs/static/screen2.jpg
deleted file mode 100644
index 2f0d3a29..00000000
Binary files a/docs/static/screen2.jpg and /dev/null differ
diff --git a/docs/static/screen2.png b/docs/static/screen2.png
new file mode 100644
index 00000000..bb19cb36
Binary files /dev/null and b/docs/static/screen2.png differ
diff --git a/docs/static/screen3.jpg b/docs/static/screen3.jpg
deleted file mode 100644
index 5abf710b..00000000
Binary files a/docs/static/screen3.jpg and /dev/null differ
diff --git a/docs/static/screen3.png b/docs/static/screen3.png
new file mode 100644
index 00000000..1a30c706
Binary files /dev/null and b/docs/static/screen3.png differ