diff --git a/app/views/aspects/_aspect_listings.haml b/app/views/aspects/_aspect_listings.haml
index 9752b1623..bfd2cc43d 100644
--- a/app/views/aspects/_aspect_listings.haml
+++ b/app/views/aspects/_aspect_listings.haml
@@ -13,7 +13,7 @@
- for aspect in all_aspects
%li{:data => {:aspect_id => aspect.id}, :class => ("active" if defined?(stream) && stream.aspect_ids.include?(aspect.id))}
.edit
- = link_to image_tag("icons/pencil.svg", :height => 12, :title => t('.edit_aspect', :name => aspect.name)), edit_aspect_path(aspect), :rel => "facebox"
+ = link_to image_tag("icons/pencil.png", :title => t('.edit_aspect', :name => aspect.name)), edit_aspect_path(aspect), :rel => "facebox"
%a.aspect_selector{:href => aspects_path("a_ids[]" => aspect.id), :class => "name", 'data-guid' => aspect.id}
= aspect
diff --git a/app/views/authorizations/new.html.haml b/app/views/authorizations/new.html.haml
index 4bb6ee00d..07bfcadb3 100644
--- a/app/views/authorizations/new.html.haml
+++ b/app/views/authorizations/new.html.haml
@@ -26,7 +26,7 @@
- elsif scope == "AS_photo:post"
%li
.scope-photo
- = image_tag('/images/icons/photo.svg', :title => "Cubbies will be able to post photos on your behalf")
+ = image_tag('/images/icons/photo.png', :title => "Cubbies will be able to post photos on your behalf")
.scope-description
%strong
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 923013d72..2f2027c73 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -24,17 +24,17 @@
#nav_badges
#home_badge.badge
= link_to multi_path, :title => t('_home') do
- = image_tag 'icons/home_grey.svg', :height => 16, :alt => t('_home')
+ = image_tag 'icons/home_grey.png', :alt => t('_home')
#notification_badge.badge
= link_to notifications_path, :title => new_notification_text(@notification_count) do
- = image_tag 'icons/notifications_grey.svg', :height => 16, :id => "notification-flag", :alt => new_notification_text(@notification_count)
+ = image_tag 'icons/notifications_grey.png', :id => "notification-flag", :alt => new_notification_text(@notification_count)
.badge_count{:class => ("hidden" if @notification_count == 0)}
= @notification_count
#message_inbox_badge.badge
= link_to conversations_path, :title => new_message_text(@unread_message_count) do
- = image_tag 'icons/mail_grey.svg', :width => 18, :alt => new_message_text(@unread_message_count)
+ = image_tag 'icons/mail_grey.png', :alt => new_message_text(@unread_message_count)
.badge_count{:class => ("hidden" if @unread_message_count == 0)}
= @unread_message_count
diff --git a/app/views/likes/_likes_container.haml b/app/views/likes/_likes_container.haml
index aeda12159..1c175bf55 100644
--- a/app/views/likes/_likes_container.haml
+++ b/app/views/likes/_likes_container.haml
@@ -3,7 +3,7 @@
-# the COPYRIGHT file.
- if likes_count > 0
- = image_tag('icons/heart.svg')
+ = image_tag('icons/heart.png')
- if target_type == "Comment"
= link_to t('likes.likes.people_like_this_comment', :count => likes_count), comment_likes_path(target_id), :class => "expand_likes"
- else
diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml
index 20982f675..c0a5b361a 100644
--- a/app/views/shared/_publisher.html.haml
+++ b/app/views/shared/_publisher.html.haml
@@ -17,7 +17,7 @@
-if publisher_explain
:javascript
- $(document).ready(function()
+ $(document).ready(function()
{
$("#publisher .dropdown").popover({trigger: 'manual', offset: 10, placement:'below'});
$("#publisher .dropdown").bind("click", function(){$(this).popover("hide")});
@@ -61,7 +61,7 @@
= status.hidden_field :text, :value => h(publisher_hidden_text), :class => 'clear_on_submit'
#file-upload{:title => t('.upload_photos')}
- = image_tag 'icons/camera.svg', :height => 14
+ = image_tag 'icons/camera.png'
- if publisher_public
= hidden_field_tag 'aspect_ids[]', "public"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index d1f4d555c..3c48a5379 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -865,7 +865,7 @@ en:
recently: "recently:"
commented_on: "commented on"
posted: "posted"
- community_spotlight_stream: "Community Spotlight"
+ community_spotlight_stream: "Community Spotlight"
aspects_stream: "Aspects"
mentioned_stream: "@Mentions"
followed_tags_stream: "#Followed Tags"
diff --git a/public/images/icons/camera.png b/public/images/icons/camera.png
new file mode 100644
index 000000000..cc4d3bd54
Binary files /dev/null and b/public/images/icons/camera.png differ
diff --git a/public/images/icons/camera.svg b/public/images/icons/camera.svg
deleted file mode 100755
index 147f29fde..000000000
--- a/public/images/icons/camera.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/public/images/icons/heart.png b/public/images/icons/heart.png
index 18701ba41..4e28f1220 100644
Binary files a/public/images/icons/heart.png and b/public/images/icons/heart.png differ
diff --git a/public/images/icons/heart.svg b/public/images/icons/heart.svg
deleted file mode 100755
index c48ac4940..000000000
--- a/public/images/icons/heart.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/public/images/icons/home_grey.png b/public/images/icons/home_grey.png
new file mode 100644
index 000000000..91a8ef28d
Binary files /dev/null and b/public/images/icons/home_grey.png differ
diff --git a/public/images/icons/home_grey.svg b/public/images/icons/home_grey.svg
deleted file mode 100644
index 0fc96056c..000000000
--- a/public/images/icons/home_grey.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/public/images/icons/mail_grey.png b/public/images/icons/mail_grey.png
new file mode 100644
index 000000000..3f503af53
Binary files /dev/null and b/public/images/icons/mail_grey.png differ
diff --git a/public/images/icons/mail_grey.svg b/public/images/icons/mail_grey.svg
deleted file mode 100644
index da935a95d..000000000
--- a/public/images/icons/mail_grey.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/public/images/icons/notifications_grey.png b/public/images/icons/notifications_grey.png
new file mode 100644
index 000000000..78ad7c779
Binary files /dev/null and b/public/images/icons/notifications_grey.png differ
diff --git a/public/images/icons/notifications_grey.svg b/public/images/icons/notifications_grey.svg
deleted file mode 100644
index e4a227af0..000000000
--- a/public/images/icons/notifications_grey.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
diff --git a/public/images/icons/pencil.png b/public/images/icons/pencil.png
new file mode 100644
index 000000000..d2687a2eb
Binary files /dev/null and b/public/images/icons/pencil.png differ
diff --git a/public/images/icons/pencil.svg b/public/images/icons/pencil.svg
deleted file mode 100755
index 1a277dd50..000000000
--- a/public/images/icons/pencil.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/public/images/icons/photo.png b/public/images/icons/photo.png
new file mode 100644
index 000000000..6032a0cd0
Binary files /dev/null and b/public/images/icons/photo.png differ
diff --git a/public/images/icons/photo.svg b/public/images/icons/photo.svg
deleted file mode 100644
index 554f63217..000000000
--- a/public/images/icons/photo.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-