diff --git a/mo/web/org_score.py b/mo/web/org_score.py
index 07e34f7f1e5e6712180755f63b649172c0001871..f926c16d9e60e7a60675843f6b4397073fc2293f 100644
--- a/mo/web/org_score.py
+++ b/mo/web/org_score.py
@@ -200,7 +200,7 @@ def org_score(round_id: Optional[int] = None, hier_id: Optional[int] = None, ct_
                     task.code
             )
             if ctx.rights.can_edit_points():
-                title += ' <a href="{}" title="Editovat body" class="icon">✎</a>'.format(
+                title += ' <a href="{}" title="Editovat body" class="btn btn-xs btn-default"><span class="glyphicon glyphicon-pencil"></span></a>'.format(
                     url_for('org_contest_task_points', ct_id=local_ct_id, task_id=task.task_id),
                 )
         columns.append(Column(key=f'task_{task.task_id}', name=task.code, title=title))
diff --git a/mo/web/templates/org_contest_solutions.html b/mo/web/templates/org_contest_solutions.html
index 44ecc07e0fcf7326041e1dcb69a3b1d44491948b..5c902e50e3d9b4b9a4c120ccc4c57536fc55f258 100644
--- a/mo/web/templates/org_contest_solutions.html
+++ b/mo/web/templates/org_contest_solutions.html
@@ -50,7 +50,7 @@ Odkazem v záhlaví se lze dostat na podrobný výpis odevzdání všech účast
 			{% for task in tasks[4*i:4*(i+1)] %}<th colspan=4>
 				<a href="{{ ctx.url_for('org_contest_task', task_id=task.task_id) }}">{{ task.code }}</a>
 				{% if rights.can_edit_points() %}
-				<a title="Editovat body" href="{{ ctx.url_for('org_contest_task_points', task_id=task.task_id) }}" class="icon pull-right">✎</a>
+				<a class="btn btn-xs btn-default" href="{{ ctx.url_for('org_contest_task_points', task_id=task.task_id) }}"><span class="glyphicon glyphicon-pencil"></span> Zadat body</a>
 				{% endif %}
 			{% endfor %}
 			<th rowspan=2>Body celkem
@@ -117,11 +117,18 @@ Odkazem v záhlaví se lze dostat na podrobný výpis odevzdání všech účast
 	<tfoot>
 		<tr><td><td>
 		{% for task in tasks[4*i:4*(i+1)] %}
-			<td colspan=4>
-				<a class='btn btn-xs btn-primary' href="{{ ctx.url_for('org_generic_batch_download', task_id=task.task_id) }}"><span class="glyphicon glyphicon-cloud-download"></span> Stáhnout</a>
+			<td>
+				<a class='btn btn-xs btn-default' href="{{ ctx.url_for('org_generic_batch_download', task_id=task.task_id) }}" title="Stáhnout ZIP řešení úlohy {{ task.code }}"><span class="glyphicon glyphicon-cloud-download"></span></a>
+			<td>
 			{% if rights.can_upload_feedback() %}
-				<a class='btn btn-xs btn-primary' href="{{ ctx.url_for('org_generic_batch_upload', task_id=task.task_id) }}">Nahrát opravy</a>
+				<a class='btn btn-xs btn-default' href="{{ ctx.url_for('org_generic_batch_upload', task_id=task.task_id) }}" title="Nahrát ZIP opravených řešení úlohy {{ task.code }}"><span class="glyphicon glyphicon-cloud-upload"></span></a>
 			{% endif %}
+			<td>
+				{% if rights.can_edit_points() %}
+				<a class="btn btn-xs btn-default" href="{{ ctx.url_for('org_contest_task_points', task_id=task.task_id) }}" title="Editovat body k úloze {{ task.code }}"><span class="glyphicon glyphicon-pencil"></span></a>
+				{% endif %}
+			<td>
+				<a class="btn btn-xs btn-primary" href="{{ ctx.url_for('org_contest_task', task_id=task.task_id) }}" title="Podrobný výpis odevzdaných řešení k úloze {{ task.code }}"><span class="glyphicon glyphicon-search"></span></a>
 		{% endfor %}
 		<td>
 	</tfoot>
diff --git a/mo/web/templates/org_score.html b/mo/web/templates/org_score.html
index 962fd8a99a8d6430716777ff7509b28878f0ce0f..27271744eec6904641798a87f8965f4fd14b19e0 100644
--- a/mo/web/templates/org_score.html
+++ b/mo/web/templates/org_score.html
@@ -26,9 +26,8 @@ Výsledky {{ round.name|round_genitive|lower }}{% if public %} {{ round.year }}.
 {% endblock %}
 {% block body %}
 
-<p>Export pod tabulkou obsahuje sloupce navíc.
 {% if contest and contest.state == RoundState.grading or round.state == RoundState.grading %}
-Rozkliknutím bodů se lze dostat na detail daného řešení.
+<p>Rozkliknutím bodů se lze dostat na detail daného řešení.
 {% endif %}
 
 {% set master = round.master %}
diff --git a/mo/web/templates/parts/org_solution_table.html b/mo/web/templates/parts/org_solution_table.html
index 89daf385e55326923d6c741a9e4fee91fb087ebc..a138bab10d4a385b04075e95222ee8bc62371134 100644
--- a/mo/web/templates/parts/org_solution_table.html
+++ b/mo/web/templates/parts/org_solution_table.html
@@ -22,7 +22,7 @@ finální (ve výchozím stavu poslední nahrané).{% elif rights.can_upload_sol
 			<th>Poznámky
 			<th>Přidělené body
 				{% if not for_user and not site and rights.can_edit_points() and not points_form %}
-				<a title="Editovat body" href="{{ ctx.url_for('org_contest_task_points') }}" class="icon pull-right">✎</a>
+				<a class="btn btn-xs btn-default" title="Editovat body" href="{{ ctx.url_for('org_contest_task_points') }}"><span class="glyphicon glyphicon-pencil"></span></a>
 				{% endif %}
 			<th>Akce
 		</tr>