diff --git a/client/src/components/AddContentBlockWidget.vue b/client/src/components/AddContentBlockWidget.vue
index 203cacf1..21d44671 100644
--- a/client/src/components/AddContentBlockWidget.vue
+++ b/client/src/components/AddContentBlockWidget.vue
@@ -28,12 +28,12 @@
 </template>
 
 <script>
-  import LinkIcon from '@/components/images/LinkIcon';
-  import VideoIcon from '@/components/images/VideoIcon';
-  import ImageIcon from '@/components/images/ImageIcon';
-  import TextIcon from '@/components/images/TextIcon';
-  import SpeechBubbleIcon from '@/components/images/SpeechBubbleIcon';
-  import DocumentIcon from '@/components/images/DocumentIcon';
+  import LinkIcon from '@/components/icons/LinkIcon';
+  import VideoIcon from '@/components/icons/VideoIcon';
+  import ImageIcon from '@/components/icons/ImageIcon';
+  import TextIcon from '@/components/icons/TextIcon';
+  import SpeechBubbleIcon from '@/components/icons/SpeechBubbleIcon';
+  import DocumentIcon from '@/components/icons/DocumentIcon';
 
   export default {
     components: {
@@ -42,7 +42,7 @@
       ImageIcon,
       TextIcon,
       SpeechBubbleIcon,
-      DocumentIcon,
+      DocumentIcon
     }
   }
 </script>
diff --git a/client/src/components/AddContentButton.vue b/client/src/components/AddContentButton.vue
index f4eb3d6a..288288e0 100644
--- a/client/src/components/AddContentButton.vue
+++ b/client/src/components/AddContentButton.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-  import AddPointer from '@/components/images/AddPointer';
+  import AddPointer from '@/components/icons/AddPointer';
 
   export default {
     components: {
diff --git a/client/src/components/Checkbox.vue b/client/src/components/Checkbox.vue
index 523b0850..791f122f 100644
--- a/client/src/components/Checkbox.vue
+++ b/client/src/components/Checkbox.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-  import Tick from '@/components/images/Tick.vue';
+  import Tick from '@/components/icons/Tick.vue';
 
   export default {
     props: {
diff --git a/client/src/components/content-blocks/Task.vue b/client/src/components/content-blocks/Task.vue
index 24c88d21..5e322f15 100644
--- a/client/src/components/content-blocks/Task.vue
+++ b/client/src/components/content-blocks/Task.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-  import ChevronRight from '@/components/images/ChevronRight.vue';
+  import ChevronRight from '@/components/icons/ChevronRight.vue';
 
   export default {
     props: ['value'],
diff --git a/client/src/components/images/Add.vue b/client/src/components/icons/Add.vue
similarity index 100%
rename from client/src/components/images/Add.vue
rename to client/src/components/icons/Add.vue
diff --git a/client/src/components/images/AddPointer.vue b/client/src/components/icons/AddPointer.vue
similarity index 100%
rename from client/src/components/images/AddPointer.vue
rename to client/src/components/icons/AddPointer.vue
diff --git a/client/src/components/images/Cards.vue b/client/src/components/icons/Cards.vue
similarity index 100%
rename from client/src/components/images/Cards.vue
rename to client/src/components/icons/Cards.vue
diff --git a/client/src/components/images/ChevronRight.vue b/client/src/components/icons/ChevronRight.vue
similarity index 100%
rename from client/src/components/images/ChevronRight.vue
rename to client/src/components/icons/ChevronRight.vue
diff --git a/client/src/components/images/Cross.vue b/client/src/components/icons/Cross.vue
similarity index 100%
rename from client/src/components/images/Cross.vue
rename to client/src/components/icons/Cross.vue
diff --git a/client/src/components/images/DocumentIcon.vue b/client/src/components/icons/DocumentIcon.vue
similarity index 100%
rename from client/src/components/images/DocumentIcon.vue
rename to client/src/components/icons/DocumentIcon.vue
diff --git a/client/src/components/images/Ellipses.vue b/client/src/components/icons/Ellipses.vue
similarity index 100%
rename from client/src/components/images/Ellipses.vue
rename to client/src/components/icons/Ellipses.vue
diff --git a/client/src/components/images/Group.vue b/client/src/components/icons/Group.vue
similarity index 100%
rename from client/src/components/images/Group.vue
rename to client/src/components/icons/Group.vue
diff --git a/client/src/components/images/ImageIcon.vue b/client/src/components/icons/ImageIcon.vue
similarity index 100%
rename from client/src/components/images/ImageIcon.vue
rename to client/src/components/icons/ImageIcon.vue
diff --git a/client/src/components/images/LinkIcon.vue b/client/src/components/icons/LinkIcon.vue
similarity index 100%
rename from client/src/components/images/LinkIcon.vue
rename to client/src/components/icons/LinkIcon.vue
diff --git a/client/src/components/images/SpeechBubbleIcon.vue b/client/src/components/icons/SpeechBubbleIcon.vue
similarity index 100%
rename from client/src/components/images/SpeechBubbleIcon.vue
rename to client/src/components/icons/SpeechBubbleIcon.vue
diff --git a/client/src/components/images/TextIcon.vue b/client/src/components/icons/TextIcon.vue
similarity index 100%
rename from client/src/components/images/TextIcon.vue
rename to client/src/components/icons/TextIcon.vue
diff --git a/client/src/components/images/Tick.vue b/client/src/components/icons/Tick.vue
similarity index 100%
rename from client/src/components/images/Tick.vue
rename to client/src/components/icons/Tick.vue
diff --git a/client/src/components/images/VideoIcon.vue b/client/src/components/icons/VideoIcon.vue
similarity index 100%
rename from client/src/components/images/VideoIcon.vue
rename to client/src/components/icons/VideoIcon.vue
diff --git a/client/src/components/rooms/AddRoom.vue b/client/src/components/rooms/AddRoom.vue
index 87ba547d..1ebbb63e 100644
--- a/client/src/components/rooms/AddRoom.vue
+++ b/client/src/components/rooms/AddRoom.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-  import Add from '@/components/images/Add.vue';
+  import Add from '@/components/icons/Add.vue';
 
   export default {
     components: {
diff --git a/client/src/components/rooms/AddRoomEntry.vue b/client/src/components/rooms/AddRoomEntry.vue
index 10e7c9fa..8c26704f 100644
--- a/client/src/components/rooms/AddRoomEntry.vue
+++ b/client/src/components/rooms/AddRoomEntry.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-  import Add from '@/components/images/Add';
+  import Add from '@/components/icons/Add';
 
   export default {
     components: {
diff --git a/client/src/components/rooms/RoomEntryCountWidget.vue b/client/src/components/rooms/RoomEntryCountWidget.vue
index ad5d0ba4..3424f6c2 100644
--- a/client/src/components/rooms/RoomEntryCountWidget.vue
+++ b/client/src/components/rooms/RoomEntryCountWidget.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-  import Cards from '@/components/images/Cards.vue';
+  import Cards from '@/components/icons/Cards.vue';
 
   export default {
     props: ['entryCount'],
diff --git a/client/src/components/rooms/RoomGroupWidget.vue b/client/src/components/rooms/RoomGroupWidget.vue
index c48f035a..51774a53 100644
--- a/client/src/components/rooms/RoomGroupWidget.vue
+++ b/client/src/components/rooms/RoomGroupWidget.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-  import Group from '@/components/images/Group.vue';
+  import Group from '@/components/icons/Group.vue';
 
   export default {
     props: ['name', 'year'],
diff --git a/client/src/components/rooms/RoomWidget.vue b/client/src/components/rooms/RoomWidget.vue
index 0b66acd2..e1e8e96b 100644
--- a/client/src/components/rooms/RoomWidget.vue
+++ b/client/src/components/rooms/RoomWidget.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-  import Ellipses from '@/components/images/Ellipses.vue';
+  import Ellipses from '@/components/icons/Ellipses.vue';
   import RoomGroupWidget from '@/components/rooms/RoomGroupWidget';
   import RoomEntryCountWidget from '@/components/rooms/RoomEntryCountWidget';
 
diff --git a/client/src/layouts/SimpleLayout.vue b/client/src/layouts/SimpleLayout.vue
index a94f0d6a..e0a7c3b9 100644
--- a/client/src/layouts/SimpleLayout.vue
+++ b/client/src/layouts/SimpleLayout.vue
@@ -35,7 +35,7 @@
 </style>
 
 <script>
-  import Cross from '@/components/images/Cross';
+  import Cross from '@/components/icons/Cross';
 
   export default {
     components: {