diff --git a/hooks.py b/hooks.py
index 52e1b2b..3247e4a 100644
--- a/hooks.py
+++ b/hooks.py
@@ -2,6 +2,7 @@
 
 from plugins.typesetting import models
 
+
 def author_tasks(context):
     request = context['request']
     article = context['article']
diff --git a/templates/typesetting/elements/typesetter/galleys.html b/templates/typesetting/elements/typesetter/galleys.html
index 501c8ae..1f7d085 100644
--- a/templates/typesetting/elements/typesetter/galleys.html
+++ b/templates/typesetting/elements/typesetter/galleys.html
@@ -27,9 +27,9 @@
             <td>{{ galley.file.date_modified|date:"Y-m-d G:i" }}</td>
             <td>
                 <a class="button small" href="{% url 'typesetting_edit_galley' article.pk galley.pk %}?return={% url 'typesetting_assignment' assignment.pk %}">Edit</a></td>
-            <td>{% if can_view_file_flag %}
-                <a href="{% url 'article_file_download' 'id' article.pk galley.file.pk %}"><i
-                        class="fa fa-download">&nbsp;</i></a>{% endif %}
+            <td>
+                <a href="{% url 'typesetting_typesetter_download_file' assignment.pk galley.file.pk %}"><i
+                        class="fa fa-download">&nbsp;</i></a>
             </td>
             <td>
                 <a href="{% url 'typesetting_preview_galley' article_id=article.pk galley_id=galley.pk assignment_id=assignment.pk %}"
diff --git a/views.py b/views.py
index c4acddb..9b37494 100644
--- a/views.py
+++ b/views.py
@@ -741,6 +741,9 @@ def typesetting_typesetter_download_file(request, assignment_id, file_id):
         or file.pk in assignment.round.article.supplementary_files.values_list(
             'file__pk', flat=True,
             )
+        or file.pk in assignment.round.article.galley_set.values_list(
+                'file__pk', flat=True,
+            )
     ):
         return files.serve_any_file(
             request,
@@ -801,6 +804,7 @@ def typesetting_delete_galley(request, galley_id):
         )
     )
 
+
 @decorators.has_journal
 @decorators.typesetter_user_required
 def typesetting_assignment(request, assignment_id):
@@ -1360,24 +1364,36 @@ def typesetting_proofing_download(request, article_id, assignment_id, file_id):
         return redirect(request.META.get('HTTP_REFERER'))
 
 
-@security.proofreader_for_article_required
+@security.can_preview_typesetting_article
 def preview_figure(
         request,
         galley_id,
         file_name,
         assignment_id=None,
-        article_id=None
+        article_id=None,
 ):
+
     if assignment_id:
-        assignment = get_object_or_404(
-            models.GalleyProofing,
-            pk=assignment_id,
-        )
-        galley = get_object_or_404(
-            core_models.Galley,
-            pk=galley_id,
-            article_id=assignment.round.article.pk,
-        )
+        try:
+            assignment = models.TypesettingAssignment.objects.get(
+                pk=assignment_id,
+                typesetter=request.user,
+            )
+            galley = core_models.Galley.objects.get(
+                pk=galley_id,
+                article_id=assignment.round.article.pk,
+            )
+        except (models.TypesettingAssignment.DoesNotExist, core_models.Galley.DoesNotExist):
+            assignment = get_object_or_404(
+                models.GalleyProofing,
+                pk=assignment_id,
+                proofreader=request.user
+            )
+            galley = get_object_or_404(
+                core_models.Galley,
+                pk=galley_id,
+                article_id=assignment.round.article.pk,
+            )
     elif article_id and request.user.has_an_editor_role(request):
         article = get_object_or_404(
             submission_models.Article,
@@ -1458,6 +1474,5 @@ def mint_supp_doi(request, supp_file_id):
                 'Minted DOI for supplementary file #%d' % supp_file.pk,
             )
 
-
     return redirect(request.META.get('HTTP_REFERER'))