diff --git a/yomi_base/img/information.png b/yomi_base/img/icon_action_about.png
similarity index 100%
rename from yomi_base/img/information.png
rename to yomi_base/img/icon_action_about.png
diff --git a/yomi_base/img/page_copy.png b/yomi_base/img/icon_action_copy_definition.png
similarity index 100%
rename from yomi_base/img/page_copy.png
rename to yomi_base/img/icon_action_copy_definition.png
diff --git a/yomi_base/img/email.png b/yomi_base/img/icon_action_feedback.png
similarity index 100%
rename from yomi_base/img/email.png
rename to yomi_base/img/icon_action_feedback.png
diff --git a/yomi_base/img/find.png b/yomi_base/img/icon_action_find.png
similarity index 100%
rename from yomi_base/img/find.png
rename to yomi_base/img/icon_action_find.png
diff --git a/yomi_base/img/world_go.png b/yomi_base/img/icon_action_homepage.png
similarity index 100%
rename from yomi_base/img/world_go.png
rename to yomi_base/img/icon_action_homepage.png
diff --git a/yomi_base/img/folder_page.png b/yomi_base/img/icon_action_open.png
similarity index 100%
rename from yomi_base/img/folder_page.png
rename to yomi_base/img/icon_action_open.png
diff --git a/yomi_base/img/wrench.png b/yomi_base/img/icon_action_preferences.png
similarity index 100%
rename from yomi_base/img/wrench.png
rename to yomi_base/img/icon_action_preferences.png
diff --git a/yomi_base/img/cross.png b/yomi_base/img/icon_action_quit.png
similarity index 100%
rename from yomi_base/img/cross.png
rename to yomi_base/img/icon_action_quit.png
diff --git a/yomi_base/img/magnifier_zoom_in.png b/yomi_base/img/icon_action_zoom_in.png
similarity index 100%
rename from yomi_base/img/magnifier_zoom_in.png
rename to yomi_base/img/icon_action_zoom_in.png
diff --git a/yomi_base/img/magifier_zoom_out.png b/yomi_base/img/icon_action_zoom_out.png
similarity index 100%
rename from yomi_base/img/magifier_zoom_out.png
rename to yomi_base/img/icon_action_zoom_out.png
diff --git a/yomi_base/img/magnifier.png b/yomi_base/img/icon_action_zoom_reset.png
similarity index 100%
rename from yomi_base/img/magnifier.png
rename to yomi_base/img/icon_action_zoom_reset.png
diff --git a/yomi_base/img/add.png b/yomi_base/img/icon_add_expression.png
similarity index 100%
rename from yomi_base/img/add.png
rename to yomi_base/img/icon_add_expression.png
diff --git a/yomi_base/img/bullet_add.png b/yomi_base/img/icon_add_reading.png
similarity index 100%
rename from yomi_base/img/bullet_add.png
rename to yomi_base/img/icon_add_reading.png
diff --git a/yomi_base/img/logo32x32.png b/yomi_base/img/icon_logo_32.png
similarity index 100%
rename from yomi_base/img/logo32x32.png
rename to yomi_base/img/icon_logo_32.png
diff --git a/yomi_base/img/logo64x64.png b/yomi_base/img/icon_logo_64.png
similarity index 100%
rename from yomi_base/img/logo64x64.png
rename to yomi_base/img/icon_logo_64.png
diff --git a/yomi_base/img/logo9x9.png b/yomi_base/img/icon_logo_9.png
similarity index 100%
rename from yomi_base/img/logo9x9.png
rename to yomi_base/img/icon_logo_9.png
diff --git a/yomi_base/img/tick.png b/yomi_base/img/tick.png
deleted file mode 100644
index a9925a0..0000000
Binary files a/yomi_base/img/tick.png and /dev/null differ
diff --git a/yomi_base/reader.py b/yomi_base/reader.py
index 24173f9..268f889 100644
--- a/yomi_base/reader.py
+++ b/yomi_base/reader.py
@@ -251,7 +251,7 @@ class MainWindowReader(QtGui.QMainWindow):
         command, index = unicode(url.toString()).split(':')
         definition = self.state.definitions[int(index)]
 
-        if command == 'addFactExpression':
+        if command == 'addExpression':
             markup = reader_util.buildFactMarkupExpression(
                 definition.expression,
                 definition.reading,
@@ -259,7 +259,7 @@ class MainWindowReader(QtGui.QMainWindow):
                 definition.sentence
             )
             self.ankiAddFact(markup)
-        if command == 'addFactReading':
+        if command == 'addReading':
             markup = reader_util.buildFactMarkupReading(
                 definition.reading,
                 definition.glossary,
diff --git a/yomi_base/reader_util.py b/yomi_base/reader_util.py
index 3b0de77..9f20dbc 100644
--- a/yomi_base/reader_util.py
+++ b/yomi_base/reader_util.py
@@ -152,9 +152,9 @@ def buildDefinitionHtml(definition, factIndex, factQuery):
     links = '<a href = "copyDefinition:{0}"><img src = "{1}" align = "right"/></a>'.format(factIndex, buildResPath('img/page_copy.png'))
     if factQuery:
         if factQuery(buildFactMarkupExpression(definition.expression, definition.reading, definition.glossary)):
-            links += '<a href = "addFactExpression:{0}"><img src = "{1}" align = "right"/></a>'.format(factIndex, buildResPath('img/add.png'))
+            links += '<a href = "addExpression:{0}"><img src = "{1}" align = "right"/></a>'.format(factIndex, buildResPath('img/icon_add_expression.png'))
         if factQuery(buildFactMarkupReading(definition.reading, definition.glossary)):
-            links += '<a href = "addFactReading:{0}"><img src = "{1}" align = "right"/></a>'.format(factIndex, buildResPath('img/bullet_add.png'))
+            links += '<a href = "addReading:{0}"><img src = "{1}" align = "right"/></a>'.format(factIndex, buildResPath('img/icon_add_reading.png'))
 
     html = u"""
         <span class = "links">{0}</span>
diff --git a/yomi_base/ui/about.ui b/yomi_base/ui/about.ui
index c0538fc..9d31f84 100644
--- a/yomi_base/ui/about.ui
+++ b/yomi_base/ui/about.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>700</width>
+    <width>650</width>
     <height>400</height>
    </rect>
   </property>
@@ -22,7 +22,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap>../img/logo64x64.png</pixmap>
+        <pixmap>../img/icon_logo_64.png</pixmap>
        </property>
       </widget>
      </item>
diff --git a/yomi_base/ui/reader.ui b/yomi_base/ui/reader.ui
index a9b23ec..47c7c11 100644
--- a/yomi_base/ui/reader.ui
+++ b/yomi_base/ui/reader.ui
@@ -18,7 +18,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>../img/logo32x32.png</normaloff>../img/logo32x32.png</iconset>
+    <normaloff>../img/icon_logo_32.png</normaloff>../img/icon_logo_32.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
@@ -40,7 +40,7 @@
      <x>0</x>
      <y>0</y>
      <width>900</width>
-     <height>23</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -216,7 +216,7 @@
   <action name="actionOpen">
    <property name="icon">
     <iconset>
-     <normaloff>../img/folder_page.png</normaloff>../img/folder_page.png</iconset>
+     <normaloff>../img/icon_action_open.png</normaloff>../img/icon_action_open.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Open...</string>
@@ -234,7 +234,7 @@
   <action name="actionQuit">
    <property name="icon">
     <iconset>
-     <normaloff>../img/cross.png</normaloff>../img/cross.png</iconset>
+     <normaloff>../img/icon_action_quit.png</normaloff>../img/icon_action_quit.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Quit</string>
@@ -252,7 +252,7 @@
   <action name="actionPreferences">
    <property name="icon">
     <iconset>
-     <normaloff>../img/wrench.png</normaloff>../img/wrench.png</iconset>
+     <normaloff>../img/icon_action_preferences.png</normaloff>../img/icon_action_preferences.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Preferences...</string>
@@ -267,7 +267,7 @@
   <action name="actionAbout">
    <property name="icon">
     <iconset>
-     <normaloff>../img/information.png</normaloff>../img/information.png</iconset>
+     <normaloff>../img/icon_action_about.png</normaloff>../img/icon_action_about.png</iconset>
    </property>
    <property name="text">
     <string>&amp;About...</string>
@@ -285,7 +285,7 @@
   <action name="actionZoomIn">
    <property name="icon">
     <iconset>
-     <normaloff>../img/magnifier_zoom_in.png</normaloff>../img/magnifier_zoom_in.png</iconset>
+     <normaloff>../img/icon_action_zoom_in.png</normaloff>../img/icon_action_zoom_in.png</iconset>
    </property>
    <property name="text">
     <string>Zoom &amp;in</string>
@@ -300,7 +300,7 @@
   <action name="actionZoomOut">
    <property name="icon">
     <iconset>
-     <normaloff>../img/magifier_zoom_out.png</normaloff>../img/magifier_zoom_out.png</iconset>
+     <normaloff>../img/icon_action_zoom_out.png</normaloff>../img/icon_action_zoom_out.png</iconset>
    </property>
    <property name="text">
     <string>Zoom &amp;out</string>
@@ -315,7 +315,7 @@
   <action name="actionZoomReset">
    <property name="icon">
     <iconset>
-     <normaloff>../img/magnifier.png</normaloff>../img/magnifier.png</iconset>
+     <normaloff>../img/icon_action_zoom_reset.png</normaloff>../img/icon_action_zoom_reset.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Reset</string>
@@ -333,7 +333,7 @@
   <action name="actionFind">
    <property name="icon">
     <iconset>
-     <normaloff>../img/find.png</normaloff>../img/find.png</iconset>
+     <normaloff>../img/icon_action_find.png</normaloff>../img/icon_action_find.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Find...</string>
@@ -387,7 +387,7 @@
   <action name="actionCopyDefinition">
    <property name="icon">
     <iconset>
-     <normaloff>../img/page_copy.png</normaloff>../img/page_copy.png</iconset>
+     <normaloff>../img/icon_action_copy_definition.png</normaloff>../img/icon_action_copy_definition.png</iconset>
    </property>
    <property name="text">
     <string>Copy &amp;definition</string>
@@ -407,7 +407,7 @@
   <action name="actionHomepage">
    <property name="icon">
     <iconset>
-     <normaloff>../img/world_go.png</normaloff>../img/world_go.png</iconset>
+     <normaloff>../img/icon_action_homepage.png</normaloff>../img/icon_action_homepage.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Homepage...</string>
@@ -438,7 +438,7 @@
   <action name="actionFeedback">
    <property name="icon">
     <iconset>
-     <normaloff>../img/email.png</normaloff>../img/email.png</iconset>
+     <normaloff>../img/icon_action_feedback.png</normaloff>../img/icon_action_feedback.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Feedback...</string>