diff --git a/README.md b/README.md
index fd4cc64c4..b95dbb139 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,11 @@
## Introduction
-[Wasmer](https://wasmer.io/) is a standalone JIT WebAssembly runtime, aiming to be fully compatible with [WASI](https://github.com/WebAssembly/WASI) and [Emscripten](https://emscripten.org/).
+[Wasmer](https://wasmer.io/) is a standalone WebAssembly runtime, for running WebAssembly [outside of the Browser](https://webassembly.org/docs/non-web/) supporting [WASI](https://github.com/WebAssembly/WASI) and [Emscripten](https://emscripten.org/).
-Install Wasmer with:
+Wasmer can be used as a Command Line Application or as a library embedded in different languages.
+
+Install the Wasmer CLI with:
```sh
curl https://get.wasmer.io -sSfL | sh
@@ -31,20 +33,20 @@ curl https://get.wasmer.io -sSfL | sh
> Note: *Wasmer is also available on Windows. Download the [`WasmerInstaller.exe` from the Github Releases](https://github.com/wasmerio/wasmer/releases) page.*
-Wasmer runtime can also be embedded in different languages, so you can use WebAssembly anywhere ✨:
+Wasmer runtime can also be used as a library embedded in different languages, so you can use WebAssembly anywhere ✨:
| Language | Author(s) | [Maintenance](https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata) | Last release | Social |
|-|-|-|-|-|
-| [**🦀 Rust**](https://github.com/wasmerio/wasmer-rust-example) | Wasmer | actively developed |  |  |
-| [**🔗 C/C++**](https://github.com/wasmerio/wasmer-c-api) | Wasmer | actively developed |  |  |
-| [**🐍 Python**](https://github.com/wasmerio/python-ext-wasm) | Wasmer | actively developed |  |  |
-| [**🐹 Go**](https://github.com/wasmerio/go-ext-wasm) | Wasmer | actively developed |  |  |
-| [**🐘 PHP**](https://github.com/wasmerio/php-ext-wasm) | Wasmer | actively developed |  |  |
-| [**💎 Ruby**](https://github.com/wasmerio/ruby-ext-wasm) | Wasmer | actively developed |  |  |
-| [**🐘 Postgres**](https://github.com/wasmerio/postgres-ext-wasm) | Wasmer | actively developed |  |  |
-| [**#️⃣ C#**](https://github.com/migueldeicaza/WasmerSharp) | [Miguel de Icaza](https://github.com/migueldeicaza) | actively developed |  |  |
-| [**⬭ R**](https://github.com/dirkschumacher/wasmr) | [Dirk Schumacher](https://github.com/dirkschumacher) | actively developed |  |  |
-| [**🐦 Swift**](https://github.com/markmals/swift-ext-wasm) | [Mark Malström](https://github.com/markmals/) | passively maintened |  |  |
+| ![Rust logo][./docs/assets/languages/rust.svg] [**Rust**](https://github.com/wasmerio/wasmer-rust-example) | Wasmer | actively developed |  |  |
+| ![C logo][./docs/assets/languages/c.svg] [**C/C++**](https://github.com/wasmerio/wasmer-c-api) | Wasmer | actively developed |  |  |
+| ![Python logo][./docs/assets/languages/python.svg] [**Python**](https://github.com/wasmerio/python-ext-wasm) | Wasmer | actively developed |  |  |
+| ![Go logo][./docs/assets/languages/go.svg] [**Go**](https://github.com/wasmerio/go-ext-wasm) | Wasmer | actively developed |  |  |
+| ![PHP logo][./docs/assets/languages/php.svg] [**PHP**](https://github.com/wasmerio/php-ext-wasm) | Wasmer | actively developed |  |  |
+| ![Ruby logo][./docs/assets/languages/ruby.svg] [**Ruby**](https://github.com/wasmerio/ruby-ext-wasm) | Wasmer | actively developed |  |  |
+| ![Postgres logo][./docs/assets/languages/postgres.svg] [**Postgres**](https://github.com/wasmerio/postgres-ext-wasm) | Wasmer | actively developed |  |  |
+| ![C# logo][./docs/assets/languages/csharp.svg] [**C#/.Net**](https://github.com/migueldeicaza/WasmerSharp) | [Miguel de Icaza](https://github.com/migueldeicaza) | actively developed |  |  |
+| ![R logo][./docs/assets/languages/r.svg] [**R**](https://github.com/dirkschumacher/wasmr) | [Dirk Schumacher](https://github.com/dirkschumacher) | actively developed |  |  |
+| ![Swift logo][./docs/assets/languages/swift.svg] [**Swift**](https://github.com/markmals/swift-ext-wasm) | [Mark Malström](https://github.com/markmals/) | passively maintened |  |  |
| ❓ | | [your language is missing?](https://github.com/wasmerio/wasmer/issues/new?assignees=&labels=%F0%9F%8E%89+enhancement&template=---feature-request.md&title=) |
### Usage
diff --git a/docs/assets/languages/c.svg b/docs/assets/languages/c.svg
new file mode 100755
index 000000000..e2492e6b5
--- /dev/null
+++ b/docs/assets/languages/c.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/docs/assets/languages/cpp.svg b/docs/assets/languages/cpp.svg
new file mode 100755
index 000000000..84035b8b6
--- /dev/null
+++ b/docs/assets/languages/cpp.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/docs/assets/languages/csharp.svg b/docs/assets/languages/csharp.svg
new file mode 100755
index 000000000..28c059f1e
--- /dev/null
+++ b/docs/assets/languages/csharp.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/docs/assets/languages/go.svg b/docs/assets/languages/go.svg
new file mode 100755
index 000000000..e9eda28d1
--- /dev/null
+++ b/docs/assets/languages/go.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/docs/assets/languages/php.svg b/docs/assets/languages/php.svg
new file mode 100755
index 000000000..8d883e309
--- /dev/null
+++ b/docs/assets/languages/php.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/docs/assets/languages/postgres.svg b/docs/assets/languages/postgres.svg
new file mode 100644
index 000000000..7d430a338
--- /dev/null
+++ b/docs/assets/languages/postgres.svg
@@ -0,0 +1,23 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/assets/languages/python.svg b/docs/assets/languages/python.svg
new file mode 100755
index 000000000..9b7eee497
--- /dev/null
+++ b/docs/assets/languages/python.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/docs/assets/languages/r.svg b/docs/assets/languages/r.svg
new file mode 100644
index 000000000..fbf3e20d5
--- /dev/null
+++ b/docs/assets/languages/r.svg
@@ -0,0 +1,14 @@
+
diff --git a/docs/assets/languages/ruby.svg b/docs/assets/languages/ruby.svg
new file mode 100755
index 000000000..4e5ef4b60
--- /dev/null
+++ b/docs/assets/languages/ruby.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/docs/assets/languages/rust.svg b/docs/assets/languages/rust.svg
new file mode 100755
index 000000000..4d04ee684
--- /dev/null
+++ b/docs/assets/languages/rust.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/docs/assets/languages/swift.svg b/docs/assets/languages/swift.svg
new file mode 100644
index 000000000..8b1bf2cdf
--- /dev/null
+++ b/docs/assets/languages/swift.svg
@@ -0,0 +1,11 @@
+
+
+