diff --git a/src/apps.js b/src/apps.js
index d1d7c4aa4..a4de33875 100644
--- a/src/apps.js
+++ b/src/apps.js
@@ -107,7 +107,7 @@ exports = module.exports = {
     _MOCK_GET_BY_IP_APP_ID: ''
 };
 
-var appdb = require('./appdb.js'),
+const appdb = require('./appdb.js'),
     appstore = require('./appstore.js'),
     appTaskManager = require('./apptaskmanager.js'),
     assert = require('assert'),
@@ -1832,7 +1832,7 @@ function exec(app, options, callback) {
     assert(options && typeof options === 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    var cmd = options.cmd || [ '/bin/bash' ];
+    let cmd = options.cmd || [ '/bin/bash' ];
     assert(Array.isArray(cmd) && cmd.length > 0);
 
     if (app.installationState !== exports.ISTATE_INSTALLED || app.runState !== exports.RSTATE_RUNNING) {
diff --git a/src/proxyauth.js b/src/proxyauth.js
index 5cc5b8963..4b3a89197 100644
--- a/src/proxyauth.js
+++ b/src/proxyauth.js
@@ -87,8 +87,8 @@ function loginPage(req, res, next) {
 
             const title = app.label || app.manifest.title;
 
-            apps.getIconPath(app, {}, function (error, iconPath) {
-                const icon = 'data:image/png;base64,' + safe.fs.readFileSync(iconPath || '', 'base64');
+            apps.getIcon(app, {}, function (error, iconBuffer) {
+                const icon = 'data:image/png;base64,' + iconBuffer.toString('base64');
 
                 try {
                     finalContent = ejs.render(translatedContent, { title, icon });
diff --git a/src/server.js b/src/server.js
index abf9bd1b0..69b97a5f0 100644
--- a/src/server.js
+++ b/src/server.js
@@ -5,7 +5,7 @@ exports = module.exports = {
     stop
 };
 
-let assert = require('assert'),
+const assert = require('assert'),
     async = require('async'),
     blobs = require('./blobs.js'),
     cloudron = require('./cloudron.js'),
@@ -19,7 +19,6 @@ let assert = require('assert'),
     routes = require('./routes/index.js'),
     settings = require('./settings.js'),
     users = require('./users.js'),
-    util = require('util'),
     ws = require('ws');
 
 let gHttpServer = null;