Merge branch 'develop'

# Conflicts:
#	CMakeLists.txt

1 files changed, 3 insertions, 2 deletions

diff --git a/src/DisplayApp/Screens/BatteryIcon.h b/src/DisplayApp/Screens/BatteryIcon.h
index 4e2a3a03..58f04a87 100644
--- a/src/DisplayApp/Screens/BatteryIcon.h
+++ b/src/DisplayApp/Screens/BatteryIcon.h
@@ -7,8 +7,9 @@ namespace Pinetime {
     namespace Screens {
       class BatteryIcon {
       public:
-        static lv_img_dsc_t* GetUnknownIcon();
-        static lv_img_dsc_t* GetIcon(bool isCharging, float batteryPercent);
+        static const char* GetUnknownIcon();
+          static const char* GetBatteryIcon(float batteryPercent);
+          static const char* GetPlugIcon(bool isCharging);
       };
     }
   }