diff --git a/src/Resources/public/css/be_main.css b/src/Resources/public/css/be_main.css
index d6410ee..057533a 100644
--- a/src/Resources/public/css/be_main.css
+++ b/src/Resources/public/css/be_main.css
@@ -20,10 +20,6 @@ fieldset.rsce_group_no_legend:last-of-type {
 fieldset.rsce_list {
 	position: relative;
 }
-.rsce_list fieldset.tl_tbox > legend,
-.rsce_list fieldset.tl_box > legend {
-	background-color: rgba(0, 0, 0, 0.035);
-}
 .rsce_list_inner {
 	margin-bottom: -12px;
 }
@@ -44,12 +40,15 @@ p.rsce_group_description {
 	width: calc(100% - 30px);
 	margin: 0 15px 20px;
 	padding: 0 0 20px 0;
-	border: 1px solid #ccc;
+	border: 1px solid var(--content-border, #ccc);
 	background-color: #fafafa;
-	background-color: rgba(0, 0, 0, 0.02);
+    background-color: rgba(0, 0, 0, 0.02);
+}
+html[data-color-scheme=dark] .rsce_list_item {
+    background-color: rgba(255, 255, 255, 0.02);
 }
 .rsce_list_item .tl_text_trbl {
-	background-color: #fff;
+	background-color: var(--content-bg, #fff);
 }
 .rsce_list_item_dummy {
 	display: none;
@@ -57,13 +56,13 @@ p.rsce_group_description {
 .rsce_list_item .rsce_list_item {
 	width: 96%;
 	margin: 0 2% 5px;
-	border-color: #e9e9e9;
+	border-color: var(--border, #e9e9e9);
 }
 .rsce_list_item_title {
 	margin: 0;
 	padding: 5px 15px;
-	border-bottom: 1px solid #e9e9e9;
-	background: #fff;
+	border-bottom: 1px solid var(--border, #e9e9e9);
+	background: var(--content-bg, #fff);
 	font-size: inherit;
 	font-weight: inherit;
 }
diff --git a/src/Widget/ListItemStart.php b/src/Widget/ListItemStart.php
index 4437525..3137c93 100644
--- a/src/Widget/ListItemStart.php
+++ b/src/Widget/ListItemStart.php
@@ -42,7 +42,7 @@ public function generate()
 		$toolbar = '<div class="rsce_list_toolbar">';
 		$toolbar .= '<a href="" class="rsce_list_toolbar_up" onclick="rsceMoveElement(this, -1);return false;" title="' . $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_up'] . '" data-rsce-title="' . $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_up'] . '">' . Image::getHtml('up.svg', $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_up']) . '</a> ';
 		$toolbar .= '<a href="" class="rsce_list_toolbar_down" onclick="rsceMoveElement(this, 1);return false;" title="' . $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_down'] . '" data-rsce-title="' . $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_down'] . '">' . Image::getHtml('down.svg', $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_down']) . '</a> ';
-		$toolbar .= Image::getHtml('drag.svg', sprintf($GLOBALS['TL_LANG']['MSC']['move']), 'class="drag-handle rsce_list_toolbar_drag" title="' . sprintf($GLOBALS['TL_LANG']['MSC']['move']) . '"') . ' ';
+		$toolbar .= '<span class="drag-handle rsce_list_toolbar_drag" title="' . $GLOBALS['TL_LANG']['MSC']['move'] . '" data-rsce-title="' . $GLOBALS['TL_LANG']['MSC']['move'] . '">' . Image::getHtml('drag.svg', $GLOBALS['TL_LANG']['MSC']['move']) . '</span> ';
 		$toolbar .= '<a href="" class="rsce_list_toolbar_delete" onclick="rsceDeleteElement(this);return false;" title="' . $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_delete'] . '" data-rsce-title="' . $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_delete'] . '">' . Image::getHtml('delete.svg', $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_delete']) . '</a> ';
 		$toolbar .= '<a href="" class="rsce_list_toolbar_duplicate" onclick="rsceDuplicateElement(this);return false;" title="' . $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_duplicate'] . '" data-rsce-title="' . $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_duplicate'] . '">' . Image::getHtml('copy.svg', $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_duplicate']) . '</a> ';
 		$toolbar .= '<a href="" class="rsce_list_toolbar_new" onclick="rsceNewElementAfter(this);return false;" title="' . $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_new'] . '" data-rsce-title="' . $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_new'] . '">' . Image::getHtml('new.svg', $GLOBALS['TL_LANG']['rocksolid_custom_elements']['list_item_new']) . '</a> ';