diff --git a/web/images/check.svg b/web/images/annotation-check.svg
similarity index 100%
rename from web/images/check.svg
rename to web/images/annotation-check.svg
diff --git a/web/images/comment.svg b/web/images/annotation-comment.svg
similarity index 100%
rename from web/images/comment.svg
rename to web/images/annotation-comment.svg
diff --git a/web/images/text.svg b/web/images/annotation-text.svg
similarity index 100%
rename from web/images/text.svg
rename to web/images/annotation-text.svg
diff --git a/web/images/bookmark.svg b/web/images/bookmark.svg
deleted file mode 100644
index bee6efefd..000000000
--- a/web/images/bookmark.svg
+++ /dev/null
@@ -1,662 +0,0 @@
-
-
-
-
diff --git a/web/images/document-print.svg b/web/images/document-print.svg
deleted file mode 100644
index 4d062fbb6..000000000
--- a/web/images/document-print.svg
+++ /dev/null
@@ -1,533 +0,0 @@
-
-
-
diff --git a/web/images/download.svg b/web/images/download.svg
deleted file mode 100644
index 884e3deed..000000000
--- a/web/images/download.svg
+++ /dev/null
@@ -1,620 +0,0 @@
-
-
-
diff --git a/web/images/go-down.svg b/web/images/go-down.svg
deleted file mode 100644
index 655fdba16..000000000
--- a/web/images/go-down.svg
+++ /dev/null
@@ -1,201 +0,0 @@
-
-
-
diff --git a/web/images/go-up.svg b/web/images/go-up.svg
deleted file mode 100644
index 5e2f9a2c6..000000000
--- a/web/images/go-up.svg
+++ /dev/null
@@ -1,197 +0,0 @@
-
-
-
diff --git a/web/images/nav-outline.svg b/web/images/nav-outline.svg
deleted file mode 100644
index 4d4323ce3..000000000
--- a/web/images/nav-outline.svg
+++ /dev/null
@@ -1,202 +0,0 @@
-
-
-
-
diff --git a/web/images/nav-thumbs.svg b/web/images/nav-thumbs.svg
deleted file mode 100644
index 8737b8cb6..000000000
--- a/web/images/nav-thumbs.svg
+++ /dev/null
@@ -1,283 +0,0 @@
-
-
-
-
diff --git a/web/images/pin-down.svg b/web/images/pin-down.svg
deleted file mode 100644
index 357667600..000000000
--- a/web/images/pin-down.svg
+++ /dev/null
@@ -1,297 +0,0 @@
-
-
-
-
diff --git a/web/images/pin-up.svg b/web/images/pin-up.svg
deleted file mode 100644
index e55cec7a0..000000000
--- a/web/images/pin-up.svg
+++ /dev/null
@@ -1,230 +0,0 @@
-
-
-
-
diff --git a/web/images/zoom-in.svg b/web/images/zoom-in.svg
deleted file mode 100644
index 48ee42dd9..000000000
--- a/web/images/zoom-in.svg
+++ /dev/null
@@ -1,437 +0,0 @@
-
-
-
diff --git a/web/images/zoom-out.svg b/web/images/zoom-out.svg
deleted file mode 100644
index eb13b60e3..000000000
--- a/web/images/zoom-out.svg
+++ /dev/null
@@ -1,425 +0,0 @@
-
-
-
diff --git a/web/viewer.js b/web/viewer.js
index ba3bc6a35..849ef8301 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -836,7 +836,7 @@ var PageView = function pageView(container, pdfPage, id, scale,
var type = item.type;
var rect = viewport.convertToViewportRectangle(item.rect);
rect = PDFJS.Util.normalizeRect(rect);
- image.src = kImageDirectory + type.toLowerCase() + '.svg';
+ image.src = kImageDirectory + 'annotation-' + type.toLowerCase() + '.svg';
image.alt = mozL10n.get('text_annotation_type', {type: type});
var content = document.createElement('div');
content.setAttribute('hidden', true);