diff --git a/README.md b/README.md
index 8da703a3..2731dac2 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,11 @@
 Resin Etcher
 ============
 
-[![dependencies](https://david-dm.org/resin-io/resin-etcher.png)](https://david-dm.org/resin-io/resin-etcher.png)
+[![dependencies](https://david-dm.org/resin-io/resin-etcher.svg)](https://david-dm.org/resin-io/resin-etcher.svg)
 [![Build Status](https://travis-ci.org/resin-io/resin-etcher.svg)](https://travis-ci.org/resin-io/resin-etcher)
 [![Build status](https://ci.appveyor.com/api/projects/status/n95c7ggvwc1i03u7/branch/master?svg=true)](https://ci.appveyor.com/project/resin-io/resin-etcher/branch/master)
-[![Stories in Ready](https://badge.waffle.io/resin-io/resin-etcher.png?label=ready&title=Ready)](https://waffle.io/resin-io/resin-etcher)
-
-Join our online chat at [![Gitter chat](https://badges.gitter.im/resin-io/chat.png)](https://gitter.im/resin-io/chat)
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/resin-io/chat)
+[![Stories in Ready](https://badge.waffle.io/resin-io/resin-etcher.svg?label=in progress&title=In Progress)](https://waffle.io/resin-io/resin-etcher)
 
 The easy way to burn images in all operating systems
 ----------------------------------------------------