diff --git a/spec/components/sdg/goals/icon_component_spec.rb b/spec/components/sdg/goals/icon_component_spec.rb
index 2894957d7..408428d57 100644
--- a/spec/components/sdg/goals/icon_component_spec.rb
+++ b/spec/components/sdg/goals/icon_component_spec.rb
@@ -10,10 +10,16 @@ describe SDG::Goals::IconComponent do
expect(component.image_path).to eq "sdg/es/goal_8.png"
end
+ it "returns a PNG icon when it isn't available in SVG" do
+ allow(I18n).to receive(:fallbacks).and_return({ en: [:de] })
+
+ expect(component.image_path).to eq "sdg/de/goal_8.png"
+ end
+
it "returns the default icons when no fallback language has icons" do
allow(I18n).to receive(:fallbacks).and_return({})
- expect(component.image_path).to eq "sdg/default/goal_8.png"
+ expect(component.image_path).to eq "sdg/default/goal_8.svg"
end
end
end
diff --git a/vendor/assets/images/sdg/default/goal_1.svg b/vendor/assets/images/sdg/default/goal_1.svg
new file mode 100644
index 000000000..b755df475
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_1.svg
@@ -0,0 +1,53 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_10.svg b/vendor/assets/images/sdg/default/goal_10.svg
new file mode 100644
index 000000000..9efbf9446
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_10.svg
@@ -0,0 +1,52 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_11.svg b/vendor/assets/images/sdg/default/goal_11.svg
new file mode 100644
index 000000000..ac58718eb
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_11.svg
@@ -0,0 +1,62 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_12.svg b/vendor/assets/images/sdg/default/goal_12.svg
new file mode 100644
index 000000000..c75a37827
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_12.svg
@@ -0,0 +1,63 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_13.svg b/vendor/assets/images/sdg/default/goal_13.svg
new file mode 100644
index 000000000..050331446
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_13.svg
@@ -0,0 +1,35 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_14.svg b/vendor/assets/images/sdg/default/goal_14.svg
new file mode 100644
index 000000000..5e823f579
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_14.svg
@@ -0,0 +1,40 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_15.svg b/vendor/assets/images/sdg/default/goal_15.svg
new file mode 100644
index 000000000..5114469fe
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_15.svg
@@ -0,0 +1,40 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_16.svg b/vendor/assets/images/sdg/default/goal_16.svg
new file mode 100644
index 000000000..2dd0eb02d
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_16.svg
@@ -0,0 +1,71 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_17.svg b/vendor/assets/images/sdg/default/goal_17.svg
new file mode 100644
index 000000000..083d73026
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_17.svg
@@ -0,0 +1,45 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_2.svg b/vendor/assets/images/sdg/default/goal_2.svg
new file mode 100644
index 000000000..9eead468f
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_2.svg
@@ -0,0 +1,40 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_3.svg b/vendor/assets/images/sdg/default/goal_3.svg
new file mode 100644
index 000000000..437fe7cad
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_3.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_4.svg b/vendor/assets/images/sdg/default/goal_4.svg
new file mode 100644
index 000000000..c45940b4e
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_4.svg
@@ -0,0 +1,43 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_5.svg b/vendor/assets/images/sdg/default/goal_5.svg
new file mode 100644
index 000000000..3fa837431
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_5.svg
@@ -0,0 +1,39 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_6.svg b/vendor/assets/images/sdg/default/goal_6.svg
new file mode 100644
index 000000000..68b006b3c
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_6.svg
@@ -0,0 +1,44 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_7.svg b/vendor/assets/images/sdg/default/goal_7.svg
new file mode 100644
index 000000000..72a513672
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_7.svg
@@ -0,0 +1,63 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_8.svg b/vendor/assets/images/sdg/default/goal_8.svg
new file mode 100644
index 000000000..a13d3769b
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_8.svg
@@ -0,0 +1,59 @@
+
+
diff --git a/vendor/assets/images/sdg/default/goal_9.svg b/vendor/assets/images/sdg/default/goal_9.svg
new file mode 100644
index 000000000..805d8c0a5
--- /dev/null
+++ b/vendor/assets/images/sdg/default/goal_9.svg
@@ -0,0 +1,61 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_1.svg b/vendor/assets/images/sdg/en/goal_1.svg
new file mode 100644
index 000000000..b755df475
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_1.svg
@@ -0,0 +1,53 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_10.svg b/vendor/assets/images/sdg/en/goal_10.svg
new file mode 100644
index 000000000..9efbf9446
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_10.svg
@@ -0,0 +1,52 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_11.svg b/vendor/assets/images/sdg/en/goal_11.svg
new file mode 100644
index 000000000..ac58718eb
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_11.svg
@@ -0,0 +1,62 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_12.svg b/vendor/assets/images/sdg/en/goal_12.svg
new file mode 100644
index 000000000..c75a37827
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_12.svg
@@ -0,0 +1,63 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_13.svg b/vendor/assets/images/sdg/en/goal_13.svg
new file mode 100644
index 000000000..050331446
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_13.svg
@@ -0,0 +1,35 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_14.svg b/vendor/assets/images/sdg/en/goal_14.svg
new file mode 100644
index 000000000..5e823f579
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_14.svg
@@ -0,0 +1,40 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_15.svg b/vendor/assets/images/sdg/en/goal_15.svg
new file mode 100644
index 000000000..5114469fe
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_15.svg
@@ -0,0 +1,40 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_16.svg b/vendor/assets/images/sdg/en/goal_16.svg
new file mode 100644
index 000000000..2dd0eb02d
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_16.svg
@@ -0,0 +1,71 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_17.svg b/vendor/assets/images/sdg/en/goal_17.svg
new file mode 100644
index 000000000..083d73026
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_17.svg
@@ -0,0 +1,45 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_2.svg b/vendor/assets/images/sdg/en/goal_2.svg
new file mode 100644
index 000000000..9eead468f
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_2.svg
@@ -0,0 +1,40 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_3.svg b/vendor/assets/images/sdg/en/goal_3.svg
new file mode 100644
index 000000000..437fe7cad
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_3.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_4.svg b/vendor/assets/images/sdg/en/goal_4.svg
new file mode 100644
index 000000000..c45940b4e
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_4.svg
@@ -0,0 +1,43 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_5.svg b/vendor/assets/images/sdg/en/goal_5.svg
new file mode 100644
index 000000000..3fa837431
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_5.svg
@@ -0,0 +1,39 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_6.svg b/vendor/assets/images/sdg/en/goal_6.svg
new file mode 100644
index 000000000..68b006b3c
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_6.svg
@@ -0,0 +1,44 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_7.svg b/vendor/assets/images/sdg/en/goal_7.svg
new file mode 100644
index 000000000..72a513672
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_7.svg
@@ -0,0 +1,63 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_8.svg b/vendor/assets/images/sdg/en/goal_8.svg
new file mode 100644
index 000000000..a13d3769b
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_8.svg
@@ -0,0 +1,59 @@
+
+
diff --git a/vendor/assets/images/sdg/en/goal_9.svg b/vendor/assets/images/sdg/en/goal_9.svg
new file mode 100644
index 000000000..805d8c0a5
--- /dev/null
+++ b/vendor/assets/images/sdg/en/goal_9.svg
@@ -0,0 +1,61 @@
+
+