diff --git a/imgsrc/render-logo.py b/imgsrc/render-logo.py
index 1ebbb36c26..777698055b 100755
--- a/imgsrc/render-logo.py
+++ b/imgsrc/render-logo.py
@@ -12,14 +12,19 @@ resources = j(os.path.dirname(base), 'resources')
icons = j(os.path.dirname(base), 'icons')
srv = j(os.path.dirname(os.path.dirname(base)), 'srv')
-def render(outpath, sz):
+
+def render(outpath, sz, background=None):
sz = str(sz)
cmd = ['rsvg-convert', j(base, 'calibre.svg'), '-w', sz, '-h', sz, '-d', '96', '-p', '96', '-o', outpath]
+ if background:
+ cmd.insert(2, background), cmd.insert(2, '-b')
subprocess.check_call(cmd)
subprocess.check_call(['optipng', '-o7', '-strip', 'all', outpath])
+
render(j(resources, 'images', 'library.png'), 1024)
render(j(resources, 'images', 'lt.png'), 256)
+render(j(resources, 'images', 'apple-touch-icon.png'), 256, 'white')
render(j(resources, 'content-server', 'calibre.png'), 128)
render(j(srv, 'main', 'calibre-paypal-logo.png'), 60)
shutil.copy2(j(resources, 'content-server', 'calibre.png'), j(resources, 'content_server', 'calibre.png'))
diff --git a/resources/content-server/index.html b/resources/content-server/index.html
index 3a576be39c..bcfbc0aabf 100644
--- a/resources/content-server/index.html
+++ b/resources/content-server/index.html
@@ -7,6 +7,7 @@
+
diff --git a/resources/images/apple-touch-icon.png b/resources/images/apple-touch-icon.png
new file mode 100644
index 0000000000..2ec345caa4
Binary files /dev/null and b/resources/images/apple-touch-icon.png differ
diff --git a/src/calibre/srv/content.py b/src/calibre/srv/content.py
index 9a782ce778..11918cd441 100644
--- a/src/calibre/srv/content.py
+++ b/src/calibre/srv/content.py
@@ -220,6 +220,11 @@ def favicon(ctx, rd):
return share_open(I('lt.png'), 'rb')
+@endpoint('/apple-touch-icon.png', auth_required=False, cache_control=24)
+def apple_touch_icon(ctx, rd):
+ return share_open(I('apple-touch-icon.png'), 'rb')
+
+
@endpoint('/icon/{+which}', auth_required=False, cache_control=24)
def icon(ctx, rd, which):
sz = rd.query.get('sz')