diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini
index 6ce054e19c..77a5546524 100644
--- a/data/common/File Managers/icons.ini
+++ b/data/common/File Managers/icons.ini
@@ -1,21 +1,3 @@
-[drives16]
-r=58
-f=5
-t=51
-h=50
-b=50
-u=57
-c=19
-
-[drives32]
-r=49
-f=3
-t=36
-h=50
-b=50
-u=50
-c=50
-
[icons16]
=0
=1
@@ -266,3 +248,21 @@ mgb=121
txt=122
rtf=122
docx=122
+
+[drives16]
+r=58
+f=5
+t=51
+h=50
+b=50
+u=57
+c=19
+
+[drives32]
+r=49
+f=3
+t=36
+h=50
+b=50
+u=50
+c=50
\ No newline at end of file
diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini
index 3699946175..f519ec0abe 100644
--- a/data/common/settings/assoc.ini
+++ b/data/common/settings/assoc.ini
@@ -88,8 +88,8 @@ next=$CodeEdit
kf=/sys/KF_VIEW
-txt=$Quark
-log=$Quark
+txt=$CodeEdit
+log=$CodeEdit
ini=$CodeEdit
c=$CodeEdit
diff --git a/data/common/settings/taskbar.ini b/data/common/settings/taskbar.ini
index 450730c5f6..aeb1b07688 100644
--- a/data/common/settings/taskbar.ini
+++ b/data/common/settings/taskbar.ini
@@ -8,7 +8,7 @@ ButtonBottOffset=3
[Flags]
SoftenUp=1
SoftenDown=1
-MinLeftButton=0
+MinLeftButton=1
MinRightButton=0
MenuButton=1
RunApplButtons=1
@@ -33,7 +33,7 @@ AltTab=255,128,0
End=/sys/END
Menu=/sys/@MENU
Run=/sys/RUN
-PrnScr=/sys/SCRSHOOT
+PrnScr=/sys/easyshot
Clock=/sys/CALENDAR
CpuUsage=/sys/GMON
MouseEmul=/sys/MOUSEMUL
diff --git a/programs/media/kiv/trunk/kiv.asm b/programs/media/kiv/trunk/kiv.asm
index d126d5dc64..34a2d536b9 100644
--- a/programs/media/kiv/trunk/kiv.asm
+++ b/programs/media/kiv/trunk/kiv.asm
@@ -1235,11 +1235,11 @@ proc draw_toolbar uses ebx esi edi
mcall
mov ebx, [toolbar_abs_left]
add ebx, [toolbar.width]
- sub ebx, 25*5+10
+ sub ebx, 25*4+10
shl ebx, 16
add ebx, [toolbar_abs_left]
add ebx, [toolbar.width]
- sub ebx, 25*5+10
+ sub ebx, 25*4+10
mcall
mov ebx, [toolbar_abs_left]
@@ -1261,7 +1261,7 @@ proc draw_toolbar uses ebx esi edi
mcall , , , 'scl'+40000000h
mov ebx, [toolbar_abs_left]
add ebx, [toolbar.width]
- sub ebx, 25*5+10
+ sub ebx, 25*4+10
add ebx, 5
shl ebx, 16
mov bl, 21
@@ -1296,7 +1296,7 @@ proc draw_toolbar uses ebx esi edi
call draw_scale_button
mov edx, [client_abs_left]
add edx, [client.width]
- sub edx, 25*5+4
+ sub edx, 25*4+4
shl edx, 16
add edx, [client_abs_top]
add edx, 5
@@ -1304,11 +1304,9 @@ proc draw_toolbar uses ebx esi edi
add edx, 25*65536
mcall , buttons+flipvertbtn*20
add edx, 30*65536
- mcall , buttons+rotcwbtn*20
- add edx, 25*65536
mcall , buttons+rotccwbtn*20
add edx, 25*65536
- mcall , buttons+rot180btn*20
+ mcall , buttons+rotcwbtn*20
.quit:
ret
@@ -1624,9 +1622,11 @@ endp
; fills window_header with window title
-; window title is generated as '[k/n] - Kolibri Image Viewer'
+; window title is generated as '[k/n] (WxH) - Kolibri Image Viewer'
; n = total files in dir
; k = current file index
+; W = current image width
+; H = current image height
proc generate_window_header
push eax ebx esi edi
mov esi, [last_name_component]
@@ -1661,6 +1661,23 @@ proc generate_window_header
pop edi esi ebx eax
ret
@@:
+ ; add size
+ mov word[edi], ' ('
+ add edi, 2
+
+ mov ebx, [orig_image]
+ mov eax, [ebx+Image.Width]
+ call bin2dec
+
+ mov byte[edi], 'x'
+ inc edi
+
+ mov eax, [ebx+Image.Height]
+ call bin2dec
+
+ mov byte[edi], ')'
+ inc edi
+
mov esi, s_header
@@:
lodsb
diff --git a/programs/system/rdsave/trunk/rdsave.asm b/programs/system/rdsave/trunk/rdsave.asm
index c2d16a8894..754209409f 100644
--- a/programs/system/rdsave/trunk/rdsave.asm
+++ b/programs/system/rdsave/trunk/rdsave.asm
@@ -338,9 +338,13 @@ draw_window:
mcall 48,3,sc,sizeof.system_colors
mcall 12,1
- mov edx,[sc.work]
- or edx,0x34000000
- mcall 0,<200,400>,<200,130>, , ,title
+ mcall 48,4
+ mov ecx,200*65536+111
+ add ecx,eax
+
+ mov edx,[sc.work]
+ or edx,0x34000000
+ mcall 0,<200,400>,, , ,title
;buttons
mcall 8,<198,70>,<68,20>,1,[sc.work_button]