diff --git a/data/pictures/gcs_icons/flat_theme/flat_theme.xcf b/data/pictures/gcs_icons/flat_theme/flat_theme.xcf
index 79734e50bb0..cc03c8e81b8 100644
Binary files a/data/pictures/gcs_icons/flat_theme/flat_theme.xcf and b/data/pictures/gcs_icons/flat_theme/flat_theme.xcf differ
diff --git a/data/pictures/gcs_icons/flat_theme/waypoint_eight.png b/data/pictures/gcs_icons/flat_theme/waypoint_eight.png
new file mode 100644
index 00000000000..39fe17de1dd
Binary files /dev/null and b/data/pictures/gcs_icons/flat_theme/waypoint_eight.png differ
diff --git a/data/pictures/gcs_icons/flat_theme/waypoint_five.png b/data/pictures/gcs_icons/flat_theme/waypoint_five.png
new file mode 100644
index 00000000000..b3bceebe384
Binary files /dev/null and b/data/pictures/gcs_icons/flat_theme/waypoint_five.png differ
diff --git a/data/pictures/gcs_icons/flat_theme/waypoint_four.png b/data/pictures/gcs_icons/flat_theme/waypoint_four.png
new file mode 100644
index 00000000000..a9404f56ae2
Binary files /dev/null and b/data/pictures/gcs_icons/flat_theme/waypoint_four.png differ
diff --git a/data/pictures/gcs_icons/flat_theme/waypoint_nine.png b/data/pictures/gcs_icons/flat_theme/waypoint_nine.png
new file mode 100644
index 00000000000..032cee2cd10
Binary files /dev/null and b/data/pictures/gcs_icons/flat_theme/waypoint_nine.png differ
diff --git a/data/pictures/gcs_icons/flat_theme/waypoint_seven.png b/data/pictures/gcs_icons/flat_theme/waypoint_seven.png
new file mode 100644
index 00000000000..ca63c820612
Binary files /dev/null and b/data/pictures/gcs_icons/flat_theme/waypoint_seven.png differ
diff --git a/data/pictures/gcs_icons/flat_theme/waypoint_six.png b/data/pictures/gcs_icons/flat_theme/waypoint_six.png
new file mode 100644
index 00000000000..baf8cf974fe
Binary files /dev/null and b/data/pictures/gcs_icons/flat_theme/waypoint_six.png differ
diff --git a/data/pictures/gcs_icons/flat_theme/waypoint_ten.png b/data/pictures/gcs_icons/flat_theme/waypoint_ten.png
new file mode 100644
index 00000000000..10bad7f495b
Binary files /dev/null and b/data/pictures/gcs_icons/flat_theme/waypoint_ten.png differ
diff --git a/data/pictures/gcs_icons/flat_theme/waypoint_three.png b/data/pictures/gcs_icons/flat_theme/waypoint_three.png
new file mode 100644
index 00000000000..a79a015a65e
Binary files /dev/null and b/data/pictures/gcs_icons/flat_theme/waypoint_three.png differ