diff --git a/.gitattributes b/.gitattributes
index 9ed4981179..62ea09fc42 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4260,10 +4260,12 @@ ideintf/idetextconverter.pas svneol=native#text/plain
 ideintf/idewindowintf.pas svneol=native#text/plain
 ideintf/imagelisteditor.lfm svneol=native#text/plain
 ideintf/imagelisteditor.pp svneol=native#text/pascal
+ideintf/images/delete_selection.png -text
 ideintf/images/ideintf_images.lrs svneol=native#text/plain
 ideintf/images/laz_copy.png -text svneol=unset#image/png
 ideintf/images/laz_cut.png -text svneol=unset#image/png
 ideintf/images/laz_paste.png -text svneol=unset#image/png
+ideintf/images/oi_options.png -text svneol=unset#image/png
 ideintf/images/propertygrid/issue_carbon.png -text svneol=unset#image/png
 ideintf/images/propertygrid/issue_fpgui.png -text svneol=unset#image/png
 ideintf/images/propertygrid/issue_gtk.png -text svneol=unset#image/png
@@ -4544,7 +4546,6 @@ images/designer/anchor_left_right.png -text svneol=unset#image/png
 images/designer/anchor_right.png -text svneol=unset#image/png
 images/designer/anchor_top.png -text svneol=unset#image/png
 images/designer/anchor_top_bottom.png -text svneol=unset#image/png
-images/designer/delete_selection.png -text
 images/designer/mirror_horizontal.png -text
 images/designer/mirror_vertical.png -text
 images/designer/scale.png -text
diff --git a/ideintf/ideintf.lpk b/ideintf/ideintf.lpk
index 5b82b8f47f..e16e0374df 100644
--- a/ideintf/ideintf.lpk
+++ b/ideintf/ideintf.lpk
@@ -7,6 +7,7 @@
     <CompilerOptions>
       <Version Value="10"/>
       <SearchPaths>
+        <IncludeFiles Value="images"/>
         <UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <Other>
@@ -22,7 +23,7 @@
     <Description Value="IDEIntf - the interface units for the Lazarus IDE"/>
     <License Value="Modified LPGL2"/>
     <Version Major="1"/>
-    <Files Count="68">
+    <Files Count="69">
       <Item1>
         <Filename Value="actionseditor.lfm"/>
         <Type Value="LFM"/>
@@ -294,8 +295,12 @@
       </Item67>
       <Item68>
         <Filename Value="compoptsintf.pas"/>
-        <UnitName Value="compoptsintf"/>
+        <UnitName Value="CompOptsIntf"/>
       </Item68>
+      <Item69>
+        <Filename Value="images/ideintf_images.lrs"/>
+        <Type Value="LRS"/>
+      </Item69>
     </Files>
     <LazDoc Paths="docs"/>
     <i18n>
diff --git a/images/designer/delete_selection.png b/ideintf/images/delete_selection.png
similarity index 100%
rename from images/designer/delete_selection.png
rename to ideintf/images/delete_selection.png
diff --git a/ideintf/images/ideintf_images.lrs b/ideintf/images/ideintf_images.lrs
index a8ec6afbd8..f05f3df370 100644
--- a/ideintf/images/ideintf_images.lrs
+++ b/ideintf/images/ideintf_images.lrs
@@ -1,3 +1,122 @@
+LazarusResources.Add('oi_options','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+  +#0#0#1#198'IDATx^'#173#146'KH'#27'Q'#24#133#207#140#175#214#136#141#10#133
+  +#130'JAf'#227#202'm'#138'J7A'#140#25#151#238#186'(X'#172#168#241#129#132#134
+  +'BJ'#3#210'Rp]('#186'2 Aq'#209#153'f,-tUh'#169#141#207#133'B'#16#17#155#167
+  +#132'P'#24#145#146#185#211#185#183's'#163#29#210#210#130#31#12'??'#255'='#231
+  +'?'#247'2'#184'R'#158#191#152#243'['#159'I+'#254#204'ogD'#199'P'#25#190'?'
+  +#204'*3'#169',VF'#30#140#26#244#204#159'R'#152#197'b'#193#164#181#242#172#200
+  +'g'#191#18#240#216#180#225'['#235#235#27#224#132#207'^-'#188#196#163#224'c'
+  +#25#128#202#175#160#4#198#167#204#149#213#24'5Q&''f'#144#207'f uH('#20'N'#159
+  +'r'#177#29'Y'#14#206#134#4'.'#166#8'|86'#26'0'#13#163'$'#16'BLB'#12'$'#190'n'
+  +#8#137#237'MP'#17#23'['#155'U8'#16#28#27#202#248#250#6#176#179#187#139#147
+  +#212'1m#'#150#248#9#254#135'u'#237#13'{'#172#183#235#26#171#246#18#177'R'#2
+  +#198'm'#223#179'['#0'R'#188#191#231'!'#232#234#148#208#214#218#14']'#215#241
+  +'y'#227#19'*]C'#184','#158#159#246#130#178#185#159'FT'#219#195#195#187'$'#2
+  +' '#236#239#31'D>'#159#187'l'#18#7'@h#Z'#226'.*^'#12#203#248#178#179#207#190
+  +#155#205'.P'#236'{'#203#170#246#26#146'$'#161#247'N'#15#255#201#202#239'!'
+  +#210#133't'#243#187#143'[('#25#4#226'57r'#5#29#28';'#178#28']^B'#227#13'7'
+  +#186'='#204'$|a`SS]'#133'ZW'#11#206#207'~'#176#248#22'^'#167#137#170')H'#30
+  +'&'#193')'#27'|'#203'}'#199'uW'#19#26#234#170#176#246#225#128#137#143#226#161
+  +#247#0#156'I"'#153'lz'#143'V'#216#8#214#27#12#1#136#129#195#197#255#200'O'
+  +#252#255#216'%L'#159#194#183#0#0#0#0'IEND'#174'B`'#130
+]);
+LazarusResources.Add('delete_selection','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+  +#0#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167
+  +#147#0#0#1'>IDAT8'#203#165#147'?S'#2'1'#16#197#127'{'#216'p9'#176#2#239#171
+  +'A-'#245'i'#147#138'/@'#26#165#166#215'V{j'#173#209#15#1#204#208'('#127','
+  +#159#197'qw'#220#12'7:'#186'3'#153#205'&//ow'#19#147#196#127','#162#127'%'
+  +#156#19'f'#2#8'!('#132#240#235#185#169#223#23#251#29#236#15#224'\>'#214'kk'
+  +#188'2'#203#148#227'b'#216#237'1I'#224#18#241'u'#128'8'#134#196#129'Kr'#192
+  +#219'{E4'#24#168#188'`:-'#215#173'V'#131'N'#167#2#185#24'b'#7'Ir'#244'1<<'
+  +#150#7'C'#8#242#222'[T'#4#0'l'#183#198'ju'#4#25#24' '#229#254#228'p'#189#136
+  +'Mf'#5#137#193#153'Fy'#239#173'$('#2#0#210'4'#135#171'd'#201#221'pX'#163')T'
+  +#215'S'#232'vUJ7'#131#215#23'c>'#183'<'#6'F#5'#167#208'j'#213'7'#23#139'J'
+  +#213#211#179#149'jnoTS-'#9#181#219'R'#20'I'#157#142#148#166#146#196#217'1'
+  +#186#150#178'L'#146#152'L&'#146'DD'#175#167'Z'#229#150#203#230'G'#164'c*'#227
+  +#177#170#20't'#178'c?'#252#139#217#172#144'}'#218#5'U'#149#254#248#180#31#127
+  +#207#221#189'aU'#225'/'#216'l'#172#8#252'IG'#188#247#214'8'#239'^r'#254')'
+  +#255#193#190#1#217''''#180''''#199'E'#156#152#0#0#0#0'IEND'#174'B`'#130
+]);
+LazarusResources.Add('laz_copy','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+  +#0#0#2#1'IDATx^}'#208'?hSQ'#24#134#241#231';'#231'$M'#27#218'DA-'#138#131'`'
+  +#219'I'#156#138#14'U'#209#165#131':'#233'R'#16#236'('#138#142#130'N*Z'#7'w'
+  +#17#7#161#224#164's7'#145'R'#5#177'X'#16'q'#18#233#210'V'#164#133'Xc'#254#221
+  +#220's'#207#231#13#222#161#208'\'#31'x'#215'w'#248#201#244#157#15#175'F'#134
+  +#11'G'#141#161#170'h'#2#130#168#18'ym'#214'['#221#23#221'Z'#237#249#187'g'#23
+  +';'#228'$'#151#31'-'#127'~}w'#178#188#217#8'V'#128#160'J'#156#4#156#133#249
+  +#143#219#172',o'#188#253#185#190'qk'#233#233#249#22'}rFd'#168#214'R'#251'}K1'
+  +'F'#137'}'#160#222#246#156#25#31'dj'#162'J'#185'h'#206'-'#188'i'#220#6#238
+  +#209''''#163' V'#160#228#160'h'#165'7JE'#195#230'v'#155#137'=0{'#162#194#225
+  +#209#161'+'#228#228#0'D'#160'`A'#21#180'w'#224#12#139#223#254#28#137#188#199
+  +#251#192#177#241#3#220#156#255#210#148#160'R'#239#248#245#181#181#206#203#212
+  +#230'Ij'#211'v'#10#8#130'5&SQBP'#162'8'#230#218#217#131'l5'#2#255'lF'#135'2'
+  +#155#177#212#230'~j3y'#250#250#194#140'S'#133#0#217'M'#192#10#20#157'!I'#148
+  +'_-'#229'?6'#23'R'#155#199'NU'#17#192#25'0b'#8#10'V@'#129#204#6'D'#16#221'iS'
+  +#224#248#254#10#139'K'#3'7'#12'jH'#130#167'_'#153#13'N'#192'e6'#171'5'#225
+  +#253'j'#196#239#182'Rp'#6'''jm'#228#27'@'#149#157#229#217'0`'#17'#XkQ'#192
+  +#197#221#168'Y0'#195#229'J)F'#21#140#8'"@'#142#141'h'#239'H'#16#17'T'#193#249
+  +'D'#127'\'#157#251#180#175#235#169#128#182'A'#0'e'#184'b'#153'=uh'#151#141#9
+  +'@'#17#6#29#168'*na'#238#228'4}'#186#244'p%Nm'#28'8'#250#21#212'C'#16#12'9'
+  +#137'Z'#215#179#201#171#231'&'#193#136'#'#167'V'#187'SKm'#246#238#178#1#4#176
+  +'f'#132#160#190#155'{'#16'u'#195#215#153#7#203'c`FA'#155#153#13#25#171#4'M'
+  +#26#149'ra'#240'/'#183'n'#0#134#16'0eZ'#0#0#0#0'IEND'#174'B`'#130
+]);
+LazarusResources.Add('laz_cut','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+  +#0#0#2'LIDATx^'#141#145']H'#147'Q'#24#199#207'{'#222#175#237#221't'#219#187
+  +#169#175#205#181#173#220#135#161#229'\V'#204'V'#146#224'F'#237'"'#16#164'"'
+  +#161'"'#22#149'Tt!'#221#216'M'#12'*'#154#13#187#176#166#140#162#168#172#155#6
+  +#131'"'#144#209#135'^'#132#139#4#21'\nnZ'#195#4'kf-Z'#190';)'#24#12#217'l'#7
+  +#14#15#207#195#255#252#158#243#231#15#16'By'#175#225#172#215#212't'#249#201
+  +'='#238'X7'#153'O'#3#193':G'#201#22#239#178#215'm'#218#187#196'#"{'#206#29
+  +#191'E'#173'6'#235#3'H'#2'R'#138'"'#166'l'#185#210#255'f'#218'S='#213#219'5e'
+  +#131#5#1#8#8')'#169'X  p(Y'#221#172'?'#186#167'&'#200'I'#197#160#192#31#224
+  +'4+'#22#2#136#1#177#188#205#163'l'#183#153'_i96'#133#225#160#167' '#0#14#161
+  +#160#136#161#1#134'A'#203#25#155'9'#184#207'TY'#234#31#26#245#246#182#239#247
+  +#21'f'#1#135'$'#133#227#224#156'c'#231#205#147'v'#179#206#245'h'#224#174#191
+  +#179#213#149#173#201#25#205'U'#17#128'+'#245'HW'#192#19#153'K'#161'@('#142
+  +#218#220#254#224#127'ct'#23#19#234#199#134#138';uU['#222#249'T'#236'5'#9'C'
+  +#239'^L'#165#193#211#183#227'C'#207'?D'#29#185'l'#194#236#199'5'#198#170#23
+  +'F'#141#214')e'#132'zK'#237#214#14'S'#165#202',c('#240#7'#'#210#4'I'#214'*Ot'
+  +'c+'#218#156#22#250#141#170#190#225#230#6#228'a'#5#22#143#140'n'#25#181'7'
+  +#160#190#129#143#232#225#240'W'#20'u4'#162#145'&'#11#186'].9'#157#215#194#6
+  +'E'#201#193#248#236#236#179#243#243#191#134'8'#133#188'9#'#160#193'D"'#137'j'
+  +#175#180#128#193#177'q'#223#183#212#207'1'#189'Z'#221'q'#163#24'grZHg'#248
+  +#239#21'2vG'#192#164#127']'#175#211'9'#195#225#200#27#171#251'p(9'#191#176'8'
+  +#243'e'#206#25#153#158#190#207#8#133#26#156#164'Js'#2#194'S1W&'#195#203#151
+  +'!'#214#247'S1'#127'8'#22'o'#133'<'#250'D'#17#184#8'!P"'#18#139'6'#242'<'#255
+  +';'#179#180#244'#o'#140'n'#9#169#238#146'R'#250#235'"'#12'_'#233'{+'#216#11
+  +#19#7#26'Q'#176#190':2b'#179#162'~'#131#234#193#218#24#137'l'#216#197'd:'#158
+  +#221'/,$'#189#161#201#201'm'#155#185#242'C'#209#196#231#151'3'#137#196#165
+  +#181'!'#252#5'7}.'#162#17#228#21'3'#0#0#0#0'IEND'#174'B`'#130
+]);
+LazarusResources.Add('laz_paste','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+  +#0#0#1#221'IDATx^}'#144#191'k'#20'Q'#20'F'#207#219#137'aC~'#176#232'BD'#9'j'
+  +''''#1'AvE'#216#149'T'#22'Z$'#146#128' '#136#152#194#128#176'['#7#196'&'#130
+  +#141#164#177'U'#176#16#4#193'B'#255#132#128#8')d'#183#211'B'#16'RX'#25'"'#18
+  +'C'#226#238#204'{'#247':'#23#134'a'#200','#30#248'x'#143#129#239#220#251#198
+  +#169'*'#198#203#181#11#243#192'W'#202#236'?|'#181'Sc4'#184#23#15#206'7'#128
+  +''''#192#210#212#201'Y'#238'>'#222#224'p'#239'3'#198'd'#253'*o6'#30#241#247
+  +#240#15#192'['#224'C*{O'#129#138'}'#188#190#188#178#184'x'#239'>'#215'.'#206
+  +#162#170#132#225#161#197#238',\'#154#227#230#202'-n,/'#221#6'^s'#140'1'#224
+  +#220#196#212#12#241#193'.^<;'#239#158#131'*'#160#236'i'#31'E'#25#236#254#160
+  +'Z?;'#14'XJ'#2#144#128'zO'#165'v'#26#9#30'U'#161#136#27#28#17#239#31'a'#140
+  +#20#168#8#226'='#146#12'-'#160#202#127')'#11'<'#18#146'|'#178#168#227#203#175
+  +#25#6'!'#2'5'#159#162'n'#156#159''''#230#233'v'#187#155'"B'#8#193#242'-'#19#4
+  +#196''''#16'L'#20#136'}'#133'h'#162#206#157#181#167#196'q'#204'1'#214'M'#24
+  +'EQ'#210#233't6s'#1'>A'#131#160'^'#144#160'i'#132#225'p'#200#246#246'6V'#200
+  +#200#239#173'V'#11#239'='#185#192#10#226'-vw'#182#30'F'#163#209#0'(I,'#5#129
+  +' I'#176#233'iLPA'#178'B'#191#223#183'BIb'#27#216#16#19'd'#211'M`g'#246#4#130
+  +#21'J'#27#20#201'7'#192#10#137'd'#255' '#160#193'!'#206'c'#244'z='#10#228#178
+  +'v'#187#157'o'#240')'#137#227#133#201'3s'#168'h'#26'a,'#129#232#247#180'M'
+  +#165#217'l'#150#202#217#153#11#158'}'#220#218#154#6'.'#147'a'#222#131#218#21
+  +#170#213'*'#206'9F'#17'E'#145#9'p'#163#222#182#186#186'ZI'#237#235'iN'#165
+  +#161#24#17')'#230#251'?EEbPXc'#222'>'#0#0#0#0'IEND'#174'B`'#130
+]);
 LazarusResources.Add('issue_fpgui','PNG',[
   #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
   +#0#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167
@@ -316,81 +435,3 @@ LazarusResources.Add('pg_active_row','PNG',[
   +'G'#211#196#192'HL8'#1#6#0'Y'#205#16#17#18#16#129#156#0#0#0#0'IEND'#174'B`'
   +#130
 ]);
-LazarusResources.Add('laz_copy','PNG',[
-  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
-  +#0#0#2#1'IDATx^}'#208'?hSQ'#24#134#241#231';'#231'$M'#27#218'DA-'#138#131'`'
-  +#219'I'#156#138#14'U'#209#165#131':'#233'R'#16#236'('#138#142#130'N*Z'#7'w'
-  +#17#7#161#224#164's7'#145'R'#5#177'X'#16'q'#18#233#210'V'#164#133'Xc'#254#221
-  +#220's'#207#231#13#222#161#208'\'#31'x'#215'w'#248#201#244#157#15#175'F'#134
-  +#11'G'#141#161#170'h'#2#130#168#18'ym'#214'['#221#23#221'Z'#237#249#187'g'#23
-  +';'#228'$'#151#31'-'#127'~}w'#178#188#217#8'V'#128#160'J'#156#4#156#133#249
-  +#143#219#172',o'#188#253#185#190'qk'#233#233#249#22'}rFd'#168#214'R'#251'}K1'
-  +'F'#137'}'#160#222#246#156#25#31'dj'#162'J'#185'h'#206'-'#188'i'#220#6#238
-  +#209''''#163' V'#160#228#160'h'#165'7JE'#195#230'v'#155#137'=0{'#162#194#225
-  +#209#161'+'#228#228#0'D'#160'`A'#21#180'w'#224#12#139#223#254#28#137#188#199
-  +#251#192#177#241#3#220#156#255#210#148#160'R'#239#248#245#181#181#206#203#212
-  +#230'Ij'#211'v'#10#8#130'5&SQBP'#162'8'#230#218#217#131'l5'#2#255'lF'#135'2'
-  +#155#177#212#230'~j3y'#250#250#194#140'S'#133#0#217'M'#192#10#20#157'!I'#148
-  +'_-'#229'?6'#23'R'#155#199'NU'#17#192#25'0b'#8#10'V@'#129#204#6'D'#16#221'iS'
-  +#224#248#254#10#139'K'#3'7'#12'jH'#130#167'_'#153#13'N'#192'e6'#171'5'#225
-  +#253'j'#196#239#182'Rp'#6'''jm'#228#27'@'#149#157#229#217'0`'#17'#XkQ'#192
-  +#197#221#168'Y0'#195#229'J)F'#21#140#8'"@'#142#141'h'#239'H'#16#17'T'#193#249
-  +'D'#127'\'#157#251#180#175#235#169#128#182'A'#0'e'#184'b'#153'=uh'#151#141#9
-  +'@'#17#6#29#168'*na'#238#228'4}'#186#244'p%Nm'#28'8'#250#21#212'C'#16#12'9'
-  +#137'Z'#215#179#201#171#231'&'#193#136'#'#167'V'#187'SKm'#246#238#178#1#4#176
-  +'f'#132#160#190#155'{'#16'u'#195#215#153#7#203'c`FA'#155#153#13#25#171#4'M'
-  +#26#149'ra'#240'/'#183'n'#0#134#16'0eZ'#0#0#0#0'IEND'#174'B`'#130
-]);
-LazarusResources.Add('laz_cut','PNG',[
-  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
-  +#0#0#2'LIDATx^'#141#145']H'#147'Q'#24#199#207'{'#222#175#237#221't'#219#187
-  +#169#175#205#181#173#220#135#161#229'\V'#204'V'#146#224'F'#237'"'#16#164'"'
-  +#161'"'#22#149'Tt!'#221#216'M'#12'*'#154#13#187#176#166#140#162#168#172#155#6
-  +#131'"'#144#209#135'^'#132#139#4#21'\nnZ'#195#4'kf-Z'#190';)'#24#12#217'l'#7
-  +#14#15#207#195#255#252#158#243#231#15#16'By'#175#225#172#215#212't'#249#201
-  +'='#238'X7'#153'O'#3#193':G'#201#22#239#178#215'm'#218#187#196'#"{'#206#29
-  +#191'E'#173'6'#235#3'H'#2'R'#138'"'#166'l'#185#210#255'f'#218'S='#213#219'5e'
-  +#131#5#1#8#8')'#169'X  p(Y'#221#172'?'#186#167'&'#200'I'#197#160#192#31#224
-  +'4+'#22#2#136#1#177#188#205#163'l'#183#153'_i96'#133#225#160#167' '#0#14#161
-  +#160#136#161#1#134'A'#203#25#155'9'#184#207'TY'#234#31#26#245#246#182#239#247
-  +#21'f'#1#135'$'#133#227#224#156'c'#231#205#147'v'#179#206#245'h'#224#174#191
-  +#179#213#149#173#201#25#205'U'#17#128'+'#245'HW'#192#19#153'K'#161'@('#142
-  +#218#220#254#224#127'ct'#23#19#234#199#134#138';uU['#222#249'T'#236'5'#9'C'
-  +#239'^L'#165#193#211#183#227'C'#207'?D'#29#185'l'#194#236#199'5'#198#170#23
-  +'F'#141#214')e'#132'zK'#237#214#14'S'#165#202',c('#240#7'#'#210#4'I'#214'*Ot'
-  +'c+'#218#156#22#250#141#170#190#225#230#6#228'a'#5#22#143#140'n'#25#181'7'
-  +#160#190#129#143#232#225#240'W'#20'u4'#162#145'&'#11#186'].9'#157#215#194#6
-  +'E'#201#193#248#236#236#179#243#243#191#134'8'#133#188'9#'#160#193'D"'#137'j'
-  +#175#180#128#193#177'q'#223#183#212#207'1'#189'Z'#221'q'#163#24'grZHg'#248
-  +#239#21'2vG'#192#164#127']'#175#211'9'#195#225#200#27#171#251'p(9'#191#176'8'
-  +#243'e'#206#25#153#158#190#207#8#133#26#156#164'Js'#2#194'S1W&'#195#203#151
-  +'!'#214#247'S1'#127'8'#22'o'#133'<'#250'D'#17#184#8'!P"'#18#139'6'#242'<'#255
-  +';'#179#180#244'#o'#140'n'#9#169#238#146'R'#250#235'"'#12'_'#233'{+'#216#11
-  +#19#7#26'Q'#176#190':2b'#179#162'~'#131#234#193#218#24#137'l'#216#197'd:'#158
-  +#221'/,$'#189#161#201#201'm'#155#185#242'C'#209#196#231#151'3'#137#196#165
-  +#181'!'#252#5'7}.'#162#17#228#21'3'#0#0#0#0'IEND'#174'B`'#130
-]);
-LazarusResources.Add('laz_paste','PNG',[
-  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
-  +#0#0#1#221'IDATx^}'#144#191'k'#20'Q'#20'F'#207#219#137'aC~'#176#232'BD'#9'j'
-  +''''#1'AvE'#216#149'T'#22'Z$'#146#128' '#136#152#194#128#176'['#7#196'&'#130
-  +#141#164#177'U'#176#16#4#193'B'#255#132#128#8')d'#183#211'B'#16'RX'#25'"'#18
-  +'C'#226#238#204'{'#247':'#23#134'a'#200','#30#248'x'#143#129#239#220#251#198
-  +#169'*'#198#203#181#11#243#192'W'#202#236'?|'#181'Sc4'#184#23#15#206'7'#128
-  +''''#192#210#212#201'Y'#238'>'#222#224'p'#239'3'#198'd'#253'*o6'#30#241#247
-  +#240#15#192'['#224'C*{O'#129#138'}'#188#190#188#178#184'x'#239'>'#215'.'#206
-  +#162#170#132#225#161#197#238',\'#154#227#230#202'-n,/'#221#6'^s'#140'1'#224
-  +#220#196#212#12#241#193'.^<;'#239#158#131'*'#160#236'i'#31'E'#25#236#254#160
-  +'Z?;'#14'XJ'#2#144#128'zO'#165'v'#26#9#30'U'#161#136#27#28#17#239#31'a'#140
-  +#20#168#8#226'='#146#12'-'#160#202#127')'#11'<'#18#146'|'#178#168#227#203#175
-  +#25#6'!'#2'5'#159#162'n'#156#159''''#230#233'v'#187#155'"B'#8#193#242'-'#19#4
-  +#196''''#16'L'#20#136'}'#133'h'#162#206#157#181#167#196'q'#204'1'#214'M'#24
-  +'EQ'#210#233't6s'#1'>A'#131#160'^'#144#160'i'#132#225'p'#200#246#246'6V'#200
-  +#200#239#173'V'#11#239'='#185#192#10#226'-vw'#182#30'F'#163#209#0'(I,'#5#129
-  +' I'#176#233'iLPA'#178'B'#191#223#183'BIb'#27#216#16#19'd'#211'M`g'#246#4#130
-  +#21'J'#27#20#201'7'#192#10#137'd'#255' '#160#193'!'#206'c'#244'z='#10#228#178
-  +'v'#187#157'o'#240')'#137#227#133#201'3s'#168'h'#26'a,'#129#232#247#180'M'
-  +#165#217'l'#150#202#217#153#11#158'}'#220#218#154#6'.'#147'a'#222#131#218#21
-  +#170#213'*'#206'9F'#17'E'#145#9'p'#163#222#182#186#186'ZI'#237#235'iN'#165
-  +#161#24#17')'#230#251'?EEbPXc'#222'>'#0#0#0#0'IEND'#174'B`'#130
-]);
diff --git a/ideintf/images/oi_options.png b/ideintf/images/oi_options.png
new file mode 100644
index 0000000000..37ef327240
Binary files /dev/null and b/ideintf/images/oi_options.png differ
diff --git a/ideintf/objectinspector.pp b/ideintf/objectinspector.pp
index 2da0b573d8..882b07dba8 100644
--- a/ideintf/objectinspector.pp
+++ b/ideintf/objectinspector.pp
@@ -3905,7 +3905,7 @@ begin
      ,@OnShowComponentTreePopupMenuItemClick,FShowComponentTree,true,true);
   ShowComponentTreePopupMenuItem.ShowAlwaysCheckable:=true;
   AddPopupMenuItem(ShowOptionsPopupMenuItem,nil
-     ,'ShowOptionsPopupMenuItem',oisOptions,'', 'menu_environment_options'
+     ,'ShowOptionsPopupMenuItem',oisOptions,'', 'oi_options'
      ,@OnShowOptionsPopupMenuItemClick,false,true,FOnShowOptions<>nil);
 
   // combobox at top (filled with available persistents)
diff --git a/images/laz_images.lrs b/images/laz_images.lrs
index dfe7c4ba87..d0c301b437 100644
--- a/images/laz_images.lrs
+++ b/images/laz_images.lrs
@@ -9482,24 +9482,6 @@ LazarusResources.Add('anchor_top_bottom','PNG',[
   +'R'#162','#203#192'O'#232#251'#'#132#255'*'#175'_'#229#23')'#217#254'{'#173#8
   +'i'#157#0#0#0#0'IEND'#174'B`'#130
 ]);
-LazarusResources.Add('delete_selection','PNG',[
-  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
-  +#0#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167
-  +#147#0#0#1'>IDAT8'#203#165#147'?S'#2'1'#16#197#127'{'#216'p9'#176#2#239#171
-  +'A-'#245'i'#147#138'/@'#26#165#166#215'V{j'#173#209#15#1#204#208'('#127','
-  +#159#197'qw'#220#12'7:'#186'3'#153#205'&//ow'#19#147#196#127','#162#127'%'
-  +#156#19'f'#2#8'!('#132#240#235#185#169#223#23#251#29#236#15#224'\>'#214'kk'
-  +#188'2'#203#148#227'b'#216#237'1I'#224#18#241'u'#128'8'#134#196#129'Kr'#192
-  +#219'{E4'#24#168#188'`:-'#215#173'V'#131'N'#167#2#185#24'b'#7'Ir'#244'1<<'
-  +#150#7'C'#8#242#222'[T'#4#0'l'#183#198'ju'#4#25#24' '#229#254#228'p'#189#136
-  +'Mf'#5#137#193#153'Fy'#239#173'$('#2#0#210'4'#135#171'd'#201#221'pX'#163')T'
-  +#215'S'#232'vUJ7'#131#215#23'c>'#183'<'#6'F#5'#167#208'j'#213'7'#23#139'J'
-  +#213#211#179#149'jnoTS-'#9#181#219'R'#20'I'#157#142#148#166#146#196#217'1'
-  +#186#150#178'L'#146#152'L&'#146'DD'#175#167'Z'#229#150#203#230'G'#164'c*'#227
-  +#177#170#20't'#178'c?'#252#139#217#172#144'}'#218#5'U'#149#254#248#180#31#127
-  +#207#221#189'aU'#225'/'#216'l'#172#8#252'IG'#188#247#214'8'#239'^r'#254')'
-  +#255#193#190#1#217''''#180''''#199'E'#156#152#0#0#0#0'IEND'#174'B`'#130
-]);
 LazarusResources.Add('align','PNG',[
   #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
   +#0#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#223#0#223#0#223'b_'#238#191#0
diff --git a/images/laz_images_list.txt b/images/laz_images_list.txt
index f6d8899235..7ba9d47a66 100644
--- a/images/laz_images_list.txt
+++ b/images/laz_images_list.txt
@@ -161,7 +161,6 @@ designer/anchor_left_right.png
 designer/anchor_right.png
 designer/anchor_top.png
 designer/anchor_top_bottom.png
-designer/delete_selection.png
 designer/align.png
 designer/mirror_horizontal.png
 designer/mirror_vertical.png