diff --git a/lib/ex_doc/formatter/epub/templates/content_template.eex b/lib/ex_doc/formatter/epub/templates/content_template.eex
index ef078eec6..de22444f2 100644
--- a/lib/ex_doc/formatter/epub/templates/content_template.eex
+++ b/lib/ex_doc/formatter/epub/templates/content_template.eex
@@ -17,40 +17,30 @@
   <manifest>
     <item id="nav" href="nav.xhtml" media-type="application/xhtml+xml" properties="nav scripted"/>
     <item id="cover" href="title.xhtml" media-type="application/xhtml+xml" properties="scripted"/>
-    <%= for {_title, extras} <- config.extras do %>
-      <%= for extra <- extras do %>
-        <item id="<%= URI.encode extra.id %>" href="<%= URI.encode extra.id %>.xhtml" media-type="application/xhtml+xml" properties="scripted"/>
-      <% end %>
+    <%= for {_title, extras} <- config.extras, extra <- extras do %>
+      <item id="<%= URI.encode extra.id %>" href="<%= URI.encode extra.id %>.xhtml" media-type="application/xhtml+xml" properties="scripted"/>
     <% end %>
-    <%= for filter <- [:modules, :tasks] do %>
-      <%= for node <- nodes[filter] do %>
-        <item id="<%= URI.encode node.id %>" href="<%= URI.encode node.id %>.xhtml" media-type="application/xhtml+xml" properties="scripted"/>
-      <% end %>
+    <%= for filter <- [:modules, :tasks], node <- nodes[filter] do %>
+      <item id="<%= URI.encode node.id %>" href="<%= URI.encode node.id %>.xhtml" media-type="application/xhtml+xml" properties="scripted"/>
     <% end %>
     <%= for static_file <- static_files do %>
       <item id="<%= static_file_to_id(static_file) %>" href="<%= static_file %>" media-type="<%= media_type(Path.extname(static_file)) %>"/>
     <% end %>
     <%= if config.cover do %>
-      <%= if Path.extname(config.cover) == ".png" do %>
-        <item id="cover-image" href="assets/cover.png" media-type="image/png"/>
-      <% end %>
-      <%= if Path.extname(config.cover) == ".jpg" do %>
-        <item id="cover-image" href="assets/cover.jpg" media-type="image/jpeg"/>
-      <% end %>
+      <item id="cover-image" href="assets/cover<%= Path.extname(config.cover) %>" media-type="<%= media_type(Path.extname(config.cover))%>"/>
+    <% end %>
+    <%= if config.logo do %>
+      <item id="logo" href="assets/logo<%= Path.extname(config.logo) %>" media-type="<%= media_type(Path.extname(config.logo))%>"/>
     <% end %>
   </manifest>
   <spine>
     <itemref idref="cover"/>
     <itemref idref="nav"/>
-    <%= for {_title, extras} <- config.extras do %>
-      <%= for extra <- extras do %>
-        <itemref idref="<%= URI.encode extra.id %>"/>
-      <% end %>
-    <% end %>
-    <%= for filter <- [:modules, :tasks] do %>
-      <%= for node <- nodes[filter] do %>
-        <itemref idref="<%= URI.encode node.id %>"/>
-      <% end %>
+    <%= for {_title, extras} <- config.extras, extra <- extras do %>
+      <itemref idref="<%= URI.encode extra.id %>"/>
+    <% end %>
+    <%= for filter <- [:modules, :tasks], node <- nodes[filter] do %>
+      <itemref idref="<%= URI.encode node.id %>"/>
     <% end %>
   </spine>
 </package>