diff --git a/admin/tool/componentlibrary/content/library/adding-images.md b/admin/tool/componentlibrary/content/library/adding-images.md
index 9d6941b0215..8abb1b646f1 100644
--- a/admin/tool/componentlibrary/content/library/adding-images.md
+++ b/admin/tool/componentlibrary/content/library/adding-images.md
@@ -45,9 +45,9 @@ To use images use this syntax:
Syntax for markdown (.md) files:
```
-{{}}
+{{}}
```
Rendered result on this page:
-{{< image "wildebeest-1200.jpg" "Image of a Wildebeest">}}
+{{< image "wildebeest-1200.jpg" "Image of a Wildebeest" "img-fluid">}}
diff --git a/admin/tool/componentlibrary/content/library/getting-started.md b/admin/tool/componentlibrary/content/library/getting-started.md
index 8a14fdf73d5..6cccc1a655d 100644
--- a/admin/tool/componentlibrary/content/library/getting-started.md
+++ b/admin/tool/componentlibrary/content/library/getting-started.md
@@ -13,7 +13,7 @@ weight: 1
-{{< image "logo.png" "The Moodle logo">}}
+{{< image "logo.png" "The Moodle logo" "img-fluid">}}
diff --git a/admin/tool/componentlibrary/content/moodle/components/activityicons.md b/admin/tool/componentlibrary/content/moodle/components/activityicons.md
new file mode 100644
index 00000000000..2a3959aba92
--- /dev/null
+++ b/admin/tool/componentlibrary/content/moodle/components/activityicons.md
@@ -0,0 +1,138 @@
+---
+layout: docs
+title: "Activity icons"
+description: "Activity icons are used to quickly identify the activty types"
+date: 2020-01-14T16:32:24+01:00
+draft: false
+weight: 5
+toc: true
+tags:
+- Available
+- '4.0'
+---
+
+## Activity icon types
+
+Moodle activity icons are single black svg icons that is stored in mod/PLUGINNAME/pix/icon.svg.
+
+### Minimal activity icons
+When rendered in a page with limited space the icons will be shown in their original design, for example on the course gradebook where activity show in the grade table header. Note: the icon is using the ```.icon``` css class for sizing.
+
+
+
+### Coloured activity icons
+In places like the course page and the activity chooser icons have a more prominent role and they should be rendered on a coloured background in white.
+
+The CSS classes for these icons are ```activityiconcontainer``` wrapper class with the added activity name. And the ```activityicon``` class for the image. See the template ```course/format/templates/local/content/cm/title.mustache``` for more info.
+
+{{< example >}}
+
+{{< /example >}}
+
+### Activity purposes
+In the HTML for the example above you might notice the ```assessment``` css class after ```.activityiconcontainer```. This class is the result of assigning a *purpose* to the quiz activity in ```/mod/quiz/lib.php```.
+
+{{< php >}}
+function quiz_supports($feature) {
+ switch($feature) {
+ ..
+ case FEATURE_PLAGIARISM: return true;
+ case FEATURE_MOD_PURPOSE: return MOD_PURPOSE_ASSESSMENT;
+ ..
+ }
+}
+{{< /php >}}
+
+The available activity purposes are:
+
+* Administration
+* Assessment
+* Collaboration
+* Communication
+* Content
+* Interface
+* Other
+
+each defined as 'MOD_PURPOSE_X', so Assessment is MOD_PURPOSE_ASSESSMENT.
+
+### Purpose colours
+
+The activity icon colours can be customised using the theme Boost 'Raw initial SCSS' feature. Simply copy this array of scss colours, customise the colours and done! There is no background colour for the 'Other' type purpose, it defaults to ```light-grey: #f8f9fa```.
+
+{{< highlight scss >}}
+$activity-icon-colors: (
+ "administration": #5d63f6,
+ "assessment": #eb00a2,
+ "collaboration": #f7634d,
+ "communication": #11a676,
+ "content": #399be2,
+ "interface": #a378ff
+);
+{{}}
+
+## Examples
+
+