diff --git a/assets/avatar.png b/assets/avatar.png
index d2e28014f..c6f1d5ef5 100644
Binary files a/assets/avatar.png and b/assets/avatar.png differ
diff --git a/src/oauth2views/header.ejs b/src/oauth2views/header.ejs
index e0414b18f..7263dc866 100644
--- a/src/oauth2views/header.ejs
+++ b/src/oauth2views/header.ejs
@@ -6,7 +6,7 @@
 
     <title> <%= title %> </title>
 
-    <link href="/api/v1/cloudron/avatar" rel="icon" type="image/png">
+    <link href="/api/v1/cloudron/avatar?<%= Math.random() %>" rel="icon" type="image/png">
 
     <!-- Theme CSS -->
     <link href="<%= adminOrigin %>/theme.css" rel="stylesheet">
@@ -32,7 +32,7 @@
     <nav class="navbar navbar-default navbar-static-top shadow" role="navigation" style="margin-bottom: 0">
         <div class="container-fluid">
             <div class="navbar-header">
-                <span class="navbar-brand navbar-brand-icon"><img src="/api/v1/cloudron/avatar" width="40" height="40"/></span>
+                <span class="navbar-brand navbar-brand-icon"><img src="/api/v1/cloudron/avatar?<%= Math.random() %>" width="40" height="40"/></span>
                 <span class="navbar-brand"><%= cloudronName %></span>
             </div>
         </div>
diff --git a/src/oauth2views/login.ejs b/src/oauth2views/login.ejs
index 78000ec5e..a740cca21 100644
--- a/src/oauth2views/login.ejs
+++ b/src/oauth2views/login.ejs
@@ -8,7 +8,7 @@
             <div class="card">
                 <div class="row">
                     <div class="col-md-12" style="text-align: center;">
-                        <img width="128" height="128" src="<%= applicationLogo %>"/>
+                        <img width="128" height="128" src="<%= applicationLogo %>?<%= Math.random() %>"/>
                         <h1><small>Login to</small> <%= applicationName %></h1>
                         <br/>
                     </div>
diff --git a/webadmin/src/error.html b/webadmin/src/error.html
index ac958d028..2dd4cc31b 100644
--- a/webadmin/src/error.html
+++ b/webadmin/src/error.html
@@ -34,6 +34,10 @@
         app.controller('Controller', ['$scope', '$http', function ($scope, $http) {
             $scope.errorMessage = '';
             $scope.statusOk = false;
+            $scope.avatarUrl = '/api/v1/cloudron/avatar?' + Math.random();
+
+            var favicon = $('#favicon');
+            if (favicon) favicon.attr('href', $scope.avatarUrl);
 
             // try to fetch the cloudron status
             $http.get('/api/v1/cloudron/status').success(function(data, status) {
@@ -58,7 +62,7 @@
 
 <div class="wrapper">
     <div class="content">
-        <img src="/api/v1/cloudron/avatar" onerror="this.src = '/img/logo_inverted_192.png'"/>
+        <img ng-src="avatarUrl" onerror="this.src = '/img/logo_inverted_192.png'"/>
         <h1> Cloudron </h1>
 
         <div ng-show="errorCode == 0">
diff --git a/webadmin/src/noapp.html b/webadmin/src/noapp.html
index 0052ee184..46c82441e 100644
--- a/webadmin/src/noapp.html
+++ b/webadmin/src/noapp.html
@@ -27,7 +27,7 @@
 <div class="wrapper">
     <div class="content">
         <h1>
-            <img width="48" height="48" src="/api/v1/cloudron/avatar" onerror="this.src = '/img/logo_inverted_192.png'"/>
+            <img id="avatar" width="48" height="48" src="/api/v1/cloudron/avatar" onerror="this.src = '/img/logo_inverted_192.png'"/>
             <span style="padding-left:10px">Cloudron</span>
         </h1>
         <br/>
@@ -42,5 +42,16 @@
     <span class="text-muted"><a href="https://chat.cloudron.io" target="_blank">Chat <i class="fa fa-comments"></i></a></span>
 </footer>
 
+<script>
+
+$(function() {
+    var avatarUrl = '/api/v1/cloudron/avatar?' + Math.random();
+
+    $('#favicon').attr('href', avatarUrl);
+    $('#avatar').attr('src', avatarUrl);
+});
+
+</script>
+
 </body>
 </html>