diff --git a/CHANGES.rst b/CHANGES.rst
index 1dc346f1..9c7aecea 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,8 +5,12 @@ Changelog for Poi
 2.2.5 (unreleased)
 ------------------
 
-- Fixed mail templates styles for new issue and new response [cekk]
+- Fixed mail templates styles for new issue and new response
+  [cekk]
 
+- Some style fixes; removed all inline styles left, translated to
+  CSS rules.
+  [keul]
 
 2.2.4 (2013-07-02)
 ------------------
diff --git a/Products/Poi/browser/response.pt b/Products/Poi/browser/response.pt
index dbd0f521..412a745b 100644
--- a/Products/Poi/browser/response.pt
+++ b/Products/Poi/browser/response.pt
@@ -154,9 +154,9 @@
           upload unnecessarily large files.
         </div>
 
-        <div style="padding-top: 1em;">
+        <div class="responseAttachment">
 
-          <div style="padding-left: 1.5em; padding-top: 0.5em;">
+          <div>
 
             <input size="30" name="attachment" id="attachment" type="file" />
 
diff --git a/Products/Poi/skins/Poi/poi.css.dtml b/Products/Poi/skins/Poi/poi.css.dtml
index baeb8636..4a3fe888 100644
--- a/Products/Poi/skins/Poi/poi.css.dtml
+++ b/Products/Poi/skins/Poi/poi.css.dtml
@@ -35,7 +35,7 @@
 }
 
 #poi-watch-tracker-form {
-	display: inline;
+    display: inline;
 } 
 
 /* Search table */
@@ -141,6 +141,17 @@ ul.issue-tags-tags a {
 
 }
 
+#poi-watch-issue-form {
+    display: inline;
+}
+
+.issue-info-box .unassigned {
+    text-align: center;
+}
+
+.formControls .editIssue {
+    display: inline;
+}
 
 /* Different response types */
 
@@ -178,6 +189,14 @@ ul.issue-tags-tags a {
     text-transform: lowercase;
 }
 
+#poi-fieldname-attachment .responseAttachment {
+    padding-top: 1em;
+}
+#poi-fieldname-attachment .responseAttachment div {
+    padding-left: 1.5em;
+    padding-top: 0.5em;
+}
+
 /* Response actions box */
 .response-actions {
   float: right;
diff --git a/Products/Poi/skins/Poi/poi_issue_view.pt b/Products/Poi/skins/Poi/poi_issue_view.pt
index 4a8a2de3..c18e0cee 100644
--- a/Products/Poi/skins/Poi/poi_issue_view.pt
+++ b/Products/Poi/skins/Poi/poi_issue_view.pt
@@ -123,8 +123,8 @@
               tal:define="manager python:pas_member.info(responsibleManager)"
               tal:attributes="href string:${issueQueryString}&amp;responsible=${responsibleManager};"
               tal:content="manager/name_or_id" />
-            <div tal:condition="python:responsibleManager == '(UNASSIGNED)'"
-                 style="text-align:center">&#8212;</div>
+            <div class="unassigned" tal:condition="python:responsibleManager == '(UNASSIGNED)'"
+                 >&#8212;</div>
         </td>
       </tr>
       <tr tal:condition="here/isUsingReleases">
@@ -169,7 +169,7 @@
         </li>
       </ul>
     </div>
-    <form style="display: inline" action="@@toggle_watching"
+    <form action="@@toggle_watching"
           id="poi-watch-issue-form"
           tal:condition="python:not isAnon and not isManager and not isSubmitter">
       <div class="formControls">
@@ -200,7 +200,8 @@
     </div>
 
     <div class="formControls">
-      <form style="display: inline" action="edit"
+      <form action="edit"
+            class="editIssue"
             tal:condition="python: user.has_permission('Modify portal content', here)">
         <input class="context"
                type="submit"