diff --git a/source/blender/draw/engines/overlay/overlay_instance.cc b/source/blender/draw/engines/overlay/overlay_instance.cc
index 2b806e9d3ea..c4bca3c1352 100644
--- a/source/blender/draw/engines/overlay/overlay_instance.cc
+++ b/source/blender/draw/engines/overlay/overlay_instance.cc
@@ -254,7 +254,7 @@ void Resources::update_theme_settings(const DRWContext *ctx, const State &state)
   UI_GetThemeColor4fv(TH_WIRE, gb.colors.wire);
   UI_GetThemeColor4fv(TH_WIRE_EDIT, gb.colors.wire_edit);
   UI_GetThemeColor4fv(TH_ACTIVE, gb.colors.active_object);
-  UI_GetThemeColor4fv(TH_SELECT, gb.colors.select);
+  UI_GetThemeColor4fv(TH_SELECT, gb.colors.object_select);
   gb.colors.library_select = rgba_uchar_to_float(0x88, 0xFF, 0xFF, 155);
   gb.colors.library = rgba_uchar_to_float(0x55, 0xCC, 0xCC, 155);
   UI_GetThemeColor4fv(TH_TRANSFORM, gb.colors.transform);
diff --git a/source/blender/draw/engines/overlay/overlay_origin.hh b/source/blender/draw/engines/overlay/overlay_origin.hh
index f7dbc6dfd74..68a82bf6f37 100644
--- a/source/blender/draw/engines/overlay/overlay_origin.hh
+++ b/source/blender/draw/engines/overlay/overlay_origin.hh
@@ -62,8 +62,9 @@ class Origins : Overlay {
     }
     else if (ob->base_flag & BASE_SELECTED) {
       select_buf_.select_append(res.select_id(ob_ref));
-      point_buf_.append(VertexData{
-          location, is_library ? res.theme.colors.library_select : res.theme.colors.select});
+      point_buf_.append(VertexData{location,
+                                   is_library ? res.theme.colors.library_select :
+                                                res.theme.colors.object_select});
     }
     else if (state.v3d_flag & V3D_DRAW_CENTERS) {
       select_buf_.select_append(res.select_id(ob_ref));
diff --git a/source/blender/draw/engines/overlay/overlay_private.hh b/source/blender/draw/engines/overlay/overlay_private.hh
index 8a66184329a..d6d8ad2028f 100644
--- a/source/blender/draw/engines/overlay/overlay_private.hh
+++ b/source/blender/draw/engines/overlay/overlay_private.hh
@@ -881,7 +881,7 @@ struct Resources : public select::SelectMap {
       case TH_ACTIVE:
         return theme.colors.active_object;
       case TH_SELECT:
-        return theme.colors.select;
+        return theme.colors.object_select;
       case TH_TRANSFORM:
         return theme.colors.transform;
       case TH_SPEAKER:
diff --git a/source/blender/draw/engines/overlay/overlay_shader_shared.hh b/source/blender/draw/engines/overlay/overlay_shader_shared.hh
index aff10135097..84a3d5c09ae 100644
--- a/source/blender/draw/engines/overlay/overlay_shader_shared.hh
+++ b/source/blender/draw/engines/overlay/overlay_shader_shared.hh
@@ -174,7 +174,7 @@ struct ThemeColors {
   float4 wire;
   float4 wire_edit;
   float4 active_object; /* "active" is reserved keyword in GLSL. */
-  float4 select;
+  float4 object_select; /* "select" is defined as a macro for GLSL. */
   float4 library_select;
   float4 library;
   float4 transform;
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_extra_lightprobe_grid_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_extra_lightprobe_grid_vert.glsl
index 308bc3c5c31..7bf260293d6 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_extra_lightprobe_grid_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_extra_lightprobe_grid_vert.glsl
@@ -21,7 +21,7 @@ float4 color_from_id(float color_id)
     return theme.colors.active_object;
   }
   else /* 2.0f */ {
-    return theme.colors.select;
+    return theme.colors.object_select;
   }
 
   return theme.colors.transform;
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_detect_frag.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_detect_frag.glsl
index cc5df1c28ed..883dba9f53f 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_detect_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_detect_frag.glsl
@@ -236,7 +236,7 @@ void main()
     frag_color = float4(0.0f);
   }
   else if (color_id == 1u) {
-    frag_color = theme.colors.select;
+    frag_color = theme.colors.object_select;
   }
   else if (color_id == 3u) {
     frag_color = theme.colors.active_object;
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl
index 85d57ae2fcb..fb13ce10dd5 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_curves_vert.glsl
@@ -25,7 +25,7 @@ uint outline_colorid_get()
     return 3u; /* theme.colors.active */
   }
   else {
-    return 1u; /* theme.colors.select */
+    return 1u; /* theme.colors.object_select */
   }
 
   return 0u;
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_vert.glsl
index 0302648e397..87991e8e03a 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_gpencil_vert.glsl
@@ -24,7 +24,7 @@ uint outline_colorid_get()
     return 3u; /* theme.colors.active */
   }
   else {
-    return 1u; /* theme.colors.select */
+    return 1u; /* theme.colors.object_select */
   }
 
   return 0u;
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_pointcloud_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_pointcloud_vert.glsl
index 6151af6fa2a..3368eca14d1 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_pointcloud_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_pointcloud_vert.glsl
@@ -25,7 +25,7 @@ uint outline_colorid_get()
     return 3u; /* theme.colors.active */
   }
   else {
-    return 1u; /* theme.colors.select */
+    return 1u; /* theme.colors.object_select */
   }
 
   return 0u;
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_vert.glsl
index a00db692351..ad4d9526549 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_vert.glsl
@@ -24,7 +24,7 @@ uint outline_colorid_get()
     return 3u; /* theme.colors.active */
   }
   else {
-    return 1u; /* theme.colors.select */
+    return 1u; /* theme.colors.object_select */
   }
 
   return 0u;
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_wire_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_wire_vert.glsl
index 72a1974735e..11cc3dc0670 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_wire_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_outline_prepass_wire_vert.glsl
@@ -26,7 +26,7 @@ uint outline_colorid_get()
     return 3u; /* theme.colors.active */
   }
   else {
-    return 1u; /* theme.colors.select */
+    return 1u; /* theme.colors.object_select */
   }
 
   return 0u;
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_particle_hair_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_particle_hair_vert.glsl
index 0de656c8262..09a078e1030 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_particle_hair_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_particle_hair_vert.glsl
@@ -40,7 +40,7 @@ void wire_color_get(out float3 rim_col, out float3 wire_col)
       rim_col = theme.colors.active_object.rgb;
     }
     else {
-      rim_col = theme.colors.select.rgb;
+      rim_col = theme.colors.object_select.rgb;
     }
     wire_col = theme.colors.wire.rgb;
   }
diff --git a/source/blender/draw/engines/overlay/shaders/overlay_wireframe_vert.glsl b/source/blender/draw/engines/overlay/shaders/overlay_wireframe_vert.glsl
index 111a2d447c4..cf062d8bee2 100644
--- a/source/blender/draw/engines/overlay/shaders/overlay_wireframe_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/overlay_wireframe_vert.glsl
@@ -41,7 +41,7 @@ void wire_color_get(out float3 rim_col, out float3 wire_col)
       rim_col = theme.colors.active_object.rgb;
     }
     else {
-      rim_col = theme.colors.select.rgb;
+      rim_col = theme.colors.object_select.rgb;
     }
     wire_col = theme.colors.wire.rgb;
   }