diff --git a/plinth/locale/django.pot b/plinth/locale/django.pot
index c332e0274..05220d4a7 100644
--- a/plinth/locale/django.pot
+++ b/plinth/locale/django.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-18 12:49+0100\n"
+"POT-Creation-Date: 2020-11-18 14:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -691,36 +691,31 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: plinth/modules/bepasty/templates/bepasty.html:41
-#, python-format
-msgid "%(comment)s"
-msgstr ""
-
-#: plinth/modules/bepasty/views.py:22
+#: plinth/modules/bepasty/views.py:23
 msgid "admin"
 msgstr ""
 
-#: plinth/modules/bepasty/views.py:23
+#: plinth/modules/bepasty/views.py:24
 msgid "editor"
 msgstr ""
 
-#: plinth/modules/bepasty/views.py:24
+#: plinth/modules/bepasty/views.py:25
 msgid "viewer"
 msgstr ""
 
-#: plinth/modules/bepasty/views.py:48
+#: plinth/modules/bepasty/views.py:50
 msgid "Read"
 msgstr ""
 
-#: plinth/modules/bepasty/views.py:49
+#: plinth/modules/bepasty/views.py:51
 msgid "Create"
 msgstr ""
 
-#: plinth/modules/bepasty/views.py:50
+#: plinth/modules/bepasty/views.py:52
 msgid "List"
 msgstr ""
 
-#: plinth/modules/bepasty/views.py:51
+#: plinth/modules/bepasty/views.py:53
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:91
 #: plinth/modules/networks/templates/connection_show.html:48
 #: plinth/modules/samba/templates/samba.html:127
@@ -731,31 +726,31 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: plinth/modules/bepasty/views.py:52
+#: plinth/modules/bepasty/views.py:54
 msgid "Admin"
 msgstr ""
 
-#: plinth/modules/bepasty/views.py:89 plinth/modules/searx/views.py:38
+#: plinth/modules/bepasty/views.py:91 plinth/modules/searx/views.py:38
 #: plinth/modules/searx/views.py:49 plinth/modules/tor/views.py:130
 #: plinth/modules/tor/views.py:157
 msgid "Configuration updated."
 msgstr ""
 
-#: plinth/modules/bepasty/views.py:92 plinth/modules/gitweb/views.py:117
+#: plinth/modules/bepasty/views.py:94 plinth/modules/gitweb/views.py:117
 #: plinth/modules/searx/views.py:41 plinth/modules/searx/views.py:52
 #: plinth/modules/tor/views.py:159
 msgid "An error occurred during configuration."
 msgstr ""
 
-#: plinth/modules/bepasty/views.py:103
+#: plinth/modules/bepasty/views.py:105
 msgid "Password added."
 msgstr ""
 
-#: plinth/modules/bepasty/views.py:108
+#: plinth/modules/bepasty/views.py:110
 msgid "Add Password"
 msgstr ""
 
-#: plinth/modules/bepasty/views.py:125
+#: plinth/modules/bepasty/views.py:127
 msgid "Password deleted."
 msgstr ""
 
@@ -998,7 +993,7 @@ msgstr ""
 #: plinth/modules/config/__init__.py:57 plinth/modules/dynamicdns/views.py:29
 #: plinth/modules/names/templates/names.html:29
 #: plinth/modules/names/templates/names.html:43
-#: plinth/modules/snapshot/views.py:28
+#: plinth/modules/snapshot/views.py:37
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:24
 msgid "Configure"
 msgstr ""
@@ -5333,7 +5328,7 @@ msgstr ""
 
 #: plinth/modules/snapshot/templates/snapshot_delete_selected.html:40
 #: plinth/modules/snapshot/templates/snapshot_manage.html:22
-#: plinth/modules/snapshot/views.py:189
+#: plinth/modules/snapshot/views.py:198
 msgid "Delete Snapshots"
 msgstr ""
 
@@ -5381,41 +5376,53 @@ msgstr ""
 msgid "Rollback to Snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:32
+#: plinth/modules/snapshot/views.py:28
+msgid "manually created"
+msgstr ""
+
+#: plinth/modules/snapshot/views.py:29
+msgid "timeline"
+msgstr ""
+
+#: plinth/modules/snapshot/views.py:30
+msgid "apt"
+msgstr ""
+
+#: plinth/modules/snapshot/views.py:41
 msgid "Manage Snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:81
+#: plinth/modules/snapshot/views.py:90
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:144
+#: plinth/modules/snapshot/views.py:153
 msgid "Storage snapshots configuration updated"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:148 plinth/modules/tor/views.py:60
+#: plinth/modules/snapshot/views.py:157 plinth/modules/tor/views.py:60
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:176
+#: plinth/modules/snapshot/views.py:185
 msgid "Deleted selected snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:181
+#: plinth/modules/snapshot/views.py:190
 msgid "Snapshot is currently in use. Please try again later."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:200
+#: plinth/modules/snapshot/views.py:209
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:203
+#: plinth/modules/snapshot/views.py:212
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:215
+#: plinth/modules/snapshot/views.py:224
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/modules/snapshot/templates/snapshot_manage.html b/plinth/modules/snapshot/templates/snapshot_manage.html
index e15842e21..48f5eaaee 100644
--- a/plinth/modules/snapshot/templates/snapshot_manage.html
+++ b/plinth/modules/snapshot/templates/snapshot_manage.html
@@ -29,8 +29,8 @@
           <th>{% trans "Number" %}</th>
           <th>{% trans "Date" %}</th>
           <th>{% trans "Description" %}</th>
-          <th>{% trans "Rollback" %}</th>
-          <th><input type="checkbox" id="select-all"></th>
+          <th class="centered-column">{% trans "Rollback" %}</th>
+          <th class="centered-column"><input type="checkbox" id="select-all"></th>
         </thead>
         <tbody>
           {% for snapshot in snapshots %}
@@ -49,8 +49,8 @@
                 {% endif %}
               </td>
               <td>{{ snapshot.date }}</td>
-              <td>{{ snapshot.description }}</td>
-              <td>
+              <td>{% trans snapshot.description %}</td>
+              <td class="centered-column">
                 <a href="{% url 'snapshot:rollback' snapshot.number %}"
                    class="btn btn-default btn-sm" role="button"
                    title="{% blocktrans trimmed with number=snapshot.number %}
@@ -60,7 +60,7 @@
                         aria-hidden="true"></span>
                 </a>
               </td>
-              <td>
+              <td class="centered-column">
                 {% if not snapshot.is_default and not snapshot.is_active %}
                   <input type="checkbox" name="snapshot_list" value={{ snapshot.number }} />
                 {% endif %}
diff --git a/plinth/modules/snapshot/views.py b/plinth/modules/snapshot/views.py
index 03ee06804..d68934d92 100644
--- a/plinth/modules/snapshot/views.py
+++ b/plinth/modules/snapshot/views.py
@@ -22,6 +22,15 @@ from plinth.modules import storage
 from . import get_configuration
 from .forms import SnapshotForm
 
+
+# i18n for snapshot descriptions
+SNAPSHOT_DESCRIPTION_STRINGS = {
+    'manually created': ugettext_lazy('manually created'),
+    'timeline': ugettext_lazy('timeline'),
+    'apt': ugettext_lazy('apt'),
+}
+
+
 subsubmenu = [
     {
         'url': reverse_lazy('snapshot:index'),
diff --git a/static/themes/default/css/main.css b/static/themes/default/css/main.css
index b4ba60cec..5bb5a5f6b 100644
--- a/static/themes/default/css/main.css
+++ b/static/themes/default/css/main.css
@@ -180,6 +180,10 @@ body {
     text-align: center;
 }
 
+.centered-column {
+    text-align: center;
+}
+
 /* Sticky footer styles
 -------------------------------------------------- */
 .footer-logo {