diff --git a/content/about/history.md b/content/about/history.md
index 821bae1d..bbc7338e 100644
--- a/content/about/history.md
+++ b/content/about/history.md
@@ -115,7 +115,7 @@ On December 9, <b>2007</b> GRASS started to use SVN and Trac bug tracker hosted
 </ul>
 </div>
 <div class="col-lg-4 col-sm-12">
- <center><img src="/images/logos/30-years-grass-gis-logo-black-300px.png"  width="83%" /></center>
+ <center><img src="/images/logos/historical_logos/30-years-grass-gis-logo-black-300px.png"  width="83%" /></center>
 </div>
 </div>
 </div>
diff --git a/static/images/logos/banner.jpg b/static/images/banners/banner.jpg
similarity index 100%
rename from static/images/logos/banner.jpg
rename to static/images/banners/banner.jpg
diff --git a/static/images/logos/grass-blue.svg b/static/images/logos/grass-blue.svg
deleted file mode 100644
index 6c24b400..00000000
--- a/static/images/logos/grass-blue.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<svg width="961" height="1162" viewBox="0 0 961 1162" fill="none" xmlns="http://www.w3.org/2000/svg">
-<mask id="mask0_86_14" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="76" y="93" width="809" height="784">
-<path d="M85.508 506.831C72.8307 494.543 72.8307 474.621 85.508 462.333L457.046 102.216C469.723 89.9281 490.277 89.9281 502.955 102.216L874.493 462.333C887.171 474.621 887.171 494.543 874.493 506.831L502.955 866.947C490.277 879.235 469.723 879.235 457.046 866.947L85.508 506.831Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_86_14)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M85.0551 470.23C73.6138 481.49 73.6138 499.747 85.055 511.007L459.282 879.318C469.396 889.273 485.067 890.427 496.469 882.781L463.022 876.566C463.022 876.566 452.033 859.129 447.211 851.272C433.932 830.799 416.001 797.906 403.102 774.243L403.1 774.238L403.096 774.231C398.098 765.062 393.855 757.279 390.932 752.144C384.003 740.923 379.68 734.145 376.276 728.808L376.275 728.807C367.513 715.07 364.838 710.877 339.48 665.012C335.048 656.995 330.896 649.514 326.992 642.48L326.984 642.468L326.974 642.447L326.966 642.434C290.932 577.514 276.061 550.719 257.255 492.342C236.408 427.628 233.577 395.758 238.065 404.923C257.645 444.898 276.159 473.62 299.734 510.195C323.781 547.502 353.092 592.976 394.171 666.893C384.282 614.675 376.344 553.483 374.362 486.469C435.799 595.365 467.546 861.303 467.546 861.303C467.546 861.303 473.33 654.056 480.189 506.415C474.605 499.857 469.95 491.168 474.158 484.711C477.71 479.261 475.653 474.055 473.472 468.532C471.879 464.498 470.219 460.295 470.627 455.705C472.014 440.1 465.218 426.561 460.823 417.805C459.713 415.593 458.756 413.687 458.124 412.13C457.387 410.316 456.276 408.177 455.035 405.788C450.994 398.005 445.575 387.571 447.208 377.096C449.005 365.583 447.357 359.113 445.742 352.779C445.437 351.582 445.133 350.388 444.854 349.168C443.766 344.408 448.28 341.193 451.846 338.652C454.035 337.093 455.867 335.789 455.829 334.537C455.79 333.222 453.88 330.107 451.578 326.355C448.115 320.71 443.769 313.626 443.582 309.064C443.39 304.397 445.544 299.91 447.473 295.888L447.474 295.887C448.685 293.361 449.808 291.02 450.209 288.933C450.686 286.442 449.969 279.694 449.233 272.764C448.368 264.629 447.478 256.241 448.46 254.192C449.211 252.626 448.994 248.777 448.764 244.693C448.437 238.875 448.082 232.58 450.457 231.722C452.999 230.803 457.698 234.82 462.018 238.513C464.567 240.693 466.984 242.759 468.748 243.632L468.919 243.716C474.25 246.352 483.737 251.042 487.376 267.308C491.997 271.282 502.147 281.892 505.456 289.365C508.763 296.838 505.639 326.158 505.639 326.158C506.807 330.212 510.628 334.856 514.465 339.519C519.043 345.082 523.642 350.672 523.779 355.317C526.376 362.729 524.798 389.762 524.798 389.762C524.798 389.762 523.478 408.46 518.538 414.27C513.599 420.08 514.564 435.741 516.054 443.168C517.544 450.596 509.67 462.46 509.67 462.46C509.67 462.46 508.386 478.53 505.811 487.481C504.124 493.342 497.394 503.132 492.948 509.194C491.334 573.984 488.726 649.809 486.312 714.434C491.593 702.807 493.371 699.969 499.785 689.725C502.554 685.303 506.186 679.5 511.337 671.018C519.222 658.033 530.402 641.067 541.547 624.155L541.548 624.154C559.036 597.616 576.435 571.212 580.866 560.545C582.095 557.587 583.516 554.274 585.045 550.709C592.546 533.221 602.652 509.664 605.4 492.145C612.734 521.199 612.839 558.447 607.923 577.457C603.006 596.467 573.685 647.784 557.91 669.604C555.281 673.239 552.318 677.293 549.106 681.688L549.08 681.724L549.078 681.726L549.077 681.728L549.076 681.729C530.196 707.56 502.713 745.16 483.827 778.99C481.89 827.962 480.471 860.911 480.471 860.911C480.471 860.911 498.793 784.496 558.181 695.58C617.569 606.666 678.629 494.798 684.573 477.052C690.517 459.306 710.109 398.325 680.378 335.19C710.592 364.154 738.047 434.442 725.043 482.654C712.038 530.867 665.644 621.08 633.521 668.896C539.478 808.891 498.011 874.363 497.204 882.272C498.432 881.393 499.606 880.408 500.713 879.318L874.94 511.007C886.381 499.746 886.381 481.49 874.94 470.23L500.714 101.919C489.273 90.6585 470.723 90.6585 459.282 101.919L85.0551 470.23Z" fill="#00393F" stroke="#00393F" stroke-width="0.968576"/>
-</g>
-<path d="M275.72 942.822L292.22 925.822C267.82 899.822 228.22 904.822 215.22 910.322C195.72 918.572 185.554 933.822 180.22 942.822C168.22 964.422 170.554 999.488 173.22 1014.32C178.42 1039.92 194.054 1054.32 201.22 1058.32C220.02 1068.32 247.387 1067.82 258.72 1066.32C275.92 1062.32 288.22 1055.32 292.22 1052.32V975.822H237.22L238.72 1000.32H261.22V1038.32C249.62 1045.12 234.387 1043.49 228.22 1041.82C218.72 1037.82 213.22 1031.82 210.72 1026.32C208.22 1020.82 203.72 1013.32 204.72 982.322C205.52 957.522 213.054 945.655 216.72 942.822C237.22 920.822 264.054 933.322 275.72 942.822Z" fill="#00393F" stroke="#00393F" stroke-width="2"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M305.721 910.821V1064.82H334.721V1003.82H353.221L387.221 1064.82H422.721L383.221 997.821C392.054 993.488 410.121 981.521 411.721 968.321C413.321 955.121 412.387 945.821 411.721 942.821C410.221 934.821 401.821 917.621 380.221 912.821L368.221 910.821H305.721ZM336.721 931.821V978.321H367.221C382.221 971.321 391.721 943.821 366.721 932.321L336.721 931.821Z" fill="#00393F" stroke="#00393F"/>
-<path d="M305.721 1064.82H304.721V1065.82H305.721V1064.82ZM305.721 910.821V909.821H304.721V910.821H305.721ZM334.721 1064.82V1065.82H335.721V1064.82H334.721ZM334.721 1003.82V1002.82H333.721V1003.82H334.721ZM353.221 1003.82L354.094 1003.33L353.808 1002.82H353.221V1003.82ZM387.221 1064.82L386.347 1065.31L386.633 1065.82H387.221V1064.82ZM422.721 1064.82V1065.82H424.471L423.582 1064.31L422.721 1064.82ZM383.221 997.821L382.78 996.924L381.811 997.399L382.359 998.329L383.221 997.821ZM411.721 942.821L410.738 943.005L410.741 943.022L410.744 943.038L411.721 942.821ZM380.221 912.821L380.438 911.845L380.411 911.839L380.385 911.835L380.221 912.821ZM368.221 910.821L368.385 909.835L368.303 909.821H368.221V910.821ZM336.721 978.321H335.721V979.321H336.721V978.321ZM336.721 931.821L336.737 930.821L335.721 930.805V931.821H336.721ZM367.221 978.321V979.321H367.443L367.644 979.227L367.221 978.321ZM366.721 932.321L367.139 931.413L366.948 931.325L366.737 931.321L366.721 932.321ZM306.721 1064.82V910.821H304.721V1064.82H306.721ZM334.721 1063.82H305.721V1065.82H334.721V1063.82ZM333.721 1003.82V1064.82H335.721V1003.82H333.721ZM353.221 1002.82H334.721V1004.82H353.221V1002.82ZM388.094 1064.33L354.094 1003.33L352.347 1004.31L386.347 1065.31L388.094 1064.33ZM422.721 1063.82H387.221V1065.82H422.721V1063.82ZM382.359 998.329L421.859 1065.33L423.582 1064.31L384.082 997.313L382.359 998.329ZM410.728 968.201C409.974 974.425 405.294 980.506 399.518 985.65C393.777 990.762 387.131 994.789 382.78 996.924L383.661 998.719C388.144 996.52 394.948 992.397 400.848 987.143C406.714 981.92 411.868 975.418 412.713 968.442L410.728 968.201ZM410.744 943.038C411.38 945.9 412.318 955.082 410.728 968.201L412.713 968.442C414.323 955.161 413.394 945.742 412.697 942.604L410.744 943.038ZM380.004 913.798C401.114 918.489 409.291 935.289 410.738 943.005L412.704 942.637C411.15 934.354 402.527 916.754 380.438 911.845L380.004 913.798ZM368.056 911.808L380.056 913.808L380.385 911.835L368.385 909.835L368.056 911.808ZM305.721 911.821H368.221V909.821H305.721V911.821ZM337.721 978.321V931.821H335.721V978.321H337.721ZM367.221 977.321H336.721V979.321H367.221V977.321ZM366.303 933.23C372.388 936.029 376.308 939.769 378.581 943.862C380.856 947.958 381.518 952.475 380.978 956.887C379.891 965.762 373.959 974.073 366.798 977.415L367.644 979.227C375.482 975.57 381.8 966.631 382.963 957.13C383.548 952.355 382.836 947.404 380.329 942.89C377.821 938.374 373.553 934.363 367.139 931.413L366.303 933.23ZM336.704 932.821L366.704 933.321L366.737 931.321L336.737 930.821L336.704 932.821Z" fill="#00393F"/>
-<path d="M304.721 1064.82H305.721V1065.82M304.721 1064.82V1065.82H305.721M304.721 1064.82V910.821M304.721 1064.82H306.721V910.821H304.721M305.721 1065.82V1063.82H334.721V1065.82M305.721 1065.82H334.721M305.721 909.821V910.821H304.721M305.721 909.821H304.721V910.821M305.721 909.821H368.221M305.721 909.821V911.821H368.221V909.821M334.721 1065.82V1064.82H335.721M334.721 1065.82H335.721V1064.82M335.721 1064.82H333.721V1003.82M335.721 1064.82V1003.82H333.721M334.721 1002.82V1003.82H333.721M334.721 1002.82H333.721V1003.82M334.721 1002.82H353.221M334.721 1002.82V1004.82H353.221V1002.82M354.094 1003.33L353.221 1003.82V1002.82M354.094 1003.33L353.808 1002.82H353.221M354.094 1003.33L388.094 1064.33L386.347 1065.31M354.094 1003.33L352.347 1004.31L386.347 1065.31M386.347 1065.31L387.221 1064.82V1065.82M386.347 1065.31L386.633 1065.82H387.221M387.221 1065.82V1063.82H422.721V1065.82M387.221 1065.82H422.721M422.721 1065.82V1064.82L423.582 1064.31M422.721 1065.82H424.471L423.582 1064.31M423.582 1064.31L421.859 1065.33L382.359 998.329M423.582 1064.31L384.082 997.313L382.359 998.329M382.78 996.924L383.221 997.821L382.359 998.329M382.78 996.924L381.811 997.399L382.359 998.329M382.78 996.924C387.131 994.789 393.777 990.762 399.518 985.65C405.294 980.506 409.974 974.425 410.728 968.201M382.78 996.924L383.661 998.719C388.144 996.52 394.948 992.397 400.848 987.143C406.714 981.92 411.868 975.418 412.713 968.442M411.721 968.321L412.713 968.442M412.713 968.442L410.728 968.201M412.713 968.442C414.323 955.161 413.394 945.742 412.697 942.604L410.744 943.038M410.738 943.005L411.721 942.821L410.744 943.038M410.738 943.005L410.741 943.022L410.744 943.038M410.738 943.005C409.291 935.289 401.114 918.489 380.004 913.798L380.438 911.845M410.738 943.005L412.704 942.637C411.15 934.354 402.527 916.754 380.438 911.845M410.744 943.038C411.38 945.9 412.318 955.082 410.728 968.201M380.438 911.845L380.221 912.821L380.385 911.835M380.438 911.845L380.411 911.839L380.385 911.835M380.385 911.835L380.056 913.808L368.056 911.808L368.385 909.835M380.385 911.835L368.385 909.835M368.385 909.835L368.221 910.821V909.821M368.385 909.835L368.303 909.821H368.221M335.721 978.321H336.721V979.321M335.721 978.321V979.321H336.721M335.721 978.321V931.821M335.721 978.321H337.721V931.821H335.721M336.721 979.321V977.321H367.221V979.321M336.721 979.321H367.221M336.737 930.821L336.721 931.821H335.721M336.737 930.821L335.721 930.805V931.821M336.737 930.821L366.737 931.321M336.737 930.821L336.704 932.821L366.704 933.321L366.737 931.321M367.221 979.321V978.321L367.644 979.227M367.221 979.321H367.443L367.644 979.227M367.644 979.227L366.798 977.415C373.959 974.073 379.891 965.762 380.978 956.887C381.518 952.475 380.856 947.958 378.581 943.862C376.308 939.769 372.388 936.029 366.303 933.23L367.139 931.413M367.644 979.227C375.482 975.57 381.8 966.631 382.963 957.13C383.548 952.355 382.836 947.404 380.329 942.89C377.821 938.374 373.553 934.363 367.139 931.413M367.139 931.413L366.721 932.321L366.737 931.321M367.139 931.413L366.948 931.325L366.737 931.321" stroke="#00393F"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M422.221 1064.82H450.221L460.721 1029.32H508.721L519.221 1064.82H552.221L504.721 909.821H466.721L417.721 1064.82H422.221ZM466.721 1005.32H503.221L484.721 939.821L466.721 1005.32Z" fill="#00393F" stroke="#00393F"/>
-<path d="M450.221 1064.82V1065.82H450.968L451.18 1065.1L450.221 1064.82ZM460.721 1029.32V1028.32H459.974L459.762 1029.04L460.721 1029.32ZM508.721 1029.32L509.68 1029.04L509.468 1028.32H508.721V1029.32ZM519.221 1064.82L518.262 1065.1L518.474 1065.82H519.221V1064.82ZM552.221 1064.82V1065.82H553.573L553.177 1064.53L552.221 1064.82ZM504.721 909.821L505.677 909.528L505.46 908.821H504.721V909.821ZM466.721 909.821V908.821H465.988L465.767 909.52L466.721 909.821ZM417.721 1064.82L416.767 1064.52L416.356 1065.82H417.721V1064.82ZM503.221 1005.32V1006.32H504.542L504.183 1005.05L503.221 1005.32ZM466.721 1005.32L465.756 1005.06L465.409 1006.32H466.721V1005.32ZM484.721 939.821L485.683 939.55L484.707 936.096L483.756 939.556L484.721 939.821ZM450.221 1063.82H422.221V1065.82H450.221V1063.82ZM459.762 1029.04L449.262 1064.54L451.18 1065.1L461.68 1029.6L459.762 1029.04ZM508.721 1028.32H460.721V1030.32H508.721V1028.32ZM520.18 1064.54L509.68 1029.04L507.762 1029.6L518.262 1065.1L520.18 1064.54ZM552.221 1063.82H519.221V1065.82H552.221V1063.82ZM503.765 910.114L551.265 1065.11L553.177 1064.53L505.677 909.528L503.765 910.114ZM466.721 910.821H504.721V908.821H466.721V910.821ZM418.674 1065.12L467.674 910.123L465.767 909.52L416.767 1064.52L418.674 1065.12ZM422.221 1063.82H417.721V1065.82H422.221V1063.82ZM503.221 1004.32H466.721V1006.32H503.221V1004.32ZM483.758 940.093L502.258 1005.59L504.183 1005.05L485.683 939.55L483.758 940.093ZM467.685 1005.59L485.685 940.086L483.756 939.556L465.756 1005.06L467.685 1005.59Z" fill="#00393F"/>
-<path d="M450.221 1065.82V1064.82L451.18 1065.1M450.221 1065.82H450.968L451.18 1065.1M450.221 1065.82H422.221M450.221 1065.82V1063.82H422.221M451.18 1065.1L449.262 1064.54L459.762 1029.04M451.18 1065.1L461.68 1029.6L459.762 1029.04M460.721 1028.32V1029.32L459.762 1029.04M460.721 1028.32H459.974L459.762 1029.04M460.721 1028.32H508.721M460.721 1028.32V1030.32H508.721V1028.32M509.68 1029.04L508.721 1029.32V1028.32M509.68 1029.04L509.468 1028.32H508.721M509.68 1029.04L520.18 1064.54L518.262 1065.1M509.68 1029.04L507.762 1029.6L518.262 1065.1M518.262 1065.1L519.221 1064.82V1065.82M518.262 1065.1L518.474 1065.82H519.221M519.221 1065.82V1063.82H552.221V1065.82M519.221 1065.82H552.221M552.221 1065.82V1064.82L553.177 1064.53M552.221 1065.82H553.573L553.177 1064.53M553.177 1064.53L551.265 1065.11L503.765 910.114L505.677 909.528M553.177 1064.53L505.677 909.528M505.677 909.528L504.721 909.821V908.821M505.677 909.528L505.46 908.821H504.721M504.721 908.821V910.821H466.721V908.821M504.721 908.821H466.721M466.721 908.821V909.821L465.767 909.52M466.721 908.821H465.988L465.767 909.52M465.767 909.52L467.674 910.123L418.674 1065.12L416.767 1064.52M465.767 909.52L416.767 1064.52M416.767 1064.52L417.721 1064.82V1065.82M416.767 1064.52L416.356 1065.82H417.721M417.721 1065.82V1063.82H422.221M417.721 1065.82H422.221M503.221 1006.32V1005.32L504.183 1005.05M503.221 1006.32H504.542L504.183 1005.05M503.221 1006.32H466.721M503.221 1006.32V1004.32H466.721V1006.32M504.183 1005.05L502.258 1005.59L483.758 940.093L485.683 939.55M504.183 1005.05L485.683 939.55M465.756 1005.06L466.721 1005.32V1006.32M465.756 1005.06L465.409 1006.32H466.721M465.756 1005.06L483.756 939.556M465.756 1005.06L467.685 1005.59L485.685 940.086L483.756 939.556M485.683 939.55L484.721 939.821L483.756 939.556M485.683 939.55L484.707 936.096L483.756 939.556M422.221 1063.82V1065.82" stroke="#00393F"/>
-<path d="M769.721 943.335L785.221 926.335C772.821 913.935 755.387 908.501 748.221 907.335C723.021 902.935 707.387 909.168 702.721 912.835C689.521 919.235 682.221 934.835 680.221 941.835C677.821 959.835 684.221 970.668 687.721 973.835C690.921 980.235 703.387 987.835 709.221 990.835L750.221 1006.83C758.621 1013.23 758.054 1023.83 756.721 1028.33C752.721 1037.53 743.721 1041.17 739.721 1041.83C732.921 1044.23 720.887 1042.83 715.721 1041.83C707.321 1041.03 694.887 1032.5 689.721 1028.33L673.721 1046.83C686.521 1056.83 700.054 1063.33 705.221 1065.33C723.721 1069.83 742.721 1068.33 748.221 1067.33C753.721 1066.33 774.721 1057.83 782.221 1045.33C789.721 1032.83 791.221 1012.33 785.221 998.835C780.421 988.035 767.554 980.335 761.721 977.835L729.221 965.835C715.621 961.035 713.221 951.821 713.221 949.335C713.221 947.321 714.824 941.15 715.221 940.321C718.031 934.447 725.721 931.821 728.221 931.321C730.721 930.821 738.621 930.735 746.221 932.335C753.821 933.935 765.054 940.335 769.721 943.335Z" fill="#00393F" stroke="#00393F" stroke-width="2"/>
-<path d="M649.721 943.335L665.221 926.335C652.821 913.935 635.387 908.501 628.221 907.335C603.021 902.935 587.387 909.168 582.721 912.835C569.521 919.235 562.221 934.835 560.221 941.835C557.821 959.835 564.221 970.668 567.721 973.835C570.921 980.235 583.387 987.835 589.221 990.835L630.221 1006.83C638.621 1013.23 638.054 1023.83 636.721 1028.33C632.721 1037.53 623.721 1041.17 619.721 1041.83C612.921 1044.23 600.887 1042.83 595.721 1041.83C587.321 1041.03 574.887 1032.5 569.721 1028.33L553.721 1046.83C566.521 1056.83 580.054 1063.33 585.221 1065.33C603.721 1069.83 622.721 1068.33 628.221 1067.33C633.721 1066.33 654.721 1057.83 662.221 1045.33C669.721 1032.83 671.221 1012.33 665.221 998.835C660.421 988.035 647.554 980.335 641.721 977.835L609.221 965.835C595.621 961.035 593.221 951.821 593.221 949.335C593.221 947.321 594.824 941.15 595.221 940.321C598.031 934.447 605.721 931.821 608.221 931.321C610.721 930.821 618.621 930.735 626.221 932.335C633.821 933.935 645.054 940.335 649.721 943.335Z" fill="#00393F" stroke="#00393F" stroke-width="2"/>
-</svg>
diff --git a/static/images/logos/grass-gradient-horizontal.svg b/static/images/logos/grass-horizontal/grass-gradient-horizontal.svg
similarity index 100%
rename from static/images/logos/grass-gradient-horizontal.svg
rename to static/images/logos/grass-horizontal/grass-gradient-horizontal.svg
diff --git a/static/images/logos/grass-green-horizontal.svg b/static/images/logos/grass-horizontal/grass-green-horizontal.svg
similarity index 100%
rename from static/images/logos/grass-green-horizontal.svg
rename to static/images/logos/grass-horizontal/grass-green-horizontal.svg
diff --git a/static/images/logos/grass-white-horizontal.svg b/static/images/logos/grass-horizontal/grass-white-horizontal.svg
similarity index 100%
rename from static/images/logos/grass-white-horizontal.svg
rename to static/images/logos/grass-horizontal/grass-white-horizontal.svg
diff --git a/static/images/logos/grass-gradient-no-text.svg b/static/images/logos/grass-logo-simple/grass-gradient-no-text.svg
similarity index 100%
rename from static/images/logos/grass-gradient-no-text.svg
rename to static/images/logos/grass-logo-simple/grass-gradient-no-text.svg
diff --git a/static/images/logos/grass-green-no-text.svg b/static/images/logos/grass-logo-simple/grass-green-no-text.svg
similarity index 100%
rename from static/images/logos/grass-green-no-text.svg
rename to static/images/logos/grass-logo-simple/grass-green-no-text.svg
diff --git a/static/images/logos/grass-white-no-text.svg b/static/images/logos/grass-logo-simple/grass-white-no-text.svg
similarity index 100%
rename from static/images/logos/grass-white-no-text.svg
rename to static/images/logos/grass-logo-simple/grass-white-no-text.svg
diff --git a/static/images/logos/grass-gradient.svg b/static/images/logos/grass-logo/grass-gradient.svg
similarity index 100%
rename from static/images/logos/grass-gradient.svg
rename to static/images/logos/grass-logo/grass-gradient.svg
diff --git a/static/images/logos/grass-green.svg b/static/images/logos/grass-logo/grass-green.svg
similarity index 100%
rename from static/images/logos/grass-green.svg
rename to static/images/logos/grass-logo/grass-green.svg
diff --git a/static/images/logos/grass-white.svg b/static/images/logos/grass-logo/grass-white.svg
similarity index 100%
rename from static/images/logos/grass-white.svg
rename to static/images/logos/grass-logo/grass-white.svg
diff --git a/static/images/logos/gs-green-medium.png b/static/images/logos/gs-green-medium.png
deleted file mode 100644
index 234282cb..00000000
Binary files a/static/images/logos/gs-green-medium.png and /dev/null differ
diff --git a/static/images/logos/gs-green-small.png b/static/images/logos/gs-green-small.png
deleted file mode 100644
index 3f9f83ca..00000000
Binary files a/static/images/logos/gs-green-small.png and /dev/null differ
diff --git a/static/images/logos/gs-horizontal-blue.png b/static/images/logos/gs-horizontal-blue.png
deleted file mode 100644
index f7771fa8..00000000
Binary files a/static/images/logos/gs-horizontal-blue.png and /dev/null differ
diff --git a/static/images/logos/gs-horizontal-white-2.12.25.png b/static/images/logos/gs-horizontal-white-2.12.25.png
deleted file mode 100644
index 0cff55e2..00000000
Binary files a/static/images/logos/gs-horizontal-white-2.12.25.png and /dev/null differ
diff --git a/static/images/logos/gs-white-medium.png b/static/images/logos/gs-white-medium.png
deleted file mode 100644
index 60030df7..00000000
Binary files a/static/images/logos/gs-white-medium.png and /dev/null differ
diff --git a/static/images/logos/gs-white-small.png b/static/images/logos/gs-white-small.png
deleted file mode 100644
index 904455fe..00000000
Binary files a/static/images/logos/gs-white-small.png and /dev/null differ
diff --git a/static/images/logos/30-years-grass-gis-logo-black-300px.png b/static/images/logos/historical_logos/30-years-grass-gis-logo-black-300px.png
similarity index 100%
rename from static/images/logos/30-years-grass-gis-logo-black-300px.png
rename to static/images/logos/historical_logos/30-years-grass-gis-logo-black-300px.png
diff --git a/static/images/logos/grass-Addons.jpg b/static/images/logos/historical_logos/grass-Addons.jpg
similarity index 100%
rename from static/images/logos/grass-Addons.jpg
rename to static/images/logos/historical_logos/grass-Addons.jpg
diff --git a/static/images/logos/grass-Docker.jpg b/static/images/logos/historical_logos/grass-Docker.jpg
similarity index 100%
rename from static/images/logos/grass-Docker.jpg
rename to static/images/logos/historical_logos/grass-Docker.jpg
diff --git a/static/images/logos/grass-Docker.png b/static/images/logos/historical_logos/grass-Docker.png
similarity index 100%
rename from static/images/logos/grass-Docker.png
rename to static/images/logos/historical_logos/grass-Docker.png
diff --git a/static/images/logos/grass-Docker.svg b/static/images/logos/historical_logos/grass-Docker.svg
similarity index 100%
rename from static/images/logos/grass-Docker.svg
rename to static/images/logos/historical_logos/grass-Docker.svg
diff --git a/static/images/logos/grass-Linux.jpg b/static/images/logos/historical_logos/grass-Linux.jpg
similarity index 100%
rename from static/images/logos/grass-Linux.jpg
rename to static/images/logos/historical_logos/grass-Linux.jpg
diff --git a/static/images/logos/grass-Mac.jpg b/static/images/logos/historical_logos/grass-Mac.jpg
similarity index 100%
rename from static/images/logos/grass-Mac.jpg
rename to static/images/logos/historical_logos/grass-Mac.jpg
diff --git a/static/images/logos/grass-SampleData.jpg b/static/images/logos/historical_logos/grass-SampleData.jpg
similarity index 100%
rename from static/images/logos/grass-SampleData.jpg
rename to static/images/logos/historical_logos/grass-SampleData.jpg
diff --git a/static/images/logos/grass-Windows.jpg b/static/images/logos/historical_logos/grass-Windows.jpg
similarity index 100%
rename from static/images/logos/grass-Windows.jpg
rename to static/images/logos/historical_logos/grass-Windows.jpg
diff --git a/static/images/logos/grass78_python3_logos.png b/static/images/logos/historical_logos/grass78_python3_logos.png
similarity index 100%
rename from static/images/logos/grass78_python3_logos.png
rename to static/images/logos/historical_logos/grass78_python3_logos.png
diff --git a/static/images/logos/grass_gis_30_years_logo_500px.png b/static/images/logos/historical_logos/grass_gis_30_years_logo_500px.png
similarity index 100%
rename from static/images/logos/grass_gis_30_years_logo_500px.png
rename to static/images/logos/historical_logos/grass_gis_30_years_logo_500px.png
diff --git a/static/images/logos/grass_logo_animated.gif b/static/images/logos/historical_logos/grass_logo_animated.gif
similarity index 100%
rename from static/images/logos/grass_logo_animated.gif
rename to static/images/logos/historical_logos/grass_logo_animated.gif
diff --git a/static/images/logos/grassgis_logo_colorlogo_text_alphabg.png b/static/images/logos/historical_logos/grassgis_logo_colorlogo_text_alphabg.png
similarity index 100%
rename from static/images/logos/grassgis_logo_colorlogo_text_alphabg.png
rename to static/images/logos/historical_logos/grassgis_logo_colorlogo_text_alphabg.png
diff --git a/static/images/logos/grassgis_logo_colorlogo_text_slogan_alphabg.png b/static/images/logos/historical_logos/grassgis_logo_colorlogo_text_slogan_alphabg.png
similarity index 100%
rename from static/images/logos/grassgis_logo_colorlogo_text_slogan_alphabg.png
rename to static/images/logos/historical_logos/grassgis_logo_colorlogo_text_slogan_alphabg.png
diff --git a/static/images/logos/grassgis_logo_colorlogo_text_slogan_whitebg.png b/static/images/logos/historical_logos/grassgis_logo_colorlogo_text_slogan_whitebg.png
similarity index 100%
rename from static/images/logos/grassgis_logo_colorlogo_text_slogan_whitebg.png
rename to static/images/logos/historical_logos/grassgis_logo_colorlogo_text_slogan_whitebg.png
diff --git a/static/images/logos/grassgis_logo_colorlogo_text_whitebg.png b/static/images/logos/historical_logos/grassgis_logo_colorlogo_text_whitebg.png
similarity index 100%
rename from static/images/logos/grassgis_logo_colorlogo_text_whitebg.png
rename to static/images/logos/historical_logos/grassgis_logo_colorlogo_text_whitebg.png
diff --git a/static/images/logos/grassgis_logo_colorlogo_text_whitebg_square.png b/static/images/logos/historical_logos/grassgis_logo_colorlogo_text_whitebg_square.png
similarity index 100%
rename from static/images/logos/grassgis_logo_colorlogo_text_whitebg_square.png
rename to static/images/logos/historical_logos/grassgis_logo_colorlogo_text_whitebg_square.png
diff --git a/static/images/logos/grassgis_logo_for_dark_backgrounds.svg b/static/images/logos/historical_logos/grassgis_logo_for_dark_backgrounds.svg
similarity index 100%
rename from static/images/logos/grassgis_logo_for_dark_backgrounds.svg
rename to static/images/logos/historical_logos/grassgis_logo_for_dark_backgrounds.svg
diff --git a/static/images/logos/grassgis_logo_graylogo_text_alphabg.png b/static/images/logos/historical_logos/grassgis_logo_graylogo_text_alphabg.png
similarity index 100%
rename from static/images/logos/grassgis_logo_graylogo_text_alphabg.png
rename to static/images/logos/historical_logos/grassgis_logo_graylogo_text_alphabg.png
diff --git a/static/images/logos/grassgis_logo_graylogo_text_slogan_alphabg.png b/static/images/logos/historical_logos/grassgis_logo_graylogo_text_slogan_alphabg.png
similarity index 100%
rename from static/images/logos/grassgis_logo_graylogo_text_slogan_alphabg.png
rename to static/images/logos/historical_logos/grassgis_logo_graylogo_text_slogan_alphabg.png
diff --git a/static/images/logos/grassgis_logo_graylogo_text_slogan_whitebg.png b/static/images/logos/historical_logos/grassgis_logo_graylogo_text_slogan_whitebg.png
similarity index 100%
rename from static/images/logos/grassgis_logo_graylogo_text_slogan_whitebg.png
rename to static/images/logos/historical_logos/grassgis_logo_graylogo_text_slogan_whitebg.png
diff --git a/static/images/logos/grassgis_logo_graylogo_text_whitebg.png b/static/images/logos/historical_logos/grassgis_logo_graylogo_text_whitebg.png
similarity index 100%
rename from static/images/logos/grassgis_logo_graylogo_text_whitebg.png
rename to static/images/logos/historical_logos/grassgis_logo_graylogo_text_whitebg.png
diff --git a/static/images/logos/grassgis_logo_multilayer.svg b/static/images/logos/historical_logos/grassgis_logo_multilayer.svg
similarity index 100%
rename from static/images/logos/grassgis_logo_multilayer.svg
rename to static/images/logos/historical_logos/grassgis_logo_multilayer.svg
diff --git a/static/images/logos/grassgis_logo_variant_vector_font.svg b/static/images/logos/historical_logos/grassgis_logo_variant_vector_font.svg
similarity index 100%
rename from static/images/logos/grassgis_logo_variant_vector_font.svg
rename to static/images/logos/historical_logos/grassgis_logo_variant_vector_font.svg
diff --git a/static/images/logos/grasslogo.eps b/static/images/logos/historical_logos/grasslogo.eps
similarity index 100%
rename from static/images/logos/grasslogo.eps
rename to static/images/logos/historical_logos/grasslogo.eps
diff --git a/static/images/logos/grasslogo.svg b/static/images/logos/historical_logos/grasslogo.svg
similarity index 100%
rename from static/images/logos/grasslogo.svg
rename to static/images/logos/historical_logos/grasslogo.svg
diff --git a/static/images/logos/grasslogo_legacy.png b/static/images/logos/historical_logos/grasslogo_legacy.png
similarity index 100%
rename from static/images/logos/grasslogo_legacy.png
rename to static/images/logos/historical_logos/grasslogo_legacy.png
diff --git a/static/images/logos/grasslogo_wiki.png b/static/images/logos/historical_logos/grasslogo_wiki.png
similarity index 100%
rename from static/images/logos/grasslogo_wiki.png
rename to static/images/logos/historical_logos/grasslogo_wiki.png
diff --git a/static/images/logos/tfang_2.png b/static/images/logos/historical_logos/tfang_2.png
similarity index 100%
rename from static/images/logos/tfang_2.png
rename to static/images/logos/historical_logos/tfang_2.png
diff --git a/static/images/logos/logo_lin.png b/static/images/logos/os/logo_lin.png
similarity index 100%
rename from static/images/logos/logo_lin.png
rename to static/images/logos/os/logo_lin.png
diff --git a/static/images/logos/logo_mac.png b/static/images/logos/os/logo_mac.png
similarity index 100%
rename from static/images/logos/logo_mac.png
rename to static/images/logos/os/logo_mac.png
diff --git a/static/images/logos/logo_win.png b/static/images/logos/os/logo_win.png
similarity index 100%
rename from static/images/logos/logo_win.png
rename to static/images/logos/os/logo_win.png
diff --git a/themes/grass/assets/css/style.css b/themes/grass/assets/css/style.css
index abb598f2..e9325666 100644
--- a/themes/grass/assets/css/style.css
+++ b/themes/grass/assets/css/style.css
@@ -107,7 +107,7 @@
   --gs-grey-dark-color--lightest: rgba(78, 77, 76, 0.071);
 
   /* Images */
-  --gs-grass-background-image: url("/images/logos/banner.jpg");
+  --gs-grass-background-image: url("/images/banners/banner.jpg");
 }
 
 body {
@@ -1594,7 +1594,7 @@ code {
 
 .grassthm-sq{
     border:1px solid #dee2e6;
-    /* background:url(/images/logos/banner.jpg); */
+    /* background:url(/images/banners/banner.jpg); */
     background-color: var(--gs-primary-color);
     background-size:cover;
     height:199px;
diff --git a/themes/grass/layouts/404.html b/themes/grass/layouts/404.html
index 00987d15..6668f0da 100644
--- a/themes/grass/layouts/404.html
+++ b/themes/grass/layouts/404.html
@@ -1,6 +1,6 @@
 {{ partial "head.html" . }}
 
-  <header class="hero-section overlay-blue bg-cover banner" data-background="{{.Site.BaseURL}}/images/logos/banner.jpg">
+  <header class="hero-section overlay-blue bg-cover banner" data-background="{{.Site.BaseURL}}/images/banners/banner.jpg">
     <div class="fixed-top">
       {{ partial "banner.html" . }}
       <div class="bg-primary">
@@ -14,7 +14,7 @@
         <div class="row">
             <div class="col-lg-9 col-md-12 text-center mx-auto yard-sign">
               <div class="grass-green text-bold">
-                <img alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-blue.svg">
+                <img alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-green.svg">
                 <h3>Sorry, nothing growing here.</h3>
                 <p class="text-bold">The page you are looking for is not available.<br>Please check the URL or go back to the</p>
                 <a class="btn btn-primary" href="{{.Site.BaseURL}}">home page</a>
diff --git a/themes/grass/layouts/download/list.html b/themes/grass/layouts/download/list.html
index 4f23a336..cc84173e 100644
--- a/themes/grass/layouts/download/list.html
+++ b/themes/grass/layouts/download/list.html
@@ -27,7 +27,7 @@ <h2 class="section-title">Download your free and open source copy</h2>
       <div class="section bg-white mb-4">
         <div class="row nm">
           <div class="col-4 text-center">
-            <object type="image/svg+xml" data="{{.Site.BaseURL}}/images/logos/grass-green.svg" class="grasslogo"></object>
+            <object type="image/svg+xml" data="{{.Site.BaseURL}}/images/logos/grass-logo/grass-green.svg" class="grasslogo"></object>
           </div>
           <div class="col-8">
             <h3 class="mt-20">GRASS source code</h3>
@@ -55,7 +55,7 @@ <h3 class="mt-2 mb-2">GRASS for {{ .Title }}</h3>
           {{ end }}
           <div class="section bg-white mb-4">
             <div class="row nm">
-              <div class="col-4 text-center"><object type="image/svg+xml" data="{{.Site.BaseURL}}/images/logos/grass-green.svg" class="grasslogo"></object></div>
+              <div class="col-4 text-center"><object type="image/svg+xml" data="{{.Site.BaseURL}}/images/logos/grass-logo/grass-green.svg" class="grasslogo"></object></div>
               <div class="col-8">
                 <h3 class="mt-2 mb-2">GRASS Addons</h3>
                 <p>Download user contributed GRASS extensions</p>
diff --git a/themes/grass/layouts/index.html b/themes/grass/layouts/index.html
index f7907a99..97231146 100644
--- a/themes/grass/layouts/index.html
+++ b/themes/grass/layouts/index.html
@@ -13,7 +13,7 @@
         <div class="container">
         <div class="row">
             <div class="col-lg-8 text-center mx-auto">
-            <h1 class="mb-0"><img alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-white.svg" width="26%"></h1>{{ with .Site.Params.banner.description }}
+            <h1 class="mb-0"><img alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-white.svg" width="26%"></h1>{{ with .Site.Params.banner.description }}
             <p class="text-bold mb-4">{{ . }}</p>{{ end }}
             </div>
         </div>
diff --git a/themes/grass/layouts/partials/brand.html b/themes/grass/layouts/partials/brand.html
index 90929073..c00fbd23 100644
--- a/themes/grass/layouts/partials/brand.html
+++ b/themes/grass/layouts/partials/brand.html
@@ -1,3 +1,3 @@
 <a class="px-4 py-5 bg-gray text-center shadow d-block fdiv" href="{{.Site.BaseURL}}/about/brand">
-    <img alt="GRASS logo" src="{{.Site.BaseURL}}/images/logos/grass-green.svg" width="39%">
+    <img alt="GRASS logo" src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-green.svg" width="39%">
 </a>
diff --git a/themes/grass/layouts/partials/footer.html b/themes/grass/layouts/partials/footer.html
index fca3419c..08797c1e 100644
--- a/themes/grass/layouts/partials/footer.html
+++ b/themes/grass/layouts/partials/footer.html
@@ -4,7 +4,7 @@
 
       <!-- Logo -->
       <div class="col-md-2 text-center text-md-left mb-4 mb-md-0">
-        <img src="{{.Site.BaseURL}}/images/logos/gs-white-small.png" alt="GRASS GIS logo" style="max-width: 100px;">
+        <img src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-white.svg" alt="GRASS logo" style="max-width: 100px;">
       </div>
 
       <!-- Quick Links -->
@@ -86,40 +86,6 @@ <h6 class="text-uppercase text-light">Contribute</h6>
   </div>
 </footer>
 
-<!-- 
-<footer class="section bg-gray pb-0">
-  <div class="container">
-      <div class="row">
-        <div class="col-md-4 text-md-left text-center">
-        {{ with .Site.Params.copyright }} <p><small>&copy; {{ replace . "{year}" now.Year }} (<a href="/about/license/">license</a>&nbsp;|&nbsp;<a href="/about/privacy">privacy</a>)</small></p> {{ end }}
-        </div>
-        <div class="col-md-4 text-md-left text-center">
-          {{if .IsHome}}
-          <p><small><a href="about/mirrors">Mirror sites</a>
-          <a href="https://fosstodon.org/@grassgis" rel="me"></a> <!-- needed for verification 
-          </small></p>
-          {{end}}
-
-    {{if not .IsHome}}
-    <p><small><a href="https://github.com/OSGeo/grass-website/tree/master/content/{{ .Section }}/{{ with .File }}{{ .BaseFileName }}{{ end }}.md" class="fab fa-github"> <span class="edt">Edit this page on GitHub</span></a></small></p>
-    {{end}}
-        </div>
-  <div class="col-md-4 text-md-right text-center">	
-    <ul class="list-inline mb-3 d-flex justify-content-center justify-content-md-end align-items-center">
-      {{ range .Site.Params.socialIcon }}
-        <li class="list-inline-item d-flex align-items-center">
-          <a class="color-secondary d-inline-block p-2" aria-label="{{ .label }}" href="{{ .link }}">
-            <i class="{{ .icon }}"></i>
-          </a>
-        </li>
-      {{ end }}
-    </ul>
-  </div>
-  </div>
-
-    </div>
-</footer>
- -->
  <script src="{{ .Site.BaseURL }}plugins/popper/popper.min.js"></script>
 <script src="{{ .Site.BaseURL }}plugins/bootstrap/bootstrap.min.js"></script>
 <script src="{{ .Site.BaseURL }}plugins/highlight/highlight.min.js"></script>
diff --git a/themes/grass/layouts/partials/logo.html b/themes/grass/layouts/partials/logo.html
index 7afc9ffe..16f640b3 100644
--- a/themes/grass/layouts/partials/logo.html
+++ b/themes/grass/layouts/partials/logo.html
@@ -1,2 +1,2 @@
 
-<img src="{{.Site.BaseURL}}/images/logos/grass-green.svg" class="img-responsive" alt="GRASS">
+<img src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-green.svg" class="img-responsive" alt="GRASS">
diff --git a/themes/grass/layouts/partials/navigation.html b/themes/grass/layouts/partials/navigation.html
index a5cff5fc..24a7971c 100644
--- a/themes/grass/layouts/partials/navigation.html
+++ b/themes/grass/layouts/partials/navigation.html
@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-lg navbar-light">
     <a class="navbar-brand" href="{{.Site.BaseURL}}">
-        <img class="grass-icon" alt="GRASS Logo" src="{{.Site.BaseURL}}images/logos/grass-white-no-text.svg">
+        <img class="grass-icon" alt="GRASS Logo" src="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-white-no-text.svg">
         <span class="grass text-white">{{.Site.Params.logo}}</span>
     </a>
     <button 
diff --git a/themes/grass/layouts/partials/zenodo-card.html b/themes/grass/layouts/partials/zenodo-card.html
index 91af903f..f765ff61 100644
--- a/themes/grass/layouts/partials/zenodo-card.html
+++ b/themes/grass/layouts/partials/zenodo-card.html
@@ -1,4 +1,4 @@
 <a href="https://doi.org/10.5281/zenodo.5176030" target="_blank" class="px-4 py-5 bg-gray text-center shadow d-block fdiv">
-    <img alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-green.svg" width="34%"><br>
+    <img alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-green.svg" width="34%"><br>
     <img src="https://zenodo.org/badge/DOI/10.5281/zenodo.5176030.svg" alt="DOI">
 </a>
diff --git a/themes/grass/layouts/shortcodes/brandLogo.html b/themes/grass/layouts/shortcodes/brandLogo.html
index 83b72bbd..1021fa4f 100644
--- a/themes/grass/layouts/shortcodes/brandLogo.html
+++ b/themes/grass/layouts/shortcodes/brandLogo.html
@@ -6,15 +6,15 @@ <h4>{{ $colorName }}</h4>
 </div>
 <div class="col-lg-3 col-sm-12 mb-3">
     {{- if eq $colorName "White" -}}
-    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}.svg" download>
-        <img class="grass-green-bg" width="100%" src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}.svg" alt="logo-{{ $colorName | lower }}">
+    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-logo/grass-{{ $colorName | lower }}.svg" download>
+        <img class="grass-green-bg" width="100%" src="{{.Site.BaseURL}}images/logos/grass-logo/grass-{{ $colorName | lower }}.svg" alt="logo-{{ $colorName | lower }}">
     </a>
-    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-no-text.svg" download>
-        <img class="grass-green-bg p-2" width="100%" src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-no-text.svg" alt="logo-{{ $colorName | lower }}">
+    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-{{ $colorName | lower }}-no-text.svg" download>
+        <img class="grass-green-bg p-2" width="100%" src="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-{{ $colorName | lower }}-no-text.svg" alt="logo-{{ $colorName | lower }}">
     </a>
     {{- else}}
-    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}.svg" download>
-        <img class="bg-base-white" width="100%" src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}.svg" alt="logo-{{ $colorName | lower }}">
+    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-logo/grass-{{ $colorName | lower }}.svg" download>
+        <img class="bg-base-white" width="100%" src="{{.Site.BaseURL}}images/logos/grass-logo//grass-{{ $colorName | lower }}.svg" alt="logo-{{ $colorName | lower }}">
     </a>
 
     {{- end}}
@@ -22,22 +22,22 @@ <h4>{{ $colorName }}</h4>
 </div>
 <div class="col-lg-3 col-sm-12">
     {{- if eq $colorName "White" -}}
-    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}.svg"
+    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-logo/grass-{{ $colorName | lower }}.svg"
         download>
-        <img class="grass-bg-image" width="100%" src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}.svg"
+        <img class="grass-bg-image" width="100%" src="{{.Site.BaseURL}}images/logos/grass-logo/grass-{{ $colorName | lower }}.svg"
             alt="logo-{{ $colorName | lower }}">
     </a>
-    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-no-text.svg"
+    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-{{ $colorName | lower }}-no-text.svg"
         download>
         <img class="grass-bg-image p-2" width="100%"
-            src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-no-text.svg"
+            src="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-{{ $colorName | lower }}-no-text.svg"
             alt="logo-{{ $colorName | lower }}">
     </a>
     {{- else}}
-        <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-no-text.svg"
+        <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-{{ $colorName | lower }}-no-text.svg"
             download>
             <img class="bg-base-white p-2" width="100%"
-                src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-no-text.svg"
+                src="{{.Site.BaseURL}}images/logos/grass-logo-simple/grass-{{ $colorName | lower }}-no-text.svg"
                 alt="logo-{{ $colorName | lower }}">
         </a>
     {{- end}}
@@ -45,14 +45,14 @@ <h4>{{ $colorName }}</h4>
 
 <div class="col-lg-6 col-sm-12">
     {{- if eq $colorName "White" -}}
-    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-horizontal.svg" download>
+    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-horizontal/grass-{{ $colorName | lower }}-horizontal.svg" download>
         <img class="grass-green-bg p-2" width="100%"
-            src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-horizontal.svg"
+            src="{{.Site.BaseURL}}images/logos/grass-horizontal/grass-{{ $colorName | lower }}-horizontal.svg"
                 alt="logo-{{ $colorName | lower }}">
     </a>
-    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-horizontal.svg" download>
+    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-horizontal/grass-{{ $colorName | lower }}-horizontal.svg" download>
         <img class="grass-bg-image p-2" width="100%"
-                src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-horizontal.svg"
+                src="{{.Site.BaseURL}}images/logos/grass-horizontal/grass-{{ $colorName | lower }}-horizontal.svg"
                 alt="logo-{{ $colorName | lower }}">
         </a>
     {{- end}}
@@ -60,10 +60,10 @@ <h4>{{ $colorName }}</h4>
 
 {{- if ne $colorName "White" -}}
 <div class="col-lg-6 col-sm-12">
-    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-horizontal.svg"
+    <a class="brand-logo-download-image" href="{{.Site.BaseURL}}images/logos/grass-horizontal/grass-{{ $colorName | lower }}-horizontal.svg"
             download>
         <img class="bg-base-white p-2" width="100%"
-            src="{{.Site.BaseURL}}images/logos/grass-{{ $colorName | lower }}-horizontal.svg"
+            src="{{.Site.BaseURL}}images/logos/grass-horizontal/grass-{{ $colorName | lower }}-horizontal.svg"
             alt="logo-{{ $colorName | lower }}">
     </a>
 </div>
diff --git a/themes/grass/layouts/shortcodes/brandWebBanner.html b/themes/grass/layouts/shortcodes/brandWebBanner.html
index 2ea2e810..4a6ce56d 100644
--- a/themes/grass/layouts/shortcodes/brandWebBanner.html
+++ b/themes/grass/layouts/shortcodes/brandWebBanner.html
@@ -1,7 +1,7 @@
 <div class="row mt-30 mb-2">
     <div class="col-lg-6 col-md-6 col-sm-12">
         <div class="text-center grass-green-bg mx-auto">
-            <h1 class="mb-0"><img class="mb-0" alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-white.svg" width="40%">
+            <h1 class="mb-0"><img class="mb-0" alt="GRASS" src="{{.Site.BaseURL}}/images/logos/grass-logo/grass-white.svg" width="40%">
                 {{ with .Site.Params.banner.description }}
                 <p class="text-bold mb-4 pb-4 white-color">{{ . }}</p>
                 {{ end }}