diff --git a/mod/assign/pix/icon.png b/mod/assign/pix/icon.png
new file mode 100644
index 00000000000..697ddc49035
Binary files /dev/null and b/mod/assign/pix/icon.png differ
diff --git a/mod/assign/pix/icon.svg b/mod/assign/pix/icon.svg
new file mode 100644
index 00000000000..dd137edd214
--- /dev/null
+++ b/mod/assign/pix/icon.svg
@@ -0,0 +1,89 @@
+
+
+
+]>
+
diff --git a/mod/assignment/pix/icon.png b/mod/assignment/pix/icon.png
new file mode 100644
index 00000000000..697ddc49035
Binary files /dev/null and b/mod/assignment/pix/icon.png differ
diff --git a/mod/assignment/pix/icon.svg b/mod/assignment/pix/icon.svg
new file mode 100644
index 00000000000..dd137edd214
--- /dev/null
+++ b/mod/assignment/pix/icon.svg
@@ -0,0 +1,89 @@
+
+
+
+]>
+
diff --git a/mod/book/pix/icon.png b/mod/book/pix/icon.png
index 41095ef1285..f854d878e9e 100644
Binary files a/mod/book/pix/icon.png and b/mod/book/pix/icon.png differ
diff --git a/mod/book/pix/icon.svg b/mod/book/pix/icon.svg
new file mode 100644
index 00000000000..1d94b5c0267
--- /dev/null
+++ b/mod/book/pix/icon.svg
@@ -0,0 +1,80 @@
+
+
+
+]>
+
diff --git a/mod/chat/pix/icon.png b/mod/chat/pix/icon.png
new file mode 100644
index 00000000000..be582624cf2
Binary files /dev/null and b/mod/chat/pix/icon.png differ
diff --git a/mod/chat/pix/icon.svg b/mod/chat/pix/icon.svg
new file mode 100644
index 00000000000..45905a7992d
--- /dev/null
+++ b/mod/chat/pix/icon.svg
@@ -0,0 +1,77 @@
+
+
+
+]>
+
diff --git a/mod/choice/pix/icon.png b/mod/choice/pix/icon.png
new file mode 100644
index 00000000000..ccf19531939
Binary files /dev/null and b/mod/choice/pix/icon.png differ
diff --git a/mod/choice/pix/icon.svg b/mod/choice/pix/icon.svg
new file mode 100644
index 00000000000..fecae2d8fc4
--- /dev/null
+++ b/mod/choice/pix/icon.svg
@@ -0,0 +1,46 @@
+
+
+
+]>
+
diff --git a/mod/data/pix/icon.png b/mod/data/pix/icon.png
new file mode 100644
index 00000000000..02b227962a2
Binary files /dev/null and b/mod/data/pix/icon.png differ
diff --git a/mod/data/pix/icon.svg b/mod/data/pix/icon.svg
new file mode 100644
index 00000000000..dcc1beac3e3
--- /dev/null
+++ b/mod/data/pix/icon.svg
@@ -0,0 +1,87 @@
+
+
+
+]>
+
diff --git a/mod/feedback/pix/icon.png b/mod/feedback/pix/icon.png
new file mode 100644
index 00000000000..da93f5a80ec
Binary files /dev/null and b/mod/feedback/pix/icon.png differ
diff --git a/mod/feedback/pix/icon.svg b/mod/feedback/pix/icon.svg
new file mode 100644
index 00000000000..a7ce66dd90c
--- /dev/null
+++ b/mod/feedback/pix/icon.svg
@@ -0,0 +1,133 @@
+
+
+
+]>
+
diff --git a/mod/folder/pix/icon.png b/mod/folder/pix/icon.png
new file mode 100644
index 00000000000..11f581cd19c
Binary files /dev/null and b/mod/folder/pix/icon.png differ
diff --git a/mod/folder/pix/icon.svg b/mod/folder/pix/icon.svg
new file mode 100644
index 00000000000..f6c4147d8cd
--- /dev/null
+++ b/mod/folder/pix/icon.svg
@@ -0,0 +1,65 @@
+
+
+
+]>
+
diff --git a/mod/forum/pix/icon.png b/mod/forum/pix/icon.png
new file mode 100644
index 00000000000..fc332eecb98
Binary files /dev/null and b/mod/forum/pix/icon.png differ
diff --git a/mod/forum/pix/icon.svg b/mod/forum/pix/icon.svg
new file mode 100644
index 00000000000..a4d101020ff
--- /dev/null
+++ b/mod/forum/pix/icon.svg
@@ -0,0 +1,71 @@
+
+
+
+]>
+
diff --git a/mod/glossary/pix/icon.png b/mod/glossary/pix/icon.png
new file mode 100644
index 00000000000..88ccef330d0
Binary files /dev/null and b/mod/glossary/pix/icon.png differ
diff --git a/mod/glossary/pix/icon.svg b/mod/glossary/pix/icon.svg
new file mode 100644
index 00000000000..fcf9c4b2ebd
--- /dev/null
+++ b/mod/glossary/pix/icon.svg
@@ -0,0 +1,146 @@
+
+
+
+]>
+
diff --git a/mod/imscp/pix/icon.png b/mod/imscp/pix/icon.png
new file mode 100644
index 00000000000..1b3f06d40b3
Binary files /dev/null and b/mod/imscp/pix/icon.png differ
diff --git a/mod/imscp/pix/icon.svg b/mod/imscp/pix/icon.svg
new file mode 100644
index 00000000000..56f90f9138b
--- /dev/null
+++ b/mod/imscp/pix/icon.svg
@@ -0,0 +1,156 @@
+
+
+
+]>
+
diff --git a/mod/label/pix/icon.png b/mod/label/pix/icon.png
new file mode 100644
index 00000000000..f5799bb057a
Binary files /dev/null and b/mod/label/pix/icon.png differ
diff --git a/mod/label/pix/icon.svg b/mod/label/pix/icon.svg
new file mode 100644
index 00000000000..d3a1dd3992e
--- /dev/null
+++ b/mod/label/pix/icon.svg
@@ -0,0 +1,94 @@
+
+
+
+]>
+
diff --git a/mod/lesson/pix/icon.png b/mod/lesson/pix/icon.png
new file mode 100644
index 00000000000..16c4635340b
Binary files /dev/null and b/mod/lesson/pix/icon.png differ
diff --git a/mod/lesson/pix/icon.svg b/mod/lesson/pix/icon.svg
new file mode 100644
index 00000000000..1c23750c986
--- /dev/null
+++ b/mod/lesson/pix/icon.svg
@@ -0,0 +1,126 @@
+
+
+
+]>
+
diff --git a/mod/lti/pix/icon.png b/mod/lti/pix/icon.png
new file mode 100644
index 00000000000..abd0f6baf55
Binary files /dev/null and b/mod/lti/pix/icon.png differ
diff --git a/mod/lti/pix/icon.svg b/mod/lti/pix/icon.svg
new file mode 100644
index 00000000000..ca97acf965f
--- /dev/null
+++ b/mod/lti/pix/icon.svg
@@ -0,0 +1,55 @@
+
+
+
+]>
+
diff --git a/mod/page/pix/icon.png b/mod/page/pix/icon.png
new file mode 100644
index 00000000000..3e8de564cb6
Binary files /dev/null and b/mod/page/pix/icon.png differ
diff --git a/mod/page/pix/icon.svg b/mod/page/pix/icon.svg
new file mode 100644
index 00000000000..140555f83c4
--- /dev/null
+++ b/mod/page/pix/icon.svg
@@ -0,0 +1,112 @@
+
+
+
+]>
+
diff --git a/mod/quiz/pix/icon.png b/mod/quiz/pix/icon.png
index dcaf4565e4e..78d320affb4 100644
Binary files a/mod/quiz/pix/icon.png and b/mod/quiz/pix/icon.png differ
diff --git a/mod/quiz/pix/icon.svg b/mod/quiz/pix/icon.svg
new file mode 100644
index 00000000000..2919404e22e
--- /dev/null
+++ b/mod/quiz/pix/icon.svg
@@ -0,0 +1,90 @@
+
+
+
+]>
+
diff --git a/mod/resource/pix/icon.png b/mod/resource/pix/icon.png
new file mode 100644
index 00000000000..f7941c981f1
Binary files /dev/null and b/mod/resource/pix/icon.png differ
diff --git a/mod/resource/pix/icon.svg b/mod/resource/pix/icon.svg
new file mode 100644
index 00000000000..cd33a8f96b0
--- /dev/null
+++ b/mod/resource/pix/icon.svg
@@ -0,0 +1,60 @@
+
+
+
+]>
+
diff --git a/mod/scorm/pix/icon.png b/mod/scorm/pix/icon.png
new file mode 100644
index 00000000000..9502489cdec
Binary files /dev/null and b/mod/scorm/pix/icon.png differ
diff --git a/mod/scorm/pix/icon.svg b/mod/scorm/pix/icon.svg
new file mode 100644
index 00000000000..9d35629209d
--- /dev/null
+++ b/mod/scorm/pix/icon.svg
@@ -0,0 +1,84 @@
+
+
+
+]>
+
diff --git a/mod/survey/pix/icon.png b/mod/survey/pix/icon.png
new file mode 100644
index 00000000000..b93360f7fda
Binary files /dev/null and b/mod/survey/pix/icon.png differ
diff --git a/mod/survey/pix/icon.svg b/mod/survey/pix/icon.svg
new file mode 100644
index 00000000000..520fbc11eaf
--- /dev/null
+++ b/mod/survey/pix/icon.svg
@@ -0,0 +1,89 @@
+
+
+
+]>
+
diff --git a/mod/url/pix/icon.png b/mod/url/pix/icon.png
new file mode 100644
index 00000000000..e1d04bb3900
Binary files /dev/null and b/mod/url/pix/icon.png differ
diff --git a/mod/url/pix/icon.svg b/mod/url/pix/icon.svg
new file mode 100644
index 00000000000..bcd627c6dda
--- /dev/null
+++ b/mod/url/pix/icon.svg
@@ -0,0 +1,485 @@
+
+
+
+]>
+
diff --git a/mod/wiki/pix/icon.png b/mod/wiki/pix/icon.png
new file mode 100644
index 00000000000..e1a9923c6c6
Binary files /dev/null and b/mod/wiki/pix/icon.png differ
diff --git a/mod/wiki/pix/icon.svg b/mod/wiki/pix/icon.svg
new file mode 100644
index 00000000000..d9e1a5107ae
--- /dev/null
+++ b/mod/wiki/pix/icon.svg
@@ -0,0 +1,228 @@
+
+
+
+]>
+
diff --git a/mod/workshop/pix/icon.png b/mod/workshop/pix/icon.png
new file mode 100644
index 00000000000..c63ca8717d6
Binary files /dev/null and b/mod/workshop/pix/icon.png differ
diff --git a/mod/workshop/pix/icon.svg b/mod/workshop/pix/icon.svg
new file mode 100644
index 00000000000..7f527eae0b7
--- /dev/null
+++ b/mod/workshop/pix/icon.svg
@@ -0,0 +1,98 @@
+
+
+
+]>
+
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index 7672b6e0bda..9a54dfcb240 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -945,6 +945,11 @@ sup {vertical-align: super;}
padding: 0 0 0 0.5em;
}
+.choosercontainer #chooseform .option span.modicon img.icon,
+.choosercontainer #chooseform .nonoption span.modicon img.icon {
+ height: 24px; width: 24px;
+}
+
.choosercontainer #chooseform .option input[type=radio],
.choosercontainer #chooseform .option span.typename,
.choosercontainer #chooseform .option span.modicon {
diff --git a/theme/base/style/course.css b/theme/base/style/course.css
index 3a73692ec97..97dab30c18d 100644
--- a/theme/base/style/course.css
+++ b/theme/base/style/course.css
@@ -6,7 +6,7 @@
.section_add_menus .horizontal form {display:inline;}
.section_add_menus optgroup {font-weight:normal;font-style: italic;}
-.course-content .section .activity img.activityicon {vertical-align:middle;height:16px;width:16px;}
+.course-content .section .activity img.activityicon {vertical-align:text-bottom;height:24px;width:24px;margin-right: 3px;}
.course-content .section .activity .commands img.iconsmall {vertical-align: baseline;}
.course-content .section .activity .commands img {padding: 0 2px;}
.course-content .section .activity:hover { background-color: #EEE; }
diff --git a/theme/standard/style/course.css b/theme/standard/style/course.css
index 895b2022fc6..1b756eecb5e 100644
--- a/theme/standard/style/course.css
+++ b/theme/standard/style/course.css
@@ -23,7 +23,7 @@
.path-course-view .availabilityinfo strong {font-weight:normal;color:black;}
.path-course-view .dimmed_text img {opacity:0.3;filter: alpha(opacity='30');}
.path-course-view .section {font-size:1em;line-height:1.2em;}
-.path-course-view .section .activity {padding:0.2em 0;}
+.path-course-view .section .activity {padding:0.2em 0;line-height: 2em;}
.path-course-view .section .activity a {line-height:1em;}
.path-course-view .section .weekdates {margin: 0;font-weight: normal;font-size: 1em;}
.path-course-view .section .groupinglabel {color: #666666;}
@@ -114,4 +114,4 @@
#page-course-publish-metadata .hubinfo {display:block; margin-bottom:20px;}
#page-course-publish-metadata .hublink {}
#page-course-publish-backup .courseuploadtextinfo {text-align: center;}
-#page-course-publish-backup .sharecoursecontinue {text-align: center;}
\ No newline at end of file
+#page-course-publish-backup .sharecoursecontinue {text-align: center;}