diff --git a/app/views/file/_terms_of_use_select.php b/app/views/file/_terms_of_use_select.php
index 59cb5079b20ce78069556da8d4251d84237933ba..c1aae007f3b0cc5b2c8b2a72cc29d92f9883c1aa 100644
--- a/app/views/file/_terms_of_use_select.php
+++ b/app/views/file/_terms_of_use_select.php
@@ -24,20 +24,20 @@ if (!$selected_terms_of_use_id) {
                aria-description="<?= htmlReady(kill_format($content_terms_of_use_entry->description)) ?>">
 
         <label for="content_terms_of_use-<?= htmlReady($content_terms_of_use_entry->id) ?>">
-            <div class="icon">
-            <? if ($content_terms_of_use_entry['icon']) : ?>
-                <? if (filter_var($content_terms_of_use_entry['icon'], FILTER_VALIDATE_URL)): ?>
-                    <img src="<?= htmlReady($content_terms_of_use_entry['icon']) ?>" width="32" height="32">
-                <? else : ?>
-                    <?= Icon::create($content_terms_of_use_entry['icon'], Icon::ROLE_CLICKABLE)->asImg(32) ?>
-                <? endif ?>
-            <? endif ?>
-            </div>
+            <?= Icon::create('radiobutton-unchecked')->asImg(24, ['class' => 'arrow']) ?>
+            <?= Icon::create('radiobutton-checked')->asImg(24, ['class' => 'check']) ?>
             <div class="text">
                 <?= htmlReady($content_terms_of_use_entry->name) ?>
             </div>
-            <?= Icon::create('arr_1down', Icon::ROLE_CLICKABLE)->asImg(24, ['class' => 'arrow']) ?>
-            <?= Icon::create('check-circle', Icon::ROLE_CLICKABLE)->asImg(32, ['class' => 'check']) ?>
+            <div class="icon">
+                <? if ($content_terms_of_use_entry['icon']) : ?>
+                    <? if (filter_var($content_terms_of_use_entry['icon'], FILTER_VALIDATE_URL)): ?>
+                        <img src="<?= htmlReady($content_terms_of_use_entry['icon']) ?>" width="32" height="32">
+                    <? else : ?>
+                        <?= Icon::create($content_terms_of_use_entry['icon'], Icon::ROLE_CLICKABLE)->asImg(32) ?>
+                    <? endif ?>
+                <? endif ?>
+            </div>
         </label>
 
         <? if (trim($content_terms_of_use_entry->description)): ?>
diff --git a/app/views/file/new_edit_folder_form.php b/app/views/file/new_edit_folder_form.php
index c1301d42fe0adf471b7d7398152489b7d6d8702d..d2dd9315fe81ec9fa8a72e5a935dec2ac2a30d26 100644
--- a/app/views/file/new_edit_folder_form.php
+++ b/app/views/file/new_edit_folder_form.php
@@ -27,20 +27,19 @@
                id="folder-type-<?= htmlReady($folder_type['class']) ?>"
                <? if ($folder_type['class'] === get_class($folder)) echo 'checked'; ?>>
         <label for="folder-type-<?= htmlReady($folder_type['class']) ?>">
-            <div class="icon">
-                <? if ($folder_type['icon']) : ?>
-                    <?= $folder_type['icon']->asImg(32) ?>
-                <? endif ?>
-            </div>
+            <?= Icon::create('radiobutton-unchecked')->asImg(24, ['class' => 'arrow']) ?>
+            <?= Icon::create('radiobutton-checked')->asImg(24, ['class' => 'check']) ?>
             <div class="text">
                 <?= htmlReady($folder_type['name']) ?>
             <? if ($template = $folder_type['instance']->getDescriptionTemplate()): ?>
                 <?= tooltipIcon($template instanceof Flexi_Template ? $template->render() : $template, false, true) ?>
-            <? endif; ?>
-
+            <? endif ?>
+            </div>
+            <div class="icon">
+                <? if ($folder_type['icon']) : ?>
+                    <?= $folder_type['icon']->asImg(32) ?>
+                <? endif ?>
             </div>
-            <?= Icon::create('arr_1down')->asImg(24, ['class' => 'arrow']) ?>
-            <?= Icon::create('check-circle')->asImg(32, ['class' => 'check']) ?>
         </label>
         <? if ($folder_type['class'] === get_class($folder)) : ?>
             <? $folder_template = $folder->getEditTemplate() ?>
diff --git a/resources/assets/stylesheets/scss/files.scss b/resources/assets/stylesheets/scss/files.scss
index 7808f15b7f83ea4a13ef1ca4b12601fc63e0ba02..a75f8f3730ad94ca24129901fb85b1b446e2ecc9 100644
--- a/resources/assets/stylesheets/scss/files.scss
+++ b/resources/assets/stylesheets/scss/files.scss
@@ -406,19 +406,20 @@ form.default {
             display: flex;
             justify-content: space-between;
             align-items: center;
-            padding: 6px 6px 2px;
+            padding: 0 10px 0;
             margin-bottom: 0;
             border-top: none;
             > .text {
                 width: 100%;
                 margin-left: 10px;
             }
-            > .arrow {
-                margin-right: 5px;
-            }
             > .check {
                 display: none;
             }
+
+            > .icon {
+                margin-top: 6px;
+            }
         }
         > label:first-of-type {
             border-top: 1px solid var(--content-color-40);