diff --git a/app/react/components/BoxSelector/BoxOption.module.css b/app/react/components/BoxSelector/BoxOption.module.css
index d58829cd8..9496961a0 100644
--- a/app/react/components/BoxSelector/BoxOption.module.css
+++ b/app/react/components/BoxSelector/BoxOption.module.css
@@ -12,10 +12,12 @@
   font-size: 12px;
   display: block;
   border-radius: 8px;
-  padding: 15px;
+
+  padding: 20px 15px;
   text-align: left;
   box-shadow: var(--shadow-boxselector-color);
   position: relative;
+  margin-bottom: 0;
 
   text-align: left;
   height: 100%;
@@ -46,7 +48,5 @@
   @apply th-dark:border-blue-7 th-dark:bg-blue-10;
   @apply th-highcontrast:border-blue-7 th-highcontrast:bg-blue-10;
 
-  border-radius: 8px;
-  padding: 15px;
   box-shadow: none;
 }
diff --git a/app/react/components/BoxSelector/BoxOption.tsx b/app/react/components/BoxSelector/BoxOption.tsx
index 7e9066951..d5a16cd46 100644
--- a/app/react/components/BoxSelector/BoxOption.tsx
+++ b/app/react/components/BoxSelector/BoxOption.tsx
@@ -51,10 +51,14 @@ export function BoxOption<T extends Value>({
         {!disabled && (
           <div
             className={clsx(
-              'absolute top-4 right-4 flex h-4 w-4 items-center justify-center rounded-full border border-solid border-blue-8 font-bold text-white',
+              'absolute top-4 right-4 flex h-4 w-4 items-center justify-center border border-solid  font-bold text-white',
               {
-                'bg-white': !selected,
-                'bg-blue-8': selected,
+                'border-gray-6 bg-white': !selected,
+                'border-blue-8 bg-blue-8': selected,
+              },
+              {
+                'rounded-full': type === 'radio',
+                'rounded-sm': type === 'checkbox',
               }
             )}
           >
diff --git a/app/react/components/BoxSelector/BoxSelector.tsx b/app/react/components/BoxSelector/BoxSelector.tsx
index 3580076f0..9c17e6814 100644
--- a/app/react/components/BoxSelector/BoxSelector.tsx
+++ b/app/react/components/BoxSelector/BoxSelector.tsx
@@ -1,5 +1,3 @@
-import { Check, Minus } from 'lucide-react';
-
 import styles from './BoxSelector.module.css';
 import { BoxSelectorItem } from './BoxSelectorItem';
 import { BoxSelectorOption, Value } from './types';
@@ -47,7 +45,6 @@ export function BoxSelector<T extends Value>({
                 type={props.isMulti ? 'checkbox' : 'radio'}
                 isSelected={isSelected}
                 slim={slim}
-                checkIcon={props.isMulti ? Minus : Check}
               />
             ))}
         </div>
diff --git a/app/react/components/BoxSelector/BoxSelectorItem.module.css b/app/react/components/BoxSelector/BoxSelectorItem.module.css
index 1681a864b..f9861473e 100644
--- a/app/react/components/BoxSelector/BoxSelectorItem.module.css
+++ b/app/react/components/BoxSelector/BoxSelectorItem.module.css
@@ -13,10 +13,8 @@
 }
 
 .image-container {
-  margin-bottom: 20px;
-  text-align: left;
-
   margin-bottom: 0;
+  text-align: left;
 }
 
 .icon,
@@ -43,8 +41,8 @@
 .box-selector-item.limited.business label,
 .box-selector-item.limited.business input:checked + label {
   @apply border-warning-7 bg-warning-1 text-black;
-  @apply th-dark:bg-warning-8 th-dark:bg-opacity-10;
-  @apply th-highcontrast:bg-warning-8 th-highcontrast:bg-opacity-10;
+  @apply th-dark:bg-warning-8 th-dark:bg-opacity-10 th-dark:text-white;
+  @apply th-highcontrast:bg-warning-8 th-highcontrast:bg-opacity-10 th-highcontrast:text-white;
 
   filter: none;
 }
diff --git a/app/react/components/BoxSelector/BoxSelectorItem.tsx b/app/react/components/BoxSelector/BoxSelectorItem.tsx
index 537f1bcb4..bb5ae97c3 100644
--- a/app/react/components/BoxSelector/BoxSelectorItem.tsx
+++ b/app/react/components/BoxSelector/BoxSelectorItem.tsx
@@ -1,5 +1,6 @@
 import clsx from 'clsx';
 import { Icon as ReactFeatherComponentType, Check } from 'lucide-react';
+import { Fragment } from 'react';
 
 import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service';
 import { Icon } from '@/react/components/Icon';
@@ -38,6 +39,9 @@ export function BoxSelectorItem<T extends Value>({
   const limitedToBE = isLimitedToBE(option.feature);
 
   const beIndicatorTooltipId = `box-selector-item-${radioName}-${option.id}-limited`;
+
+  const ContentBox = slim ? 'div' : Fragment;
+
   return (
     <BoxOption
       className={clsx(styles.boxSelectorItem, {
@@ -53,33 +57,22 @@ export function BoxSelectorItem<T extends Value>({
       type={type}
       checkIcon={checkIcon}
     >
-      <>
-        {limitedToBE && (
-          <LimitedToBeIndicator
-            tooltipId={beIndicatorTooltipId}
-            featureId={option.feature}
-          />
-        )}
-        <div
-          className={clsx('flex gap-2', {
-            'opacity-30': limitedToBE,
-            'h-full flex-col justify-between': !slim,
-            'slim items-center': slim,
-          })}
-        >
-          <div
-            className={clsx(styles.imageContainer, 'flex items-center', {
-              'flex-1': !slim,
-            })}
-          >
-            {renderIcon()}
-          </div>
-          <div>
-            <div className={styles.header}>{option.label}</div>
-            <p>{option.description}</p>
-          </div>
+      {limitedToBE && <LimitedToBeIndicator tooltipId={beIndicatorTooltipId} />}
+      <div
+        className={clsx('flex gap-2', {
+          'opacity-30': limitedToBE,
+          'h-full flex-col justify-start': !slim,
+          'slim items-center': slim,
+        })}
+      >
+        <div className={clsx(styles.imageContainer, 'flex items-start')}>
+          {renderIcon()}
         </div>
-      </>
+        <ContentBox>
+          <div className={styles.header}>{option.label}</div>
+          <p className="mb-0">{option.description}</p>
+        </ContentBox>
+      </div>
     </BoxOption>
   );
 
diff --git a/app/react/components/BoxSelector/LogoIcon.tsx b/app/react/components/BoxSelector/LogoIcon.tsx
index c94cd1a7c..54899fb23 100644
--- a/app/react/components/BoxSelector/LogoIcon.tsx
+++ b/app/react/components/BoxSelector/LogoIcon.tsx
@@ -7,7 +7,7 @@ export function LogoIcon({ icon }: Props) {
     <div
       className={`
    inline-flex h-14 w-14
-   items-center justify-center text-6xl
+   items-center justify-center text-7xl
 `}
     >
       <Icon icon={icon} className="!flex" />
diff --git a/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/kaas-icon.svg b/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/kaas-icon.svg
index 3c042bd69..61f7b621f 100644
--- a/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/kaas-icon.svg
+++ b/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/kaas-icon.svg
@@ -1,5 +1,4 @@
-<svg width="auto" height="auto" viewBox="0 0 22 17" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path fill-rule="evenodd" clip-rule="evenodd"
-    d="M11 0C6.78119 0 3.3251 3.26563 3.02165 7.40697C1.24457 8.17346 0 9.9404 0 12C0 14.7614 2.23858 17 5 17H16.5C19.5376 17 22 14.5376 22 11.5C22 9.30813 20.7183 7.41775 18.8658 6.53369C18.1766 2.81531 14.9177 0 11 0ZM11.4999 4.40625C11.4999 4.13011 11.276 3.90625 10.9999 3.90625C10.7237 3.90625 10.4999 4.13011 10.4999 4.40625V4.70044C9.67915 4.79483 8.92827 5.11878 8.31307 5.60645L8.1049 5.39828C7.90964 5.20302 7.59306 5.20302 7.39779 5.39828C7.20253 5.59354 7.20253 5.91013 7.39779 6.10539L7.60597 6.31356C7.11829 6.92876 6.79434 7.67964 6.69995 8.50036H6.40576C6.12962 8.50036 5.90576 8.72422 5.90576 9.00036C5.90576 9.2765 6.12962 9.50036 6.40576 9.50036H6.69996C6.79437 10.3211 7.11834 11.0719 7.60602 11.6871L7.39779 11.8953C7.20253 12.0906 7.20253 12.4072 7.39779 12.6024C7.59306 12.7977 7.90964 12.7977 8.1049 12.6024L8.31314 12.3942C8.92832 12.8819 9.67918 13.2058 10.4999 13.3002V13.5945C10.4999 13.8706 10.7237 14.0945 10.9999 14.0945C11.276 14.0945 11.4999 13.8706 11.4999 13.5945V13.3002C12.3206 13.2057 13.0714 12.8818 13.6866 12.3942L13.8948 12.6024C14.0901 12.7977 14.4067 12.7977 14.602 12.6024C14.7972 12.4072 14.7972 12.0906 14.602 11.8953L14.3937 11.687C14.8813 11.0719 15.2053 10.321 15.2997 9.50036H15.594C15.8701 9.50036 16.094 9.2765 16.094 9.00036C16.094 8.72422 15.8701 8.50036 15.594 8.50036H15.2997C15.2053 7.67966 14.8814 6.92881 14.3937 6.31363L14.602 6.10539C14.7972 5.91013 14.7972 5.59354 14.602 5.39828C14.4067 5.20302 14.0901 5.20302 13.8948 5.39828L13.6866 5.60651C13.0714 5.11883 12.3206 4.79486 11.4999 4.70045V4.40625ZM10.4999 5.70917C9.95399 5.7914 9.45154 6.00621 9.02637 6.31975L10.4999 7.79326V5.70917ZM8.31926 7.02685C8.00572 7.45203 7.79091 7.95448 7.70868 8.50036H9.79277L8.31926 7.02685ZM7.7087 9.50036C7.79095 10.0462 8.00576 10.5487 8.31931 10.9738L9.79277 9.50036H7.7087ZM9.02643 11.6809C9.4516 11.9944 9.95402 12.2092 10.4999 12.2914V10.2075L9.02643 11.6809ZM11.4999 12.2914C12.0457 12.2092 12.5481 11.9944 12.9733 11.6809L11.4999 10.2075V12.2914ZM13.6804 10.9738C13.9939 10.5486 14.2087 10.0462 14.2909 9.50036H12.207L13.6804 10.9738ZM14.2909 8.50036C14.2087 7.95451 13.9939 7.45208 13.6804 7.02692L12.207 8.50036H14.2909ZM12.9733 6.3198L11.4999 7.79326V5.70919C12.0457 5.79144 12.5482 6.00625 12.9733 6.3198Z"
-    fill="currentColor" />
-</svg>
\ No newline at end of file
+<svg width="37" height="40" viewBox="0 0 37 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.82934 31.998C3.70078 31.9042 0.382812 28.528 0.382812 24.3769C0.382812 21.344 2.154 18.7248 4.71844 17.4972C5.40311 11.6875 10.3442 7.18073 16.338 7.18073C22.2243 7.18073 27.0954 11.5275 27.9166 17.1862C30.8795 18.2316 33.0026 21.0563 33.0026 24.3769C33.0026 28.587 29.5897 32 25.3796 32C25.3205 32 25.2616 31.9993 25.2028 31.998V32H7.82934V31.998Z" fill="#326DE6"/>
+<path d="M24.2458 21.9779C24.2214 21.9779 24.197 21.9779 24.197 21.9528C24.197 21.9277 24.1481 21.9277 24.0993 21.9277C24.0015 21.9027 23.9038 21.9027 23.8061 21.9027C23.7573 21.9027 23.7084 21.9027 23.6596 21.8776H23.6351C23.3664 21.8525 23.0733 21.8024 22.8046 21.7271C22.7313 21.7021 22.658 21.6268 22.6336 21.5516L22.4382 21.5015C22.5359 20.7743 22.4871 20.0221 22.3405 19.2949C22.1695 18.5678 21.8764 17.8657 21.4855 17.2388L21.6321 17.0884V17.0633C21.6321 16.9881 21.6565 16.8878 21.7054 16.8376C21.9252 16.637 22.1451 16.4866 22.3893 16.3361C22.4382 16.3111 22.4871 16.286 22.5359 16.2609C22.6336 16.2108 22.7069 16.1606 22.8046 16.1105C22.829 16.0854 22.8535 16.0854 22.8779 16.0603C22.9023 16.0352 22.8779 16.0352 22.8779 16.0102C23.0977 15.8346 23.1466 15.5337 22.9756 15.3081C22.9023 15.2078 22.7558 15.1326 22.6336 15.1326C22.5115 15.1326 22.3893 15.1827 22.2916 15.2579L22.2672 15.283C22.2428 15.3081 22.2184 15.3331 22.1939 15.3331C22.1206 15.4084 22.0474 15.4836 21.9985 15.5588C21.9741 15.609 21.9252 15.634 21.9008 15.6591C21.7298 15.8597 21.51 16.0603 21.2901 16.2108C21.2413 16.2358 21.1924 16.2609 21.1436 16.2609C21.1191 16.2609 21.0703 16.2609 21.0459 16.2358H21.0214L20.826 16.3612C20.6306 16.1606 20.4107 15.96 20.2153 15.7594C19.3115 15.0323 18.1879 14.5809 17.0398 14.4555L17.0154 14.2549V14.28C16.9421 14.2299 16.9177 14.1546 16.8932 14.0794C16.8932 13.8036 16.8932 13.5278 16.9421 13.2269V13.2018C16.9421 13.1517 16.9665 13.1015 16.9665 13.0514C16.9909 12.9511 16.9909 12.8508 17.0154 12.7505V12.6C17.0398 12.3493 16.8444 12.0985 16.6001 12.0735C16.4535 12.0484 16.307 12.1236 16.1848 12.249C16.0871 12.3493 16.0383 12.4747 16.0383 12.6V12.7254C16.0383 12.8257 16.0627 12.926 16.0871 13.0263C16.1116 13.0764 16.1116 13.1266 16.1116 13.1767V13.2018C16.1604 13.4776 16.1604 13.7535 16.1604 14.0544C16.136 14.1296 16.1116 14.2048 16.0383 14.2549V14.3051L16.0138 14.5057C15.7451 14.5308 15.4764 14.5809 15.1833 14.6311C14.0352 14.8818 12.9849 15.5087 12.1788 16.3863L12.0322 16.286H12.0078C11.9834 16.286 11.9589 16.3111 11.9101 16.3111C11.8612 16.3111 11.8124 16.286 11.7635 16.2609C11.5437 16.0854 11.3238 15.8848 11.1528 15.6842C11.1284 15.634 11.0795 15.609 11.0551 15.5839C10.9818 15.5087 10.933 15.4334 10.8597 15.3582C10.8353 15.3331 10.8108 15.3331 10.7864 15.3081C10.762 15.283 10.762 15.283 10.762 15.283C10.6643 15.2078 10.5422 15.1576 10.42 15.1576C10.2735 15.1576 10.1513 15.2078 10.078 15.3331C9.93147 15.5588 9.98032 15.8597 10.1757 16.0352C10.2002 16.0352 10.2002 16.0603 10.2002 16.0603C10.2002 16.0603 10.249 16.1105 10.2735 16.1105C10.3467 16.1606 10.4444 16.2108 10.5422 16.2609C10.591 16.286 10.6399 16.3111 10.6887 16.3361C10.933 16.4866 11.1773 16.637 11.3727 16.8376C11.4215 16.8878 11.4704 16.9881 11.446 17.0633V17.0382L11.5925 17.1887C11.5681 17.2388 11.5437 17.2639 11.5192 17.314C10.762 18.5427 10.4444 19.997 10.6643 21.4262L10.4689 21.4764C10.4689 21.5015 10.4444 21.5015 10.4444 21.5015C10.42 21.5767 10.3467 21.6268 10.2735 21.677C10.0048 21.7522 9.73605 21.8024 9.44293 21.8274C9.39407 21.8274 9.34522 21.8274 9.29636 21.8525C9.19865 21.8525 9.10095 21.8776 9.00324 21.8776C8.97881 21.8776 8.95438 21.9027 8.90553 21.9027C8.8811 21.9027 8.8811 21.9027 8.85667 21.9277C8.58797 21.9779 8.41698 22.2286 8.46584 22.5044C8.51469 22.7301 8.73454 22.8806 8.95438 22.8555C9.00324 22.8555 9.02766 22.8555 9.07652 22.8304C9.10095 22.8304 9.10095 22.8304 9.10095 22.8053C9.10095 22.7803 9.17423 22.8053 9.19865 22.8053C9.29636 22.7803 9.39407 22.7301 9.46735 22.705C9.51621 22.68 9.56506 22.6549 9.61392 22.6549H9.63834C9.90704 22.5546 10.1513 22.4794 10.4444 22.4292H10.4689C10.5422 22.4292 10.6154 22.4543 10.6643 22.5044C10.6887 22.5044 10.6887 22.5295 10.6887 22.5295L10.9086 22.5044C11.275 23.6579 11.9589 24.6859 12.9116 25.4382C13.1314 25.6137 13.3269 25.7641 13.5711 25.8895L13.449 26.065C13.449 26.0901 13.4734 26.0901 13.4734 26.0901C13.5223 26.1653 13.5223 26.2656 13.4978 26.3408C13.4001 26.5916 13.2536 26.8423 13.107 27.068V27.0931C13.0826 27.1432 13.0582 27.1683 13.0093 27.2184C12.9604 27.2686 12.9116 27.3689 12.8383 27.4692C12.8139 27.4943 12.8139 27.5193 12.7895 27.5444C12.7895 27.5444 12.7895 27.5695 12.765 27.5695C12.6429 27.8202 12.7406 28.1211 12.9604 28.2465C13.0093 28.2716 13.0826 28.2967 13.1314 28.2967C13.3269 28.2967 13.4978 28.1713 13.5956 27.9958C13.5956 27.9958 13.5956 27.9707 13.62 27.9707C13.62 27.9456 13.6444 27.9205 13.6688 27.8955C13.6933 27.7952 13.7421 27.7199 13.7665 27.6196L13.8154 27.4692C13.8887 27.1934 14.0108 26.9426 14.133 26.6919C14.1818 26.6167 14.2551 26.5665 14.3284 26.5414C14.3528 26.5414 14.3528 26.5414 14.3528 26.5164L14.4505 26.3158C15.1345 26.5916 15.8429 26.717 16.5757 26.717C17.0154 26.717 17.4551 26.6668 17.8947 26.5414C18.1634 26.4913 18.4321 26.391 18.6764 26.3158L18.7741 26.4913C18.7985 26.4913 18.7985 26.4913 18.7985 26.5164C18.8718 26.5414 18.9451 26.5916 18.994 26.6668C19.1161 26.9176 19.2382 27.1683 19.3115 27.4441V27.4692L19.3604 27.6196C19.3848 27.7199 19.4092 27.8202 19.4581 27.8955C19.4825 27.9205 19.4825 27.9456 19.5069 27.9707C19.5069 27.9707 19.5069 27.9958 19.5314 27.9958C19.6291 28.1713 19.8001 28.2967 19.9955 28.2967C20.0688 28.2967 20.1176 28.2716 20.1909 28.2465C20.2886 28.1964 20.3863 28.0961 20.4107 27.9707C20.4352 27.8453 20.4352 27.7199 20.3863 27.5946C20.3863 27.5695 20.3619 27.5695 20.3619 27.5695C20.3619 27.5444 20.3375 27.5193 20.313 27.4943C20.2642 27.394 20.2153 27.3187 20.142 27.2435C20.1176 27.1934 20.0932 27.1683 20.0443 27.1182V27.068C19.8733 26.8423 19.7512 26.5916 19.6535 26.3408C19.6291 26.2656 19.6291 26.1653 19.6779 26.0901C19.6779 26.065 19.7024 26.065 19.7024 26.065L19.6291 25.8644C20.8749 25.0871 21.8275 23.8835 22.2672 22.4543L22.4626 22.4794C22.4871 22.4794 22.4871 22.4543 22.4871 22.4543C22.5359 22.4042 22.6092 22.3791 22.6825 22.3791H22.7069C22.9756 22.4292 23.2443 22.5044 23.4886 22.6047H23.513C23.5619 22.6298 23.6107 22.6549 23.6596 22.6549C23.7573 22.705 23.8306 22.7552 23.9283 22.7803C23.9527 22.7803 23.9771 22.8053 24.026 22.8053C24.0504 22.8053 24.0504 22.8053 24.0748 22.8304C24.1237 22.8555 24.1481 22.8555 24.197 22.8555C24.4168 22.8555 24.6122 22.705 24.6855 22.5044C24.6611 22.2286 24.4657 22.028 24.2458 21.9779ZM17.1864 21.2006L16.5268 21.5265L15.8673 21.2006L15.6963 20.4734L16.1604 19.8716H16.8932L17.3573 20.4734L17.1864 21.2006ZM21.168 19.5707C21.2901 20.0973 21.3146 20.6239 21.2657 21.1504L18.9451 20.4734C18.7253 20.4233 18.6031 20.1976 18.652 19.9719C18.6764 19.8967 18.7008 19.8466 18.7497 19.7964L20.5817 18.0913C20.8504 18.5427 21.0459 19.0442 21.168 19.5707ZM19.8489 17.1636L17.8459 18.6179C17.6749 18.7182 17.4306 18.6931 17.3085 18.5176C17.2596 18.4675 17.2352 18.4173 17.2352 18.3421L17.0886 15.8096C18.1634 15.9349 19.1161 16.4114 19.8489 17.1636ZM15.4276 15.8848L15.9161 15.7845L15.794 18.2919C15.794 18.5176 15.5986 18.6931 15.3787 18.6931C15.3055 18.6931 15.2566 18.6681 15.1833 18.643L13.1559 17.1636C13.791 16.5367 14.5726 16.0854 15.4276 15.8848ZM12.4475 18.0913L14.2551 19.7463C14.4261 19.8967 14.4505 20.1474 14.3039 20.323C14.2551 20.3982 14.2062 20.4233 14.1085 20.4483L11.7391 21.1504C11.6658 20.0973 11.9101 19.0191 12.4475 18.0913ZM12.0322 22.3289L14.4505 21.9027C14.6459 21.9027 14.8413 22.028 14.8658 22.2286C14.8902 22.3039 14.8902 22.4042 14.8413 22.4794L13.9131 24.7862C13.0582 24.2095 12.3742 23.3319 12.0322 22.3289ZM17.5772 25.4382C17.2352 25.5134 16.8932 25.5635 16.5268 25.5635C16.0138 25.5635 15.4764 25.4632 14.9879 25.3128L16.1848 23.0812C16.307 22.9307 16.5024 22.8806 16.6734 22.9809C16.7467 23.031 16.7955 23.0812 16.8688 23.1564L18.0413 25.3379C17.8947 25.3629 17.7482 25.388 17.5772 25.4382ZM20.5573 23.2567C20.1909 23.8585 19.6779 24.385 19.0917 24.7612L18.139 22.4042C18.0902 22.2036 18.1879 22.003 18.3589 21.9277C18.4321 21.9027 18.5054 21.8776 18.5787 21.8776L21.0214 22.3039C20.8993 22.6549 20.7527 22.9809 20.5573 23.2567Z" fill="white"/>
+</svg>