diff --git a/make/svg.mk b/make/svg.mk
index 4d580e91..7bfa9a98 100644
--- a/make/svg.mk
+++ b/make/svg.mk
@@ -1,10 +1,22 @@
+SVG_GENERATE_FORMATS  ?= png
 SVG                   ?= $(filter-out copied-%,$(wildcard *.svg))
 COPIED_SVG             = $(addprefix copied-,$(notdir $(SVG)))
+
 GENERATED_WIDTHS      ?= 50 100 200 300 400 500 600 700 800 546
-GENERATED_PNG_WIDTHS  ?= $(GENERATED_WIDTHS)
-GENERATED_PNGS         = \
-	$(foreach w, $(GENERATED_PNG_WIDTHS),$(patsubst %.svg,%-$w.png,$(notdir $(SVG))))
-GENERATED_IMAGES       = $(GENERATED_PNGS)
+
+ifneq ($(filter png,$(SVG_GENERATE_FORMATS)),)
+  GENERATED_WIDTHS_PNG  ?= $(GENERATED_WIDTHS)
+  GENERATED_PNG         ?= \
+  	$(foreach w, $(GENERATED_WIDTHS_PNG),$(patsubst %.svg,%-$w.png,$(notdir $(SVG))))
+  GENERATED_IMAGES      += $(GENERATED_PNG)
+endif
+
+ifneq ($(filter ico,$(SVG_GENERATE_FORMATS)),)
+  GENERATED_WIDTHS_ICO  ?= 16 32
+  GENERATED_ICO         ?= \
+  	$(foreach w, $(GENERATED_WIDTHS_ICO),$(patsubst %.svg,%-$w.ico,$(notdir $(SVG))))
+  GENERATED_IMAGES      += $(GENERATED_ICO)
+endif
 
 all: $(GENERATED_IMAGES)
 install:
@@ -23,3 +35,7 @@ copied-%.svg: $(SVG)
 	cp $(filter %$*.svg, $^) $@.tmp
 	mv $@.tmp $@
 
+%.ico: %.png
+	icotool -o $@ -c $<
+
+