diff --git a/vcl/uiconfig/theme_definitions/definition.xml b/vcl/uiconfig/theme_definitions/definition.xml
index 244f9c259ce4..d12161d6081c 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -114,7 +114,11 @@
     <combobox>
         <part value="Entire">
             <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
-               <rect stroke="#4CD964" fill="#FFFFFF" stroke-width="1" rx="5" ry="5" />
+                <external source="spinbox-entire.svgx" />
+            </state>
+        </part>
+        <part value="SubEdit">
+            <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
             </state>
         </part>
         <part value="ButtonUp">
@@ -134,7 +138,7 @@
     <editbox>
         <part value="Entire">
             <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
-                <!-- <rect stroke="#C7C7C7" fill="#FFFFFF" stroke-width="2" rx="5" ry="5" margin="0"/> -->
+                <rect stroke="#FFFFFF" fill="#FFFFFF" stroke-width="1" rx="1" ry="1" />
                 <line stroke="#C7C7C7" stroke-width="2" x1="0.0" y1="0.9" x2="1.0" y2="0.9"/>
             </state>
         </part>