diff --git a/frontend/resources/images/icons/align-center.svg b/frontend/resources/images/icons/text-align-center.svg
similarity index 98%
rename from frontend/resources/images/icons/align-center.svg
rename to frontend/resources/images/icons/text-align-center.svg
index fd33ddb422..304412d42b 100644
--- a/frontend/resources/images/icons/align-center.svg
+++ b/frontend/resources/images/icons/text-align-center.svg
@@ -1 +1 @@
-<svg height="500" viewBox="0 0 500.00001 500.00001" width="500" xmlns="http://www.w3.org/2000/svg"><path d="m9.0957031 0c-5.0392472 0-9.0957031 4.0564559-9.0957031 9.0957031v51.8085939c0 5.039247 4.0564559 9.095703 9.0957031 9.095703h481.8085969c5.03924 0 9.0957-4.056456 9.0957-9.095703v-51.8085939c0-5.0392472-4.05646-9.0957031-9.0957-9.0957031zm69.9160159 146c-5.039247 0-9.095703 4.05646-9.095703 9.0957v51.8086c0 5.03924 4.056456 9.0957 9.095703 9.0957h341.976561c5.03925 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05645-9.0957-9.0957-9.0957zm-32.839844 144c-5.039247 0-9.095703 4.05646-9.095703 9.0957v51.8086c0 5.03924 4.056456 9.0957 9.095703 9.0957h407.656245c5.03925 0 9.09571-4.05646 9.09571-9.0957v-51.8086c0-5.03924-4.05646-9.0957-9.09571-9.0957zm95.339845 140c-5.03925 0-9.0957 4.05646-9.0957 9.0957v51.8086c0 5.03924 4.05645 9.0957 9.0957 9.0957h216.97656c5.03925 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05645-9.0957-9.0957-9.0957z"/></svg>
\ No newline at end of file
+<svg height="500" viewBox="0 0 500.00001 500.00001" width="500" xmlns="http://www.w3.org/2000/svg"><path d="m9.0957031 0c-5.0392472 0-9.0957031 4.0564559-9.0957031 9.0957031v51.8085939c0 5.039247 4.0564559 9.095703 9.0957031 9.095703h481.8085969c5.03924 0 9.0957-4.056456 9.0957-9.095703v-51.8085939c0-5.0392472-4.05646-9.0957031-9.0957-9.0957031zm69.9160159 146c-5.039247 0-9.095703 4.05646-9.095703 9.0957v51.8086c0 5.03924 4.056456 9.0957 9.095703 9.0957h341.976561c5.03925 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05645-9.0957-9.0957-9.0957zm-32.839844 144c-5.039247 0-9.095703 4.05646-9.095703 9.0957v51.8086c0 5.03924 4.056456 9.0957 9.095703 9.0957h407.656245c5.03925 0 9.09571-4.05646 9.09571-9.0957v-51.8086c0-5.03924-4.05646-9.0957-9.09571-9.0957zm95.339845 140c-5.03925 0-9.0957 4.05646-9.0957 9.0957v51.8086c0 5.03924 4.05645 9.0957 9.0957 9.0957h216.97656c5.03925 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05645-9.0957-9.0957-9.0957z"/></svg>
diff --git a/frontend/resources/images/icons/align-justify.svg b/frontend/resources/images/icons/text-align-justify.svg
similarity index 98%
rename from frontend/resources/images/icons/align-justify.svg
rename to frontend/resources/images/icons/text-align-justify.svg
index 290dd055e2..acf125ade8 100644
--- a/frontend/resources/images/icons/align-justify.svg
+++ b/frontend/resources/images/icons/text-align-justify.svg
@@ -1 +1 @@
-<svg height="500" viewBox="0 0 500.00001 500.00001" width="500" xmlns="http://www.w3.org/2000/svg"><path d="m9.0957031 0c-5.0392472 0-9.0957031 4.0564559-9.0957031 9.0957031v51.8085939c0 5.039247 4.0564559 9.095703 9.0957031 9.095703h481.8085969c5.03924 0 9.0957-4.056456 9.0957-9.095703v-51.8085939c0-5.0392472-4.05646-9.0957031-9.0957-9.0957031zm0 146c-5.0392472 0-9.0957031 4.05646-9.0957031 9.0957v51.8086c0 5.03924 4.0564559 9.0957 9.0957031 9.0957h481.8085969c5.03924 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05646-9.0957-9.0957-9.0957zm0 142c-5.0392472 0-9.0957031 4.05646-9.0957031 9.0957v51.8086c0 5.03924 4.0564559 9.0957 9.0957031 9.0957h481.8085969c5.03924 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05646-9.0957-9.0957-9.0957zm0 142c-5.0392472 0-9.0957031 4.05646-9.0957031 9.0957v51.8086c0 5.03924 4.0564559 9.0957 9.0957031 9.0957h481.8085969c5.03924 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05646-9.0957-9.0957-9.0957z"/></svg>
\ No newline at end of file
+<svg height="500" viewBox="0 0 500.00001 500.00001" width="500" xmlns="http://www.w3.org/2000/svg"><path d="m9.0957031 0c-5.0392472 0-9.0957031 4.0564559-9.0957031 9.0957031v51.8085939c0 5.039247 4.0564559 9.095703 9.0957031 9.095703h481.8085969c5.03924 0 9.0957-4.056456 9.0957-9.095703v-51.8085939c0-5.0392472-4.05646-9.0957031-9.0957-9.0957031zm0 146c-5.0392472 0-9.0957031 4.05646-9.0957031 9.0957v51.8086c0 5.03924 4.0564559 9.0957 9.0957031 9.0957h481.8085969c5.03924 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05646-9.0957-9.0957-9.0957zm0 142c-5.0392472 0-9.0957031 4.05646-9.0957031 9.0957v51.8086c0 5.03924 4.0564559 9.0957 9.0957031 9.0957h481.8085969c5.03924 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05646-9.0957-9.0957-9.0957zm0 142c-5.0392472 0-9.0957031 4.05646-9.0957031 9.0957v51.8086c0 5.03924 4.0564559 9.0957 9.0957031 9.0957h481.8085969c5.03924 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05646-9.0957-9.0957-9.0957z"/></svg>
diff --git a/frontend/resources/images/icons/align-left.svg b/frontend/resources/images/icons/text-align-left.svg
similarity index 98%
rename from frontend/resources/images/icons/align-left.svg
rename to frontend/resources/images/icons/text-align-left.svg
index bff66a31f0..20f7e7caae 100644
--- a/frontend/resources/images/icons/align-left.svg
+++ b/frontend/resources/images/icons/text-align-left.svg
@@ -1 +1 @@
-<svg height="500" viewBox="0 0 500.00001 500.00001" width="500" xmlns="http://www.w3.org/2000/svg"><path d="m9.0957031 0c-5.0392472 0-9.0957031 4.0564559-9.0957031 9.0957031v51.8085939c0 5.039247 4.0564559 9.095703 9.0957031 9.095703h481.8085969c5.03924 0 9.0957-4.056456 9.0957-9.095703v-51.8085939c0-5.0392472-4.05646-9.0957031-9.0957-9.0957031zm0 146c-5.0392472 0-9.0957031 4.05646-9.0957031 9.0957v51.8086c0 5.03924 4.0564559 9.0957 9.0957031 9.0957h341.9785169c5.03925 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05645-9.0957-9.0957-9.0957zm0 144c-5.0392472 0-9.0957031 4.05646-9.0957031 9.0957v51.8086c0 5.03924 4.0564559 9.0957 9.0957031 9.0957h407.6562469c5.03925 0 9.09571-4.05646 9.09571-9.0957v-51.8086c0-5.03924-4.05646-9.0957-9.09571-9.0957zm0 140c-5.0392472 0-9.0957031 4.05646-9.0957031 9.0957v51.8086c0 5.03924 4.0564559 9.0957 9.0957031 9.0957h216.9785169c5.03925 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05645-9.0957-9.0957-9.0957z"/></svg>
\ No newline at end of file
+<svg height="500" viewBox="0 0 500.00001 500.00001" width="500" xmlns="http://www.w3.org/2000/svg"><path d="m9.0957031 0c-5.0392472 0-9.0957031 4.0564559-9.0957031 9.0957031v51.8085939c0 5.039247 4.0564559 9.095703 9.0957031 9.095703h481.8085969c5.03924 0 9.0957-4.056456 9.0957-9.095703v-51.8085939c0-5.0392472-4.05646-9.0957031-9.0957-9.0957031zm0 146c-5.0392472 0-9.0957031 4.05646-9.0957031 9.0957v51.8086c0 5.03924 4.0564559 9.0957 9.0957031 9.0957h341.9785169c5.03925 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05645-9.0957-9.0957-9.0957zm0 144c-5.0392472 0-9.0957031 4.05646-9.0957031 9.0957v51.8086c0 5.03924 4.0564559 9.0957 9.0957031 9.0957h407.6562469c5.03925 0 9.09571-4.05646 9.09571-9.0957v-51.8086c0-5.03924-4.05646-9.0957-9.09571-9.0957zm0 140c-5.0392472 0-9.0957031 4.05646-9.0957031 9.0957v51.8086c0 5.03924 4.0564559 9.0957 9.0957031 9.0957h216.9785169c5.03925 0 9.0957-4.05646 9.0957-9.0957v-51.8086c0-5.03924-4.05645-9.0957-9.0957-9.0957z"/></svg>
diff --git a/frontend/resources/images/icons/align-right.svg b/frontend/resources/images/icons/text-align-right.svg
similarity index 97%
rename from frontend/resources/images/icons/align-right.svg
rename to frontend/resources/images/icons/text-align-right.svg
index dbb51c79d4..40dc9024df 100644
--- a/frontend/resources/images/icons/align-right.svg
+++ b/frontend/resources/images/icons/text-align-right.svg
@@ -1 +1 @@
-<svg height="500" viewBox="0 0 500.00001 500.00001" width="500" xmlns="http://www.w3.org/2000/svg"><path d="m490.9043 0c5.03924 0 9.0957 4.0564559 9.0957 9.0957031v51.8085939c0 5.039247-4.05646 9.095703-9.0957 9.095703h-481.8086c-5.03924 0-9.0957-4.056456-9.0957-9.095703v-51.8085939c0-5.0392472 4.05646-9.0957031 9.0957-9.0957031zm0 146c5.03924 0 9.0957 4.05646 9.0957 9.0957v51.8086c0 5.03924-4.05646 9.0957-9.0957 9.0957h-341.97852c-5.03925 0-9.0957-4.05646-9.0957-9.0957v-51.8086c0-5.03924 4.05645-9.0957 9.0957-9.0957zm0 144c5.03924 0 9.0957 4.05646 9.0957 9.0957v51.8086c0 5.03924-4.05646 9.0957-9.0957 9.0957h-407.65625c-5.03925 0-9.09571-4.05646-9.09571-9.0957v-51.8086c0-5.03924 4.05646-9.0957 9.09571-9.0957zm0 140c5.03924 0 9.0957 4.05646 9.0957 9.0957v51.8086c0 5.03924-4.05646 9.0957-9.0957 9.0957h-216.97852c-5.03925 0-9.0957-4.05646-9.0957-9.0957v-51.8086c0-5.03924 4.05645-9.0957 9.0957-9.0957z"/></svg>
\ No newline at end of file
+<svg height="500" viewBox="0 0 500.00001 500.00001" width="500" xmlns="http://www.w3.org/2000/svg"><path d="m490.9043 0c5.03924 0 9.0957 4.0564559 9.0957 9.0957031v51.8085939c0 5.039247-4.05646 9.095703-9.0957 9.095703h-481.8086c-5.03924 0-9.0957-4.056456-9.0957-9.095703v-51.8085939c0-5.0392472 4.05646-9.0957031 9.0957-9.0957031zm0 146c5.03924 0 9.0957 4.05646 9.0957 9.0957v51.8086c0 5.03924-4.05646 9.0957-9.0957 9.0957h-341.97852c-5.03925 0-9.0957-4.05646-9.0957-9.0957v-51.8086c0-5.03924 4.05645-9.0957 9.0957-9.0957zm0 144c5.03924 0 9.0957 4.05646 9.0957 9.0957v51.8086c0 5.03924-4.05646 9.0957-9.0957 9.0957h-407.65625c-5.03925 0-9.09571-4.05646-9.09571-9.0957v-51.8086c0-5.03924 4.05646-9.0957 9.09571-9.0957zm0 140c5.03924 0 9.0957 4.05646 9.0957 9.0957v51.8086c0 5.03924-4.05646 9.0957-9.0957 9.0957h-216.97852c-5.03925 0-9.0957-4.05646-9.0957-9.0957v-51.8086c0-5.03924 4.05645-9.0957 9.0957-9.0957z"/></svg>
diff --git a/frontend/src/uxbox/builtins/icons.cljs b/frontend/src/uxbox/builtins/icons.cljs
index 08f6d4b972..e2683b90c5 100644
--- a/frontend/src/uxbox/builtins/icons.cljs
+++ b/frontend/src/uxbox/builtins/icons.cljs
@@ -11,10 +11,10 @@
 
 (def action (icon-xref :action))
 (def actions (icon-xref :actions))
-(def align-center (icon-xref :align-center))
-(def align-justify (icon-xref :align-justify))
-(def align-left (icon-xref :align-left))
-(def align-right (icon-xref :align-right))
+(def text-align-center (icon-xref :text-align-center))
+(def text-align-justify (icon-xref :text-align-justify))
+(def text-align-left (icon-xref :text-align-left))
+(def text-align-right (icon-xref :text-align-right))
 (def alignment (icon-xref :alignment))
 (def arrow (icon-xref :arrow))
 (def arrow-down (icon-xref :arrow-down))
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs
index 41fd6aaaf2..9bddea6ede 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs
@@ -263,16 +263,16 @@
       [:div.row-flex.align-icons
        [:span {:class (when (= text-align "left") "current")
                :on-click #(on-font-align-change % "left")}
-        i/align-left]
+        i/text-align-left]
        [:span {:class (when (= text-align "center") "current")
                :on-click #(on-font-align-change % "center")}
-        i/align-center]
+        i/text-align-center]
        [:span {:class (when (= text-align "right") "current")
                :on-click #(on-font-align-change % "right")}
-        i/align-right]
+        i/text-align-right]
        [:span {:class (when (= text-align "justify") "current")
                :on-click #(on-font-align-change % "justify")}
-        i/align-justify]]]]))
+        i/text-align-justify]]]]))
 
 (def +fonts+
   [{:id "sourcesanspro"