From 3352c2b8ce8aa88a0c217d1da78ef5fea3b7e5b4 Mon Sep 17 00:00:00 2001
From: PY <pyricau@users.noreply.github.com>
Date: Wed, 27 Nov 2019 11:16:44 -0800
Subject: [PATCH] Updating icons (#1648)

---
 .../java/leakcanary/internal/Notifications.kt |   2 +-
 .../internal/activity/LeakActivity.kt         |  44 +++++----
 .../res/color/leak_canary_bottom_menu.xml     |   2 +-
 .../leak_canary_notification.xml              |  38 --------
 .../leak_canary_notification.png              | Bin 557 -> 0 bytes
 .../leak_canary_notification.png              | Bin 384 -> 0 bytes
 .../leak_canary_notification.png              | Bin 746 -> 0 bytes
 .../leak_canary_notification.png              | Bin 1084 -> 0 bytes
 .../main/res/drawable/leak_canary_dump.xml    |  22 +++++
 .../main/res/drawable/leak_canary_info.xml    |   5 +
 .../main/res/drawable/leak_canary_leak.xml    |  30 ++++++
 .../res/drawable/leak_canary_notification.xml |  14 ---
 .../res/layout/leak_canary_leak_activity.xml  |  89 ++++++++++++++----
 .../main/res/values/leak_canary_colors.xml    |   2 +-
 14 files changed, 159 insertions(+), 89 deletions(-)
 delete mode 100644 leakcanary-android-core/src/main/res/drawable-anydpi-v24/leak_canary_notification.xml
 delete mode 100644 leakcanary-android-core/src/main/res/drawable-hdpi/leak_canary_notification.png
 delete mode 100644 leakcanary-android-core/src/main/res/drawable-mdpi/leak_canary_notification.png
 delete mode 100644 leakcanary-android-core/src/main/res/drawable-xhdpi/leak_canary_notification.png
 delete mode 100644 leakcanary-android-core/src/main/res/drawable-xxhdpi/leak_canary_notification.png
 create mode 100644 leakcanary-android-core/src/main/res/drawable/leak_canary_dump.xml
 create mode 100644 leakcanary-android-core/src/main/res/drawable/leak_canary_info.xml
 create mode 100644 leakcanary-android-core/src/main/res/drawable/leak_canary_leak.xml
 delete mode 100644 leakcanary-android-core/src/main/res/drawable/leak_canary_notification.xml

diff --git a/leakcanary-android-core/src/main/java/leakcanary/internal/Notifications.kt b/leakcanary-android-core/src/main/java/leakcanary/internal/Notifications.kt
index a636bea29e..2c0b12af5d 100644
--- a/leakcanary-android-core/src/main/java/leakcanary/internal/Notifications.kt
+++ b/leakcanary-android-core/src/main/java/leakcanary/internal/Notifications.kt
@@ -66,7 +66,7 @@ internal object Notifications {
     builder: Notification.Builder,
     type: NotificationType
   ): Notification {
-    builder.setSmallIcon(R.drawable.leak_canary_notification)
+    builder.setSmallIcon(R.drawable.leak_canary_leak)
         .setWhen(System.currentTimeMillis())
 
     if (SDK_INT >= O) {
diff --git a/leakcanary-android-core/src/main/java/leakcanary/internal/activity/LeakActivity.kt b/leakcanary-android-core/src/main/java/leakcanary/internal/activity/LeakActivity.kt
index d90e958ee5..fd3842104d 100644
--- a/leakcanary-android-core/src/main/java/leakcanary/internal/activity/LeakActivity.kt
+++ b/leakcanary-android-core/src/main/java/leakcanary/internal/activity/LeakActivity.kt
@@ -3,19 +3,17 @@ package leakcanary.internal.activity
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.graphics.Typeface
 import android.net.Uri
 import android.os.AsyncTask
 import android.os.Bundle
 import android.view.View
-import android.widget.TextView
 import com.squareup.leakcanary.core.R
 import leakcanary.internal.HeapAnalyzerService
 import leakcanary.internal.InternalLeakCanary
 import leakcanary.internal.activity.db.Db
 import leakcanary.internal.activity.screen.AboutScreen
-import leakcanary.internal.activity.screen.LeaksScreen
 import leakcanary.internal.activity.screen.HeapDumpsScreen
+import leakcanary.internal.activity.screen.LeaksScreen
 import leakcanary.internal.navigation.NavigatingActivity
 import leakcanary.internal.navigation.Screen
 import shark.SharkLog
@@ -25,15 +23,27 @@ import java.io.IOException
 internal class LeakActivity : NavigatingActivity() {
 
   private val leaksButton by lazy {
-    findViewById<TextView>(R.id.leak_canary_navigation_button_leaks)
+    findViewById<View>(R.id.leak_canary_navigation_button_leaks)
+  }
+
+  private val leaksButtonIconView by lazy {
+    findViewById<View>(R.id.leak_canary_navigation_button_leaks_icon)
   }
 
   private val heapDumpsButton by lazy {
-    findViewById<TextView>(R.id.leak_canary_navigation_button_heap_dumps)
+    findViewById<View>(R.id.leak_canary_navigation_button_heap_dumps)
+  }
+
+  private val heapDumpsButtonIconView by lazy {
+    findViewById<View>(R.id.leak_canary_navigation_button_heap_dumps_icon)
   }
 
   private val aboutButton by lazy {
-    findViewById<TextView>(R.id.leak_canary_navigation_button_about)
+    findViewById<View>(R.id.leak_canary_navigation_button_about)
+  }
+
+  private val aboutButtonIconView by lazy {
+    findViewById<View>(R.id.leak_canary_navigation_button_about_icon)
   }
 
   private val bottomNavigationBar by lazy {
@@ -52,33 +62,33 @@ internal class LeakActivity : NavigatingActivity() {
   }
 
   override fun onNewScreen(screen: Screen) {
-    when(screen) {
+    when (screen) {
       is LeaksScreen -> {
         bottomNavigationBar.visibility = View.VISIBLE
         leaksButton.isSelected = true
-        leaksButton.setTypeface(null, Typeface.BOLD)
+        leaksButtonIconView.alpha = 1.0f
         heapDumpsButton.isSelected = false
-        heapDumpsButton.setTypeface(null, Typeface.NORMAL)
+        heapDumpsButtonIconView.alpha = 0.4f
         aboutButton.isSelected = false
-        aboutButton.setTypeface(null, Typeface.NORMAL)
+        aboutButtonIconView.alpha = 0.4f
       }
       is HeapDumpsScreen -> {
         bottomNavigationBar.visibility = View.VISIBLE
         leaksButton.isSelected = false
-        leaksButton.setTypeface(null, Typeface.NORMAL)
+        leaksButtonIconView.alpha = 0.4f
         heapDumpsButton.isSelected = true
-        heapDumpsButton.setTypeface(null, Typeface.BOLD)
+        heapDumpsButtonIconView.alpha = 1.0f
         aboutButton.isSelected = false
-        aboutButton.setTypeface(null, Typeface.NORMAL)
+        aboutButtonIconView.alpha = 0.4f
       }
       is AboutScreen -> {
         bottomNavigationBar.visibility = View.VISIBLE
         leaksButton.isSelected = false
-        leaksButton.setTypeface(null, Typeface.NORMAL)
+        leaksButtonIconView.alpha = 0.4f
         heapDumpsButton.isSelected = false
-        heapDumpsButton.setTypeface(null, Typeface.NORMAL)
+        heapDumpsButtonIconView.alpha = 0.4f
         aboutButton.isSelected = true
-        aboutButton.setTypeface(null, Typeface.BOLD)
+        aboutButtonIconView.alpha = 1.0f
       }
       else -> {
         bottomNavigationBar.visibility = View.GONE
@@ -108,7 +118,7 @@ internal class LeakActivity : NavigatingActivity() {
     returnIntent: Intent?
   ) {
     SharkLog.d {
-        "Got activity result with requestCode=$requestCode resultCode=$resultCode returnIntent=$returnIntent"
+      "Got activity result with requestCode=$requestCode resultCode=$resultCode returnIntent=$returnIntent"
     }
     if (requestCode == FILE_REQUEST_CODE && resultCode == RESULT_OK && returnIntent != null) {
       returnIntent.data?.let { fileUri ->
diff --git a/leakcanary-android-core/src/main/res/color/leak_canary_bottom_menu.xml b/leakcanary-android-core/src/main/res/color/leak_canary_bottom_menu.xml
index 9e5d7ba3fe..65197a4eb3 100644
--- a/leakcanary-android-core/src/main/res/color/leak_canary_bottom_menu.xml
+++ b/leakcanary-android-core/src/main/res/color/leak_canary_bottom_menu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_selected="false" android:color="@color/leak_canary_gray_darkest_50p" />
+  <item android:state_selected="false" android:color="@color/leak_canary_gray_darkest_40p" />
   <item android:state_selected="true"  android:color="@color/leak_canary_gray_darkest" />
 </selector>
diff --git a/leakcanary-android-core/src/main/res/drawable-anydpi-v24/leak_canary_notification.xml b/leakcanary-android-core/src/main/res/drawable-anydpi-v24/leak_canary_notification.xml
deleted file mode 100644
index f5f88aa7a5..0000000000
--- a/leakcanary-android-core/src/main/res/drawable-anydpi-v24/leak_canary_notification.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="184.32971"
-    android:viewportHeight="184.32971"
-    android:tint="#FFFFFF">
-  <group android:translateX="-0.33514494"
-      android:translateY="-0.33514494">
-    <group>
-      <clip-path android:pathData="M0,0h185v185h-185z M 0,0"/>
-      <path
-          android:pathData="M55.8327 80.944L68.1676 83.3835M59.6321 89.5079L62.4202 75.4109"
-          android:strokeWidth="4.257"
-          android:fillColor="#00000000"
-          android:strokeColor="#151C1F"
-          android:strokeLineCap="round"/>
-      <path
-          android:pathData="M33.0396 88.6436L148.284 41.1702C148.308 41.1931 148.333 41.216 148.357 41.2389C147.773 76.5754 125.2 119.136 72.6948 132.558C66.2444 121.606 47.4716 97.5578 32.6694 89.9372C32.799 89.5158 32.9224 89.0844 33.0396 88.6436Z"
-          android:fillColor="#ffffff"
-          android:fillType="evenOdd"/>
-      <path
-          android:pathData="M81.4818 31.7162L72.8251 55.9266L71.7247 54.5065C66.7399 48.0734 60.8251 42.4184 54.1748 37.7274L69.4736 20.6696L68.6881 39.2884L81.4818 31.7162Z"
-          android:fillColor="#ffffff"/>
-      <path
-          android:pathData="M64.8741 100.079C81.01 89.2721 85.3298 67.4304 74.5226 51.2946C63.7154 35.1587 41.8738 30.8389 25.7379 41.6461C9.60205 52.4532 5.28228 74.2949 16.0894 90.4308C26.8966 106.567 48.7382 110.886 64.8741 100.079ZM43.6335 56.9634C42.5166 57.3298 41.9082 58.5324 42.2747 59.6494C42.6412 60.7663 43.8437 61.3747 44.9607 61.0082L48.0585 59.9918L49.7842 65.2515C50.1507 66.3684 51.3532 66.9768 52.4702 66.6103C53.5871 66.2439 54.1955 65.0413 53.829 63.9244L52.1033 58.6647L56.9078 57.0883C58.0248 56.7218 58.6332 55.5193 58.2667 54.4023C57.9002 53.2853 56.6977 52.677 55.5807 53.0434L50.7762 54.6198L49.3491 50.2704C48.9826 49.1535 47.7801 48.5451 46.6631 48.9116C45.5462 49.278 44.9378 50.4806 45.3043 51.5976L46.7313 55.947L43.6335 56.9634Z"
-          android:fillColor="#ffffff"
-          android:fillType="evenOdd"/>
-      <path
-          android:pathData="M10.1416 71.2627C10.4815 113.278 38.6085 151.594 81.1309 162.988C113.627 171.695 146.704 162.582 170.003 141.637C159.823 142.304 149.364 141.343 138.964 138.556C113.428 131.714 93.0844 115.164 80.8316 93.9338L10.1416 71.2627Z"
-          android:fillColor="#ffffff"
-          android:fillType="evenOdd"/>
-      <path
-          android:pathData="M175.463 56.9136L57.9672 97.0664C57.8158 97.5113 57.6587 97.9458 57.4956 98.3692C71.736 106.994 88.8027 132.282 94.4811 143.653C105.725 141.594 115.73 138.149 124.547 133.665C121.291 132.305 118.248 130.405 115.554 128.011L114.859 127.392C114.033 126.658 113.959 125.394 114.693 124.569C115.427 123.743 116.691 123.669 117.516 124.403L118.212 125.021C121.434 127.886 125.228 129.941 129.286 131.091C130.47 130.405 131.632 129.699 132.769 128.975C130.868 128.149 129.036 127.135 127.302 125.938L126.535 125.409C125.626 124.782 125.398 123.537 126.025 122.627C126.653 121.718 127.898 121.49 128.807 122.117L129.573 122.646C131.83 124.203 134.276 125.407 136.83 126.243C137.942 125.453 139.03 124.644 140.093 123.818C139.482 123.453 138.88 123.067 138.29 122.66L137.524 122.131C136.615 121.504 136.387 120.259 137.014 119.349C137.641 118.44 138.887 118.212 139.796 118.839L140.562 119.368C141.487 120.006 142.444 120.585 143.428 121.104C163.878 103.673 174.394 79.6305 176.271 57.779C176.004 57.4894 175.735 57.2009 175.463 56.9136Z"
-          android:fillColor="#ffffff"
-          android:fillType="evenOdd"/>
-    </group>
-  </group>
-</vector>
diff --git a/leakcanary-android-core/src/main/res/drawable-hdpi/leak_canary_notification.png b/leakcanary-android-core/src/main/res/drawable-hdpi/leak_canary_notification.png
deleted file mode 100644
index b3fe4bcc096c87f985df4c71a013dd930315cf32..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0005>Nkl<Zc-rll
zO(+CW0LRy7u|A>{ZL~SCNpX@SDai>X2T`k74o<jBl7ph$C<g~pY&b~DXK_Jk50rzG
zgpFineYW=bzdV_yH?uRdvoq5E>(_46?(5gQH~ao?EtY7aF*t;f9MJk#WYT~K^qMJ=
z0pdX-*dpKQ0=b~mD2a0522bQS7vPP(r(%B47HN?<Fh=APV6Rlxs$%R+&=1zt2#s?D
zZo!7=S`e%%9J36}fLHe2eKpe*<Op4ZLeK$D1lLbx#!3P%aLgHRL8;K9#1wV21w1X7
zuAfwj#&CcM@E|kgeS*)Y0w-7lHDV#3%pkL1j&pqoB!FhHO_Zeqw18#7G}73GGU-HH
zJZwsp<^?=+uKUDyCxw`sP2L&`m?-4r3Ei0_^9Yi8LT;0UCZ!&GmkBa-k>^PX<(nWh
z5bDQq*Fc#A+9E;;H5w#y32aKXk63UPVHqzdR<q+*No=xObH%o$L(l{YwDh7WJr*oj
z0ehf?)?QkHwH7riI0{qflQo1oP_IXO%mU{++^HKd3`+HovWrStxVZ;AtTPRQcDk<A
zO3@~;6rm@MKG6;>cPfT$Enb~OKESA&LxPkTt(+raG=q0m_#Jv5muPKm0Q2lrA{Re9
v$Mt}0qYjofP)*PLY@t$WK~ePIkbj>q3qZ{~{cCA+00000NkvXXu0mjfv$*d`

diff --git a/leakcanary-android-core/src/main/res/drawable-mdpi/leak_canary_notification.png b/leakcanary-android-core/src/main/res/drawable-mdpi/leak_canary_notification.png
deleted file mode 100644
index 9843dc0439f57e0c338f9fe938f2a78ebd5770e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003;Nkl<Zc-muN
z81~@*|Np$SG@K2HH&feCO(6CMVh12z4#cm4*aL`NDK(fI<l6tJ;2RKs2jX8qEP_Wb
zI}pbKu^KJ~%s_k)$>4WDyaR|oK>1g2=u-ybZXkXGRi}x|0)I4@?*h37h>t`0ARkC0
zIR>PDI}rav(gX4-2ULv#5a%IVFz-JmScAq-1LA5Re)JzZI1R)NKztL*-;Qj-ng4{r
z@BgHMHe?IV{ii<AL$;ue%7&jpk7Nrf8V-th2W-jo5tS^Mk1MH`Q^9ahUgE-8r~&aq
zG7NnW&6wQ;3r3&<PaytFq`{zM+XT%+PN3p~*fOb*1lRur;^{zaMry%V1jK(x3@T80
zv<DQ)Q2mUAEO7?nTO?Wn3f^g;l9^baumW)o5jp)U5HCi_y=2rEYS2;?6i1Vx1zQrd
eV&WXWjRpW<qmA+x&G}aV0000<MNUMnLSTYe!<<?G

diff --git a/leakcanary-android-core/src/main/res/drawable-xhdpi/leak_canary_notification.png b/leakcanary-android-core/src/main/res/drawable-xhdpi/leak_canary_notification.png
deleted file mode 100644
index 18b6aead97488c08dd794b49a86668b9f8284ccb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00089Nkl<Zc-muN
z7zLwX6pVuZ|Nol~Wyh-n@%^FdcuA1sf%wHxbUYsrpZ^a5ccEgeK%51{EQ86Rx<Fh5
z#H)dLKM?N#;;BG<@;?Gx24WW=z7E982aChCfOz|V{NN9i{)HswLj}9pfLNIl1A>A0
z%YV|rYfv(xz+MF)?f~LfKwM6)A?`>aiw-^m@i9Cem_mkqOrTf;;w?b@7s;%6avU!L
z#P9Gp@B|QxK|OL3i+mpmc7e<(hn8a4fIB%J=p~Ru)&Vgy5OV;rCJ=wal7x5(*kKLC
z%YgU?0lO6On4yeKkOhd};xX_$5W4}f2@uEPQ5TEFY#t!a1ma6X=A}p2YI`8=2FU^O
zUThw)BGT}E(9DJlEJG`TK}GH-5(|SxQ2ly9+ybg+(Bx-h^FRy<7F@w22g)0fKz!ss
z`CtPOU&AAxkIe(^|EUB1{HHxI!RCQU|Az*6i?yi&6igf<9+-!#Xwn%X9&p3u0RbTX
zH^?0iYAiD1t7NVWau1{ts);8KV#nVg*iZy2@E^n;@FS)z#1F(@2chGalG31?F~}VM
z5LCdB;sMP;R2qSr?FQsDtG5pV$Ah}5UgY-5Oz706K?fh89V$>i!<*8MbvK<H{SK*{
zx(0}af!LTDqY_*|e1}GkJ`2Qg(1sbP@|1uM%Pay7mQizP#g>S!A2|S2Nc01-G!V~%
zmNZJV8Xt;48!ezFcmp+`k=BD;1vJhFccEQJV_JHmnualfo~aK&+hr+0?0|+@De;6q
z869+L0nkWc7`4VsZw^2|K!=*i2{f=(MTgk<1|1n^qgB2T2aVCtpw<QrqRqrNI!A4f
z$N+H@5Z|Lhr==b=ZaR?j3i?1?2p#{tMxZhS)xxWQxEM6oHkhZQB%s5QW>8vobZ&PP
ci~{Na067Z`uMp+MmH+?%07*qoM6N<$f>MM&g8%>k

diff --git a/leakcanary-android-core/src/main/res/drawable-xxhdpi/leak_canary_notification.png b/leakcanary-android-core/src/main/res/drawable-xxhdpi/leak_canary_notification.png
deleted file mode 100644
index e27d8a18174294c6607ada344238d0df0ac7b11d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1084
zcmV-C1jGA@P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000C7Nkl<Zc-rlo
zZ)lBC9LML+Cd{9P{F(nrS~D@qyctWHXohGdmY7m2CXH!ijHQKzOuU$h?8O?3G~Qep
zUZCW~rM59d!kE%E49EA^J<GG}-uwK2cJ@5yTc6f_?(^Jp?sv~~&hPxr@5aPPNl8gb
zNl8gb*(%0Zk#r%lIh#PcbRxVt%Rwi2E8Y0toHP(%K{ZK7x|=ftw6TAB9P<8Xu*3^S
z&=;Ky5*5eBfmYUCclmq$K>_#z7P`@p*`NeGV&U}^w1hc+3oHVD{`xiO>n3Ang6qt<
z0wJ%DxW$-0;2`+TtW}BweV+ghfm*v77!2x|^?G9SKQt56gI~P8TDuymXZEPjhW?HO
zJ0pyLr|dAOM8_At0^-BWT;cSGZhZ^;IUigA9Z}jWw%VLoI>(#_eq9-leQF~7C%d%F
zWd8<%Efia6>|dVM23^zn$h-k@U<k!I{4=&k8-t8Y@wg@loZvB(9%Wc*PKwUPPb<GH
zbp}+c-14Msjs1xQYk|+;c=v<uI1S@%I;aHYY8~3AvjcRuZJ+^?Utg~Ax+;}^j0dIQ
zoyiHIF-jW?Km{$N73ZH+Gw6ZAj(i8h_@Jpp??WFm#T0#2F-4nIX-FHX6r_Te5za4A
zGpNHvXXx(B(Q$qvZ*xSHDcY<SgJf_3G;26NE1Ee8%vt4X9IuS3ldlc+XpEHuwA<98
z_IS<lxIxuw295H#K{;v$4e+oz-)Om{B`^zk)Sx=8k+k2V2CdR+&}9#r^8)nKYEYpE
z4Jy#HSWWksIiF~Wq{pCm9)ZfcCyGfvkC;Pizc?cX?eK^}D~%@2rm<k|*v-0RHnZ61
zVsmI$ceq)Da$RZ;CE_xy$W7DEL7NK=%C|CsU+gk-Dy-iAp&WC&OU$Wdc2tw#LwC8r
zoQsU_*V$nZZ3s5?GDB$BVm+U&Dw*ANNN8ZG;D($5_d;G%CEGwJ>x9k;V#a-tr<h?W
zpq;{kdukM#Jmc@BIbBFai`ZrX47yFZ8!#3$@MC1iHW17EI<zP26GceLQn5r5ziU>2
z8{h-T6rm(<jUekZ>cdSiv1{8}q`Ji-fd*)*-Z&3ZMJw(s6>v6t&Zqb^QA{cmc<TSm
zf~7foc$hL>b7J0Nlk%B$r7BLSl?T2)1!cBH+T5fproSvs6rDAcb~RwqRPeAD8AAnM
zo1K2#sGjgJ_$jzKlr2r}$-$d~xH|$G^AT(mDHO<N!IIye)>m*0B#8QBnALm@<+P|m
zcDLySy~B^*aq!AUQ)sP7Kfqb%$n0dJS#!aDzR)zgIpF8ZjciAAKn@!=iFP`{UKaeh
zK^0GD`1pWNe{1;hqhKqT$5g85rKF^!q@<*zBIqxF1a8-@e))F*0000<MNUMnLSTXv
Cy$X8(

diff --git a/leakcanary-android-core/src/main/res/drawable/leak_canary_dump.xml b/leakcanary-android-core/src/main/res/drawable/leak_canary_dump.xml
new file mode 100644
index 0000000000..48897d5f0b
--- /dev/null
+++ b/leakcanary-android-core/src/main/res/drawable/leak_canary_dump.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="23dp"
+    android:viewportWidth="24"
+    android:viewportHeight="23">
+  <path
+      android:pathData="M3.25,5H10.25"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M2.25,5.25h0.5v2.5h-0.5z"
+      android:strokeWidth="0.5"
+      android:fillColor="#000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M3,8C3,6.8954 3.8954,6 5,6H19C20.1046,6 21,6.8954 21,8V16C21,17.1046 20.1046,18 19,18H5C3.8954,18 3,17.1046 3,16V8Z"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+</vector>
diff --git a/leakcanary-android-core/src/main/res/drawable/leak_canary_info.xml b/leakcanary-android-core/src/main/res/drawable/leak_canary_info.xml
new file mode 100644
index 0000000000..694aa9abd6
--- /dev/null
+++ b/leakcanary-android-core/src/main/res/drawable/leak_canary_info.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#151C1F"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+</vector>
diff --git a/leakcanary-android-core/src/main/res/drawable/leak_canary_leak.xml b/leakcanary-android-core/src/main/res/drawable/leak_canary_leak.xml
new file mode 100644
index 0000000000..9bf97331f7
--- /dev/null
+++ b/leakcanary-android-core/src/main/res/drawable/leak_canary_leak.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M14.5771,8.25L14.5771,21"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#151C1F"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M9.7883,4L9.7883,10.5385"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#151C1F"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M19.3652,8.25L19.3244,17.5957"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#151C1F"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M5,7.2691V15.4422"
+      android:strokeWidth="2.5"
+      android:fillColor="#00000000"
+      android:strokeColor="#151C1F"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/leakcanary-android-core/src/main/res/drawable/leak_canary_notification.xml b/leakcanary-android-core/src/main/res/drawable/leak_canary_notification.xml
deleted file mode 100644
index 3fe6f4824c..0000000000
--- a/leakcanary-android-core/src/main/res/drawable/leak_canary_notification.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="185"
-    android:viewportWidth="185" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <group>
-        <clip-path android:pathData="M0,0h185v185h-185z M 0,0"/>
-        <path android:fillColor="#00000000"
-            android:pathData="M55.8327 80.944L68.1676 83.3835M59.6321 89.5079L62.4202 75.4109"
-            android:strokeColor="#151C1F" android:strokeLineCap="round" android:strokeWidth="4.257"/>
-        <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M33.0396 88.6436L148.284 41.1702C148.308 41.1931 148.333 41.216 148.357 41.2389C147.773 76.5754 125.2 119.136 72.6948 132.558C66.2444 121.606 47.4716 97.5578 32.6694 89.9372C32.799 89.5158 32.9224 89.0844 33.0396 88.6436Z"/>
-        <path android:fillColor="#ffffff" android:pathData="M81.4818 31.7162L72.8251 55.9266L71.7247 54.5065C66.7399 48.0734 60.8251 42.4184 54.1748 37.7274L69.4736 20.6696L68.6881 39.2884L81.4818 31.7162Z"/>
-        <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M64.8741 100.079C81.01 89.2721 85.3298 67.4304 74.5226 51.2946C63.7154 35.1587 41.8738 30.8389 25.7379 41.6461C9.60205 52.4532 5.28228 74.2949 16.0894 90.4308C26.8966 106.567 48.7382 110.886 64.8741 100.079ZM43.6335 56.9634C42.5166 57.3298 41.9082 58.5324 42.2747 59.6494C42.6412 60.7663 43.8437 61.3747 44.9607 61.0082L48.0585 59.9918L49.7842 65.2515C50.1507 66.3684 51.3532 66.9768 52.4702 66.6103C53.5871 66.2439 54.1955 65.0413 53.829 63.9244L52.1033 58.6647L56.9078 57.0883C58.0248 56.7218 58.6332 55.5193 58.2667 54.4023C57.9002 53.2853 56.6977 52.677 55.5807 53.0434L50.7762 54.6198L49.3491 50.2704C48.9826 49.1535 47.7801 48.5451 46.6631 48.9116C45.5462 49.278 44.9378 50.4806 45.3043 51.5976L46.7313 55.947L43.6335 56.9634Z"/>
-        <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M10.1416 71.2627C10.4815 113.278 38.6085 151.594 81.1309 162.988C113.627 171.695 146.704 162.582 170.003 141.637C159.823 142.304 149.364 141.343 138.964 138.556C113.428 131.714 93.0844 115.164 80.8316 93.9338L10.1416 71.2627Z"/>
-        <path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M175.463 56.9136L57.9672 97.0664C57.8158 97.5113 57.6587 97.9458 57.4956 98.3692C71.736 106.994 88.8027 132.282 94.4811 143.653C105.725 141.594 115.73 138.149 124.547 133.665C121.291 132.305 118.248 130.405 115.554 128.011L114.859 127.392C114.033 126.658 113.959 125.394 114.693 124.569C115.427 123.743 116.691 123.669 117.516 124.403L118.212 125.021C121.434 127.886 125.228 129.941 129.286 131.091C130.47 130.405 131.632 129.699 132.769 128.975C130.868 128.149 129.036 127.135 127.302 125.938L126.535 125.409C125.626 124.782 125.398 123.537 126.025 122.627C126.653 121.718 127.898 121.49 128.807 122.117L129.573 122.646C131.83 124.203 134.276 125.407 136.83 126.243C137.942 125.453 139.03 124.644 140.093 123.818C139.482 123.453 138.88 123.067 138.29 122.66L137.524 122.131C136.615 121.504 136.387 120.259 137.014 119.349C137.641 118.44 138.887 118.212 139.796 118.839L140.562 119.368C141.487 120.006 142.444 120.585 143.428 121.104C163.878 103.673 174.394 79.6305 176.271 57.779C176.004 57.4894 175.735 57.2009 175.463 56.9136Z"/>
-    </group>
-</vector>
diff --git a/leakcanary-android-core/src/main/res/layout/leak_canary_leak_activity.xml b/leakcanary-android-core/src/main/res/layout/leak_canary_leak_activity.xml
index e6c01fda74..a385b35d69 100644
--- a/leakcanary-android-core/src/main/res/layout/leak_canary_leak_activity.xml
+++ b/leakcanary-android-core/src/main/res/layout/leak_canary_leak_activity.xml
@@ -14,40 +14,95 @@
   <LinearLayout
       android:id="@+id/leak_canary_bottom_navigation_bar"
       android:layout_width="match_parent"
-      android:layout_height="48dp"
-      android:orientation="horizontal"
+      android:layout_height="68dp"
       android:background="@color/leak_canary_yellow"
+      android:orientation="horizontal"
       >
-    <TextView
+
+    <LinearLayout
         android:id="@+id/leak_canary_navigation_button_leaks"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:gravity="center"
-        android:textColor="@color/leak_canary_bottom_menu"
+        android:orientation="vertical"
         android:background="@drawable/leak_canary_tab_background"
-        android:text="Leaks"
-        />
-    <TextView
+        >
+      <ImageView
+          android:id="@+id/leak_canary_navigation_button_leaks_icon"
+          android:layout_width="24dp"
+          android:layout_height="24dp"
+          android:layout_gravity="center_horizontal"
+          android:layout_marginTop="14dp"
+          android:src="@drawable/leak_canary_leak"
+          android:scaleType="center"
+          />
+      <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center_horizontal"
+          android:layout_marginTop="2dp"
+          android:text="Leaks"
+          android:textColor="@color/leak_canary_bottom_menu"
+          android:textSize="11sp"
+          />
+    </LinearLayout>
+
+
+    <LinearLayout
         android:id="@+id/leak_canary_navigation_button_heap_dumps"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:gravity="center"
-        android:textColor="@color/leak_canary_bottom_menu"
+        android:orientation="vertical"
         android:background="@drawable/leak_canary_tab_background"
-        android:text="Heap Dumps"
-        />
-    <TextView
+        >
+      <ImageView
+          android:id="@+id/leak_canary_navigation_button_heap_dumps_icon"
+          android:layout_width="24dp"
+          android:layout_height="24dp"
+          android:layout_gravity="center_horizontal"
+          android:layout_marginTop="14dp"
+          android:src="@drawable/leak_canary_dump"
+          android:scaleType="center"
+          />
+      <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center_horizontal"
+          android:layout_marginTop="2dp"
+          android:text="Heap Dumps"
+          android:textColor="@color/leak_canary_bottom_menu"
+          android:textSize="11sp"
+          />
+    </LinearLayout>
+
+    <LinearLayout
         android:id="@+id/leak_canary_navigation_button_about"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:gravity="center"
-        android:textColor="@color/leak_canary_bottom_menu"
+        android:orientation="vertical"
         android:background="@drawable/leak_canary_tab_background"
-        android:text="About"
-        />
+        >
+      <ImageView
+          android:id="@+id/leak_canary_navigation_button_about_icon"
+          android:layout_width="24dp"
+          android:layout_height="24dp"
+          android:layout_gravity="center_horizontal"
+          android:layout_marginTop="14dp"
+          android:src="@drawable/leak_canary_info"
+          android:scaleType="center"
+          />
+      <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center_horizontal"
+          android:layout_marginTop="2dp"
+          android:text="About"
+          android:textColor="@color/leak_canary_bottom_menu"
+          android:textSize="11sp"
+          />
+    </LinearLayout>
   </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/leakcanary-android-core/src/main/res/values/leak_canary_colors.xml b/leakcanary-android-core/src/main/res/values/leak_canary_colors.xml
index 6996c6be20..c75e38ae52 100644
--- a/leakcanary-android-core/src/main/res/values/leak_canary_colors.xml
+++ b/leakcanary-android-core/src/main/res/values/leak_canary_colors.xml
@@ -26,7 +26,7 @@
   <color name="leak_canary_gray_light">#939CA3</color>
   <color name="leak_canary_gray">#2F2F2F</color>
   <color name="leak_canary_gray_darkest">#151C1F</color>
-  <color name="leak_canary_gray_darkest_50p">#c1151C1F</color>
+  <color name="leak_canary_gray_darkest_40p">#66151C1F</color>
   <color name="leak_canary_gray_darkest_25p">#40151C1F</color>
   <color name="leak_canary_white">#ffffff</color>
   <color name="leak_canary_heap_stack_trace">#ffd40b</color>