diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e22756813..bf4cd0d83f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 6.0.0
+* Breaking: kontorbygg-ikon renamed to kontorbygg-solid-ikon in order to be consistent with how other icons are named. Anyone who where using the `kontorbygg-ikon` and wants to keep using the version with a fill should change to `kontorbygg-solid-ikon`.
+* Add new icons
+    * kontorbygg-ikon (replaces old solid one with a non-solid version)
+    * skyskraper-ikon
+    * personer-ikon
+
 ## 5.3.1
 * No change
 
diff --git a/icons/kontorbygg-ikon.svg b/icons/kontorbygg-ikon.svg
index a984e94bd0..889d082760 100644
--- a/icons/kontorbygg-ikon.svg
+++ b/icons/kontorbygg-ikon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><path d="m130.5,107.9c0-2.326,1.886-4.21,4.21-4.21h8.421c2.326,0,4.21,1.884,4.21,4.21v12.63c0,2.326-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.884-4.21-4.21v-12.63zm27.37,0c0-2.326,1.884-4.21,4.21-4.21h8.421c2.326,0,4.21,1.884,4.21,4.21v12.63c0,2.326-1.884,4.21-4.21,4.21h-8.421c-2.326,0-4.21-1.884-4.21-4.21v-12.63zm-134.7,2.106c0-2.326,1.886-4.212,4.21-4.212h8.421c2.29,0,4.17,1.9,4.17,4.3v12.63c0,2.324-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.886-4.21-4.21v-12.63zm0-35.79c0-2.326,1.886-4.21,4.21-4.21h8.421c2.29,0.05,4.17,1.94,4.17,4.26v12.63c0,2.324-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.886-4.21-4.21v-12.63zm0-33.69c0-2.324,1.886-4.21,4.21-4.21h8.421c2.29,0.06,4.17,1.94,4.17,4.27v12.63c0,2.326-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.884-4.21-4.21v-12.63zm27.37,69.47c0-2.326,1.886-4.212,4.21-4.212h8.421c2.326,0,4.21,1.886,4.21,4.212v12.63c0,2.324-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.886-4.21-4.21v-12.63zm0-35.79c0-2.326,1.886-4.21,4.21-4.21h8.421c2.326,0,4.21,1.884,4.21,4.21v12.63c0,2.324-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.886-4.21-4.21v-12.63zm0-33.69c0-2.324,1.886-4.21,4.21-4.21h8.421c2.326,0,4.21,1.886,4.21,4.21v12.63c0,2.326-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.884-4.21-4.21v-12.63zm67.33,37.95c-5.815,0-10.53,4.712-10.53,10.53v87.34h-14.74v-156.8c0-5.813-4.714-10.53-10.53-10.53h-71.58c-5.836,0.03-10.55,4.74-10.55,10.56v156.8,3.2,11.5h200v-13.58-1.079-87.34c0-5.77-4.7-10.49-10.5-10.49h-71.58z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><path d="m33.924 32.831c-4.8742 0-8.8326 3.8792-8.8326 8.6666v114.96h-20.15c-2.4479 0-4.4285 1.9394-4.4285 4.3309v2.0409c0 2.3872 1.9806 4.3406 4.4285 4.3406h190.12c2.4392 0 4.4285-1.9187 4.4285-4.3406v-2.0409c0-2.3872-1.9892-4.2967-4.4285-4.2967h-20.15v-0.0343-63.703c0-4.783-3.9595-8.6665-8.8423-8.6665h-53.039c-4.8785 0-8.8374 3.8629-8.8374 8.6373v63.713h-8.3834v-114.94c0-4.783-3.9638-8.6666-8.8423-8.6666h-53.039zm2.0751 10.703h48.889v112.92h-48.884-0.005v-112.92zm32.572 10.4c-2.4436 0-4.4285 1.9448-4.4285 4.3406v7.1334c0 2.3958 1.9849 4.3406 4.4285 4.3406h3.6326c2.4436 0 4.4285-1.9448 4.4285-4.3406v-7.1334c0-2.3958-1.9849-4.3406-4.4285-4.3406h-3.6326zm-19.882 0.01c-2.4479 0-4.4236 1.9404-4.4236 4.3406v7.1286c0 2.3958 1.9757 4.3406 4.4236 4.3406v-0.01h3.6326c2.4436 0 4.4236-1.9404 4.4236-4.3406v-7.1188c0-2.4002-1.98-4.3406-4.4236-4.3406h-3.6326zm0 25.155c-2.4479 0-4.4236 1.9404-4.4236 4.3406v7.1188c0 2.3958 1.9757 4.3406 4.4236 4.3406h3.6326c2.4436 0 4.4236-1.935 4.4236-4.3308v-7.1286c0-2.4002-1.98-4.3406-4.4236-4.3406h-3.6326zm19.882 0c-2.4436 0-4.4285 1.9404-4.4285 4.3406v7.1188c0 2.3958 1.9849 4.3406 4.4285 4.3406h3.6326c2.4436 0 4.4285-1.935 4.4285-4.3308v-7.1286c0-2.4002-1.9849-4.3406-4.4285-4.3406h-3.6326zm46.541 15.693h48.879v61.667h-48.879v-61.667zm-66.421 9.468c-2.4479 0-4.4236 1.9448-4.4236 4.3406v7.1334c0 2.3872 1.9757 4.3308 4.4236 4.3308h3.6326c2.4436 0 4.4236-1.9404 4.4236-4.3406v-7.1237c0-2.3959-1.98-4.3406-4.4236-4.3406h-3.6326zm19.882 0c-2.4436 0-4.4285 1.9448-4.4285 4.3406v7.1334c0 2.3872 1.9849 4.3308 4.4285 4.3308h3.6326c2.4436 0 4.4285-1.9404 4.4285-4.3406v-7.1237c0-2.3959-1.9849-4.3406-4.4285-4.3406h-3.6326zm59.216 0c-2.4436 0-4.4236 1.9448-4.4236 4.3406v7.1334c0 2.3872 1.98 4.3308 4.4236 4.3308h3.6375c2.4392 0 4.4187-1.9404 4.4187-4.3406v-7.1237c0-2.3959-1.9795-4.3406-4.4187-4.3406h-3.6375zm19.887 0c-2.4436 0-4.4285 1.9448-4.4285 4.3406h0.005v7.1334c0 2.3872 1.9806 4.3308 4.4285 4.3308h3.6278c2.4436 0 4.4236-1.9404 4.4236-4.3406v-7.1237c0-2.3959-1.98-4.3406-4.4236-4.3406h-3.6326z"/></svg>
diff --git a/icons/kontorbygg-solid-ikon.svg b/icons/kontorbygg-solid-ikon.svg
new file mode 100644
index 0000000000..a984e94bd0
--- /dev/null
+++ b/icons/kontorbygg-solid-ikon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><path d="m130.5,107.9c0-2.326,1.886-4.21,4.21-4.21h8.421c2.326,0,4.21,1.884,4.21,4.21v12.63c0,2.326-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.884-4.21-4.21v-12.63zm27.37,0c0-2.326,1.884-4.21,4.21-4.21h8.421c2.326,0,4.21,1.884,4.21,4.21v12.63c0,2.326-1.884,4.21-4.21,4.21h-8.421c-2.326,0-4.21-1.884-4.21-4.21v-12.63zm-134.7,2.106c0-2.326,1.886-4.212,4.21-4.212h8.421c2.29,0,4.17,1.9,4.17,4.3v12.63c0,2.324-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.886-4.21-4.21v-12.63zm0-35.79c0-2.326,1.886-4.21,4.21-4.21h8.421c2.29,0.05,4.17,1.94,4.17,4.26v12.63c0,2.324-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.886-4.21-4.21v-12.63zm0-33.69c0-2.324,1.886-4.21,4.21-4.21h8.421c2.29,0.06,4.17,1.94,4.17,4.27v12.63c0,2.326-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.884-4.21-4.21v-12.63zm27.37,69.47c0-2.326,1.886-4.212,4.21-4.212h8.421c2.326,0,4.21,1.886,4.21,4.212v12.63c0,2.324-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.886-4.21-4.21v-12.63zm0-35.79c0-2.326,1.886-4.21,4.21-4.21h8.421c2.326,0,4.21,1.884,4.21,4.21v12.63c0,2.324-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.886-4.21-4.21v-12.63zm0-33.69c0-2.324,1.886-4.21,4.21-4.21h8.421c2.326,0,4.21,1.886,4.21,4.21v12.63c0,2.326-1.884,4.21-4.21,4.21h-8.421c-2.324,0-4.21-1.884-4.21-4.21v-12.63zm67.33,37.95c-5.815,0-10.53,4.712-10.53,10.53v87.34h-14.74v-156.8c0-5.813-4.714-10.53-10.53-10.53h-71.58c-5.836,0.03-10.55,4.74-10.55,10.56v156.8,3.2,11.5h200v-13.58-1.079-87.34c0-5.77-4.7-10.49-10.5-10.49h-71.58z"/></svg>
\ No newline at end of file
diff --git a/icons/personer-ikon.svg b/icons/personer-ikon.svg
new file mode 100644
index 0000000000..fd8326cc9f
--- /dev/null
+++ b/icons/personer-ikon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><path d="m 40.642398,37.111388 c -12.196993,0 -22.204416,10.092929 -22.204416,22.441909 l 0,7.361893 c 0,12.348979 10.04542,22.441892 22.204416,22.441892 l 0.356222,0 c 12.158995,0 22.085675,-10.054915 22.085675,-22.441892 l 0,-7.361893 c 0,-12.34898 -9.92668,-22.441909 -22.085675,-22.441909 l -0.356222,0 z m 59.132619,0 c -12.158998,0 -22.085679,10.092929 -22.085679,22.441909 l 0,7.361893 c 0,12.348979 9.926681,22.441892 22.085679,22.441892 l 0.356213,0 c 12.15899,0 22.20442,-10.054915 22.20442,-22.441892 l 0,-7.361893 c 0,-12.34898 -10.04543,-22.441909 -22.20442,-22.441909 l -0.356213,0 z m 59.251353,0 c -12.159,0 -22.20441,10.092929 -22.20441,22.441909 l 0,7.361893 c 0,12.348979 10.04541,22.441892 22.20441,22.441892 l 0.35622,0 c 12.159,0 21.96693,-10.054915 21.96693,-22.441892 l 0,-7.361893 c 0,-12.34898 -9.80793,-22.441909 -21.96693,-22.441909 l -0.35622,0 z m -118.502711,9.024268 0.118739,0 0.237481,0 c 7.295398,0 13.180161,6.084247 13.180161,13.417641 l 0,7.361893 c 0,7.37139 -5.842018,13.417641 -13.06142,13.417641 l -0.356222,0 c -7.295398,0 -13.298902,-6.046251 -13.298902,-13.417641 l 0,-7.361893 c 0,-7.293841 5.938924,-13.352553 13.180163,-13.417641 z m 59.251358,0 0.474953,0 c 7.2574,0 13.18016,6.084247 13.18016,13.417641 l 0,7.361893 c 0,7.37139 -6.0035,13.417641 -13.2989,13.417641 l -0.356213,0 c -7.257402,0 -13.180164,-6.046251 -13.180164,-13.417641 l 0,-7.361893 c 0,-7.333394 5.960759,-13.417641 13.180164,-13.417641 z m 59.132613,0 0.11874,0 0.35622,0 c 7.25741,0 13.18018,6.084247 13.18018,13.417641 l 0,7.361893 c 0,7.37139 -5.96077,13.417641 -13.18018,13.417641 l -0.35622,0 c -7.25739,0 -13.18016,-6.046251 -13.18016,-13.417641 l 0,-7.361893 c 0,-7.292055 5.82261,-13.349667 13.06142,-13.417641 z m 21.96694,50.227095 c -1.63151,-0.09612 -3.17275,0.902432 -3.7997,2.612289 l -0.47495,1.18741 c -0.68395,1.78584 0.10941,3.79968 1.78111,4.7496 6.83943,3.87568 11.28032,11.34205 11.28032,19.47339 l 0,28.14143 -26.59781,0 c -2.16582,0 -3.91843,1.83335 -3.91843,4.03715 l 0,1.18742 c 0,2.16582 1.75261,3.91842 3.91843,3.91842 l 27.78521,0 0,-0.11855 c 4.29364,0 7.7181,-3.46721 7.7181,-7.83686 l 0,-29.32881 c 0,-11.55106 -6.22673,-22.07619 -16.02992,-27.547747 -0.51296,-0.284972 -1.11855,-0.442881 -1.66236,-0.474944 z m -161.842887,0.11855 c -0.54383,0.03038 -1.149407,0.189982 -1.662364,0.474964 C 7.6041265,102.42781 1.3393941,112.8722 1.3393941,124.38525 l 0,29.32883 c 0,4.36963 3.5432066,7.9556 7.8368522,7.9556 l 27.6664657,0 c 2.16582,0 3.918427,-1.83335 3.918427,-4.03716 l 0,-1.06868 c 0,-2.16581 -1.752607,-4.03717 -3.918427,-4.03717 l -26.597804,0 0,-28.14142 c 0,-8.13133 4.440883,-15.47897 11.280319,-19.35465 1.709859,-0.98792 2.465046,-3.08249 1.781101,-4.86835 l -0.474959,-1.06866 c -0.626948,-1.681356 -2.168196,-2.699558 -3.799686,-2.612289 z m 55.807891,0 c -0.549173,0.03038 -1.021167,0.189982 -1.543623,0.474964 -9.765193,5.471545 -16.148666,15.996675 -16.148666,27.547725 l 0,29.32883 c 0,4.36963 3.50521,7.83686 7.836852,7.83686 l 70.056703,0 c 4.29367,0 7.71812,-3.46723 7.71812,-7.83686 l 0,-29.32883 c 0,-11.51305 -6.22674,-22.07618 -16.02991,-27.547725 -2.08983,-1.13991 -4.62613,-0.104474 -5.46206,2.137325 l -0.47496,1.06866 c -0.68394,1.78586 0.10929,3.88043 1.7811,4.86835 6.83943,3.87568 11.28032,11.22332 11.28032,19.35465 l 0,28.14142 -67.80065,0 0,-28.02268 c 0,-8.13132 4.402886,-15.59771 11.280318,-19.47339 1.70986,-0.94992 2.427049,-2.96376 1.781103,-4.7496 l -0.35622,-1.18741 c -0.626949,-1.709865 -2.270906,-2.708449 -3.918427,-2.612289 z"/></svg>
diff --git a/icons/skyskraper-ikon.svg b/icons/skyskraper-ikon.svg
new file mode 100644
index 0000000000..0bed4da410
--- /dev/null
+++ b/icons/skyskraper-ikon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200"><path d="m 73.758401,31.582331 c -4.766447,0 -8.832693,3.852102 -8.832693,8.832545 l 0,117.100174 -58.7508096,0 -0.1338738,0 c -2.3949891,0.065 -4.2825147,2.12508 -4.2825147,4.41631 l 0,2.00749 c 0,2.49675 2.1080648,4.41632 4.4163345,4.41632 l 187.4940556,0 c 2.48384,0 4.41634,-2.08237 4.41634,-4.41632 l 0,-2.00749 c 0,-2.49664 -2.10809,-4.41631 -4.41634,-4.41631 l -58.88464,0 0,-117.100174 c 0,-4.830619 -3.77398,-8.832545 -8.69889,-8.832545 l -52.327015,0 z m 2.275088,10.840011 48.178341,0 0,115.092708 -48.178341,0 0,-115.092708 z m 12.446072,10.840205 c -2.441037,0 -4.282524,1.944153 -4.282524,4.28246 l 0,7.360576 c 0,2.329728 1.798669,4.416419 4.282524,4.416419 l 3.479543,0 c 2.462447,0 4.416358,-2.082365 4.416358,-4.416419 l 0,-7.360576 c 0,-2.483879 -2.108077,-4.28246 -4.416358,-4.28246 l -3.479543,0 z m 19.806659,0 c -2.4496,-0.159382 -4.41636,1.790124 -4.41636,4.28246 l -0.13389,0 0,7.360576 c 0,2.483879 2.1038,4.416419 4.41634,4.416419 l 3.61339,0 c 2.48385,0 4.28252,-2.082365 4.28252,-4.416419 l 0,-7.360576 c 0,-2.483879 -1.96996,-4.28246 -4.28252,-4.28246 l -3.47955,0 z M 88.613393,78.823711 c -2.458164,0 -4.282513,1.948602 -4.282513,4.282655 l 0,7.360478 c 0,2.483878 1.815786,4.282655 4.282513,4.282655 l 3.479544,0 c 2.466728,0 4.282525,-1.935793 4.282525,-4.282655 l 0,-7.360478 c 0,-2.483976 -1.987092,-4.282655 -4.282525,-4.282655 l -3.479544,0 z m 19.672827,0 c -2.44104,0 -4.28253,1.948602 -4.28253,4.282655 l 0,7.360478 c -0.15414,2.483878 1.83612,4.282655 4.14868,4.282655 l 3.61339,0 c 2.45389,0 4.28252,-1.940021 4.28252,-4.282655 l 0,-7.360478 c 0,-2.483976 -1.97852,-4.282655 -4.28252,-4.282655 l -3.47954,0 z m 0,25.561359 c -2.44104,0 -4.28253,2.061 -4.28253,4.41644 l 0,7.09292 c -0.15414,2.48379 1.83612,4.55021 4.14868,4.55021 l 3.61339,0 c 2.46673,0 4.41636,-1.92726 4.41636,-4.28255 l 0,-7.36058 c 0,-2.48387 -2.11236,-4.41644 -4.41636,-4.41644 l -3.47954,0 z m -19.672827,0.13323 c -2.458164,0 -4.416356,1.9485 -4.416356,4.28246 l 0,7.2268 c 0,2.48388 1.932503,4.41632 4.416356,4.41632 l 3.479544,0 c 2.458164,0 4.282525,-1.93992 4.282525,-4.28245 l 0,-7.36067 c 0,-2.48376 -1.974248,-4.28246 -4.282525,-4.28246 l -3.479544,0 z"/></svg>
diff --git a/package.json b/package.json
index 444c048266..3559e4c976 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ffe-icons",
-  "version": "5.3.1",
+  "version": "6.0.0",
   "description": "Felles Front End Icons",
   "main": "index.js",
   "scripts": {
diff --git a/visual-tests/baseline-screenshots/dist/plain/firefox.png b/visual-tests/baseline-screenshots/dist/plain/firefox.png
index ed37cc90e6..640c46a52e 100644
Binary files a/visual-tests/baseline-screenshots/dist/plain/firefox.png and b/visual-tests/baseline-screenshots/dist/plain/firefox.png differ