diff --git a/templates/shortcodes/badge.html b/templates/shortcodes/badge.html
index dfe82a7f..26d99146 100644
--- a/templates/shortcodes/badge.html
+++ b/templates/shortcodes/badge.html
@@ -1,3 +1,3 @@
 <span class="badge">
-  <a href="{{ url }}" title="{{ title }}"><img src="/images/badges/{{ img }}" width="200px"></a>
+  <a href="{{ url }}" title="{{ title }}"><img src="/images/badges/{{ img }}"></a>
 </span>
diff --git a/templates/shortcodes/screenshot.html b/templates/shortcodes/screenshot.html
index d271e58c..8c08eb7c 100644
--- a/templates/shortcodes/screenshot.html
+++ b/templates/shortcodes/screenshot.html
@@ -1 +1 @@
-<img class="screenshot" src={{ src }} alt={{ alt }} title={{ alt }} />
+<img class="screenshot" src="{{ src }}" alt="{{ alt }}" title="{{ alt }}" />