Merge branch 'develop' into notification-title

# Conflicts:
#	src/displayapp/screens/Notifications.cpp

1 files changed, 0 insertions, 4 deletions

diff --git a/src/displayapp/icons/navigation/ferry-white.svg b/src/displayapp/icons/navigation/ferry-white.svg
deleted file mode 100644
index 5c7df87e..00000000
--- a/src/displayapp/icons/navigation/ferry-white.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg id="WORKING_ICONS" data-name="WORKING ICONS" xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
-  <title>ferry</title>
-  <path fill="#ffffff" d="m 7.3995155,14.184682 c 0.8083073,0.01079 1.5892915,0.293603 2.2170029,0.802914 l 0.3115788,0.275628 0.059919,0 0.3714978,-0.335547 c 1.17645,-0.972485 2.850946,-1.060086 4.122427,-0.215708 l 2.708339,-5.3208066 -1.79757,-1.1983797 0,-4.2542487 C 15.336866,2.9798301 14.555162,2.2242515 13.59514,2.2008831 l -0.59919,0 c 0.0411,-0.6207608 -0.4289,-1.1572754 -1.049661,-1.1983799 -0.04949,-0.00324 -0.09923,-0.00324 -0.148719,0 l -3.5951399,0 c -0.6207608,-0.041104 -1.1572755,0.4289002 -1.1983799,1.049661 -0.00324,0.049493 -0.00324,0.099226 0,0.1487189 l -0.59919,0 C 5.4448381,2.2242511 4.6631348,2.9798301 4.6072903,3.938534 l 0,4.2542487 -1.7975698,1.1983797 2.6963548,5.4286606 C 6.0624831,14.429271 6.720154,14.208649 7.3995155,14.184682 Z M 5.8056702,3.938534 c 0.012583,-0.3108597 0.2747886,-0.552573 0.5855285,-0.53999 0.00455,2.397e-4 0.00911,4.794e-4 0.013661,7.19e-4 l 7.1902793,0 c 0.310381,-0.020492 0.578698,0.2143902 0.59919,0.5247706 0.0017,0.024807 0.0017,0.049613 0,0.074419 l 0,3.5951398 L 9.9999999,5.1968329 5.8056702,7.5336738 c 0,0 0,-3.5951398 0,-3.5951398 z m 11.9837988,12.642908 0,1.19838 c -0.314695,0.02325 -0.607459,0.16969 -0.814898,0.407449 -0.325599,0.345493 -0.74036,0.594276 -1.19838,0.719028 -0.736644,0.217506 -1.533326,0.05093 -2.121133,-0.443401 l -0.467367,-0.419433 c -0.364667,-0.36263 -0.953551,-0.36263 -1.318218,0 -0.167773,0.143806 -0.323562,0.299595 -0.503319,0.443401 -0.878174,0.701771 -2.1347949,0.666299 -2.9719831,-0.08389 l -0.4673682,-0.41943 c -0.343216,-0.299834 -0.8551639,-0.299834 -1.1983799,0 C 6.5007306,18.163303 6.297006,18.367028 6.0693138,18.546785 5.2252949,19.17174 4.0641846,19.14214 3.253121,18.474885 L 2.8816233,18.151319 C 2.7082177,17.952748 2.4708186,17.821286 2.2105305,17.779822 l 0,-1.19838 c 0.3097812,-0.03835 0.6237567,0.02025 0.8987849,0.167773 0.3333893,0.206361 0.6500013,0.438727 0.9467202,0.69506 0.2457877,0.267838 0.6168061,0.382283 0.9706877,0.299595 0.1348177,-0.03991 0.2608873,-0.104978 0.3714978,-0.191741 0.1917408,-0.143805 0.3475302,-0.311578 0.5392709,-0.467368 0.8515688,-0.705606 2.0844621,-0.705606 2.9360308,0 0.1917408,0.15579 0.3714978,0.335547 0.5632386,0.491336 0.343216,0.299835 0.8551636,0.299835 1.1983796,0 0.191741,-0.155789 0.371498,-0.335546 0.563239,-0.491336 0.853606,-0.712197 2.094409,-0.712197 2.948015,0 0.179757,0.15579 0.34753,0.323563 0.527287,0.467368 0.343216,0.299835 0.855164,0.299835 1.19838,0 L 16.4353,17.060794 c 0.382882,-0.31062 0.861155,-0.479951 1.354169,-0.479352 z"/>
-</svg>