diff --git a/css/application.css b/css/application.css
index 840016a129..88387c06ee 100644
--- a/css/application.css
+++ b/css/application.css
@@ -3635,15 +3635,39 @@ div.question-header div.question-container {
     width: 100%; }
     div.question-header div.question-container div.comments-container div.comments-content {
       font-size: 13px; }
+<<<<<<< local
+=======
+<<<<<<< local
+>>>>>>> other
       div.question-header div.question-container div.comments-container div.comments-content .block {
+<<<<<<< local
+=======
+=======
+      div.question-header div.question-container div.comments-container div.comments-content div.comment {
+>>>>>>> other
+>>>>>>> other
         border-bottom: 1px solid #ddd;
         border-top: 1px solid #fff;
         padding: 15px 0;
         display: block; }
+<<<<<<< local
+=======
+<<<<<<< local
+>>>>>>> other
         div.question-header div.question-container div.comments-container div.comments-content .block:first-child {
+<<<<<<< local
+=======
+=======
+        div.question-header div.question-container div.comments-container div.comments-content div.comment:first-child {
+>>>>>>> other
+>>>>>>> other
           border-top: 0; }
+<<<<<<< local
         div.question-header div.question-container div.comments-container div.comments-content .block:only-of-type {
           border: 0; }
+=======
+<<<<<<< local
+>>>>>>> other
       div.question-header div.question-container div.comments-container div.comments-content div.comment:first-child {
         border-top: 0; }
       div.question-header div.question-container div.comments-container div.comments-content div.comment:last-child {
@@ -3686,6 +3710,26 @@ div.question-header div.question-container {
           div.question-header div.question-container div.comments-container div.comments-content div.comment div.comment-body div.comment-meta a.edit {
             font-size: 12px;
             padding: 2px 10px; }
+<<<<<<< local
+=======
+=======
+        div.question-header div.question-container div.comments-container div.comments-content div.comment:last-child {
+          margin-bottom: 20px; }
+        div.question-header div.question-container div.comments-container div.comments-content div.comment div.comment-votes {
+          display: inline; }
+          div.question-header div.question-container div.comments-container div.comments-content div.comment div.comment-votes .upvote {
+            background: #ccc;
+            display: inline-block;
+            margin: 0px;
+            padding-right: 17px;
+            padding-top: 2px;
+            height: 20px;
+            color: #777;
+            width: 20px; }
+        div.question-header div.question-container div.comments-container div.comments-content div.comment div.comment-delete {
+          display: inline; }
+>>>>>>> other
+>>>>>>> other
     div.question-header div.question-container div.comments-container #edit-comment-form {
       margin: 10px 0;
       min-height: 100px;
diff --git a/images/askbot/vote-arrow-down-new.png b/images/askbot/vote-arrow-down-new.png
deleted file mode 100644
index f2a28aea28..0000000000
Binary files a/images/askbot/vote-arrow-down-new.png and /dev/null differ
diff --git a/images/askbot/vote-arrow-down-on-new.png b/images/askbot/vote-arrow-down-on-new.png
deleted file mode 100644
index 2127bf7dcd..0000000000
Binary files a/images/askbot/vote-arrow-down-on-new.png and /dev/null differ
diff --git a/images/askbot/vote-arrow-down.png b/images/askbot/vote-arrow-down.png
new file mode 100644
index 0000000000..e76a806d0d
Binary files /dev/null and b/images/askbot/vote-arrow-down.png differ
diff --git a/images/askbot/vote-arrow-up-new.png b/images/askbot/vote-arrow-up-new.png
deleted file mode 100644
index cb9ea8b6f7..0000000000
Binary files a/images/askbot/vote-arrow-up-new.png and /dev/null differ
diff --git a/images/askbot/vote-arrow-up-on-new.png b/images/askbot/vote-arrow-up-on-new.png
deleted file mode 100644
index ef895206bb..0000000000
Binary files a/images/askbot/vote-arrow-up-on-new.png and /dev/null differ
diff --git a/images/askbot/vote-arrow-up.png b/images/askbot/vote-arrow-up.png
new file mode 100644
index 0000000000..ca73bf007b
Binary files /dev/null and b/images/askbot/vote-arrow-up.png differ